Electron
/
electron
зеркало из https://github.com/electron/electron.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

chore: bump chromium to 92.0.4496.0 (master) (#28907) 

Co-authored-by: Charles Kerr <charles@charleskerr.com>
This commit is contained in:
Electron Bot 2021-05-03 20:13:46 -07:00 коммит произвёл GitHub
Родитель 99909baeac
Коммит 005101424a
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
82 изменённых файлов: 340 добавлений и 320 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
DEPS
Просмотреть файл

@ -14,7 +14,7 @@ gclient_gn_args = [
vars = {
'chromium_version':
'92.0.4488.0',
'92.0.4496.0',
'node_version':
'v14.16.1',
'nan_version':

3
build/zip.py
Просмотреть файл

@ -39,7 +39,8 @@ PATHS_TO_SKIP = [
'./crashpad_handler',
# Skip because these are outputs that we don't need.
'resources/inspector',
'gen/third_party/devtools-frontend/src'
'gen/third_party/devtools-frontend/src',
'gen/ui/webui'
]
def skip_path(dep, dist_zip, target_cpu):

1
patches/chromium/.patches
Просмотреть файл

@ -107,3 +107,4 @@ extend_apply_webpreferences.patch
fix_expose_decrementcapturercount_in_web_contents_impl.patch
add_setter_for_browsermainloop_result_code.patch
revert_roll_clang_llvmorg-13-init-7051-gdad5caa5-2.patch
cherry-pick-5d3a047a15e0.patch

6
patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
Просмотреть файл

@ -10,10 +10,10 @@ Allows Electron to restore WER when ELECTRON_DEFAULT_ERROR_MODE is set.
This should be upstreamed.
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index 3bdcead55563c7365f66180b6d3ada35e5b530fe..39bfa851840d8c5a9a386bbdb51633d770a071b4 100644
index 7d9019b87c8a016a1393c29d2ecf9966aa8f575c..160522d6bebfd47400733267ff3d60b37fff7f17 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -238,6 +238,10 @@ int GpuMain(const MainFunctionParams& parameters) {
@@ -237,6 +237,10 @@ int GpuMain(const MainFunctionParams& parameters) {
// to the GpuProcessHost once the GpuServiceImpl has started.
viz::GpuServiceImpl::InstallPreInitializeLogHandler();
@ -24,7 +24,7 @@ index 3bdcead55563c7365f66180b6d3ada35e5b530fe..39bfa851840d8c5a9a386bbdb51633d7
// We are experiencing what appear to be memory-stomp issues in the GPU
// process. These issues seem to be impacting the task executor and listeners
// registered to it. Create the task executor on the heap to guard against
@@ -375,7 +379,6 @@ int GpuMain(const MainFunctionParams& parameters) {
@@ -374,7 +378,6 @@ int GpuMain(const MainFunctionParams& parameters) {
}
#endif

24
patches/chromium/add_didinstallconditionalfeatures.patch
Просмотреть файл

@ -10,7 +10,7 @@ DidCreateScriptContext is called, not all JS APIs are available in the
context, which can cause some preload scripts to trip.
diff --git a/content/public/renderer/render_frame_observer.h b/content/public/renderer/render_frame_observer.h
index 5270782c3d8d34a400f2f40e1b0df168e9d4d236..e6462d8f57cd1dab616146bb5523fb7fe5b9f397 100644
index fa860cddc22da75967796674e9b467f8c726a368..730c7ddd2838eb50f6f5f0676f0f16f7e1d09ad1 100644
--- a/content/public/renderer/render_frame_observer.h
+++ b/content/public/renderer/render_frame_observer.h
@@ -127,6 +127,8 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
@ -23,10 +23,10 @@ index 5270782c3d8d34a400f2f40e1b0df168e9d4d236..e6462d8f57cd1dab616146bb5523fb7f
int32_t world_id) {}
virtual void DidClearWindowObject() {}
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 9d67433c4f122cc4147b595b985b8f6e0c2d2482..59f578d55b07c3d0da424782bf1f33de2b610bff 100644
index eaac22ff3405d1d53b05285ab4018090cca1570f..2d0d35843ee2ed2e13c053790fdbfd625a9a0071 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -4218,6 +4218,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
@@ -4150,6 +4150,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
observer.DidCreateScriptContext(context, world_id);
}
@ -40,7 +40,7 @@ index 9d67433c4f122cc4147b595b985b8f6e0c2d2482..59f578d55b07c3d0da424782bf1f33de
int world_id) {
for (auto& observer : observers_)
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index b9fabc0a2ca4fab1a92cb74bff3467147093aa4a..88b1349c70270d464dabd400cba0c591bc1299b5 100644
index e938059c6eeec92b4041cc136ffc1f341741c0f3..e517f7478c3dbacf6bf41dcc39476bc8609bddb6 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -578,6 +578,8 @@ class CONTENT_EXPORT RenderFrameImpl
@ -53,10 +53,10 @@ index b9fabc0a2ca4fab1a92cb74bff3467147093aa4a..88b1349c70270d464dabd400cba0c591
int world_id) override;
void DidChangeScrollOffset() override;
diff --git a/third_party/blink/public/web/web_local_frame_client.h b/third_party/blink/public/web/web_local_frame_client.h
index 06dec835eca2803bdb93abe6a133416bf5b071d1..cc78bf4d699bbbb732026ffb2cc3783ef8eeb151 100644
index 1ee5bd6211dba9a59d349be233c8fb05c83e2d84..b734962ff402176c59babb70a31dced0ef52521c 100644
--- a/third_party/blink/public/web/web_local_frame_client.h
+++ b/third_party/blink/public/web/web_local_frame_client.h
@@ -564,6 +564,9 @@ class BLINK_EXPORT WebLocalFrameClient {
@@ -566,6 +566,9 @@ class BLINK_EXPORT WebLocalFrameClient {
virtual void DidCreateScriptContext(v8::Local<v8::Context>,
int32_t world_id) {}
@ -67,10 +67,10 @@ index 06dec835eca2803bdb93abe6a133416bf5b071d1..cc78bf4d699bbbb732026ffb2cc3783e
virtual void WillReleaseScriptContext(v8::Local<v8::Context>,
int32_t world_id) {}
diff --git a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
index 50aa1b94ac6aab922f570d78f06096226d428c33..7af7ad0b7ed50dfc1ac061a915d3a99291afaec4 100644
index 83b81f4c1fd4232ee5c2b7b1b7b85424164f3acc..bdd4a0031af6f9c2b701979dd469867c018e5753 100644
--- a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
+++ b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
@@ -188,6 +188,7 @@ void LocalWindowProxy::Initialize() {
@@ -187,6 +187,7 @@ void LocalWindowProxy::Initialize() {
}
InstallConditionalFeatures();
@ -79,10 +79,10 @@ index 50aa1b94ac6aab922f570d78f06096226d428c33..7af7ad0b7ed50dfc1ac061a915d3a992
if (World().IsMainWorld()) {
GetFrame()->Loader().DispatchDidClearWindowObjectInMainWorld();
diff --git a/third_party/blink/renderer/core/frame/local_frame_client.h b/third_party/blink/renderer/core/frame/local_frame_client.h
index 1daee3a17acc7ec16d636a615d20b2fd2137d65b..f9fa62f2399a5d514fda1531974500cf71e34e05 100644
index 04bf36d07aa6417d01fb2c50ebb7da3e5832059a..c79a715ce209e04b2036d59224722a06a12c887a 100644
--- a/third_party/blink/renderer/core/frame/local_frame_client.h
+++ b/third_party/blink/renderer/core/frame/local_frame_client.h
@@ -289,6 +289,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
@@ -291,6 +291,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
virtual void DidCreateScriptContext(v8::Local<v8::Context>,
int32_t world_id) = 0;
@ -92,7 +92,7 @@ index 1daee3a17acc7ec16d636a615d20b2fd2137d65b..f9fa62f2399a5d514fda1531974500cf
int32_t world_id) = 0;
virtual bool AllowScriptExtensions() = 0;
diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
index a9bddf6fa4df14ef83b616df7850d2592c9256b1..43a040cbcab8f355502a2baa74545cd142672e0c 100644
index da23faf79a419abe2501402b906b448924b64198..c8aabdf4d0c0c8e621473c585793259db5d2a707 100644
--- a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
+++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
@@ -272,6 +272,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
@ -110,7 +110,7 @@ index a9bddf6fa4df14ef83b616df7850d2592c9256b1..43a040cbcab8f355502a2baa74545cd1
v8::Local<v8::Context> context,
int32_t world_id) {
diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.h b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
index 5c3cb2361a583a2f4a46559a8b0295da2b7607d9..f89a720d1461f5ddb2ab75b1dbde3bc76e16fa87 100644
index 577a27be65807a23ac8a4f082999614122449281..1d39f184cec039486355f4e08854aa16e15e7cb5 100644
--- a/third_party/blink/renderer/core/frame/local_frame_client_impl.h
+++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
@@ -77,6 +77,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient {

12
patches/chromium/add_realloc.patch
Просмотреть файл

@ -39,10 +39,10 @@ index aef43319737398848dc40a3ab2d9e959ebb399f6..3c6dbc1ec10666b35d68e107a7a694c5
GIN_EXPORT static ArrayBufferAllocator* SharedInstance();
diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
index 7f88acc40ec99f0ecd1b71270980ee6e0c3e203e..42cdbc706a33792859fece7741846c4cc922008a 100644
index 54c0c689bcf1f68ebc11fc76f73d36c2439c7a0d..04fc1864937150f19945ec06a28f0601be286d0d 100644
--- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
+++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
@@ -699,6 +699,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
@@ -698,6 +698,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
return result;
}
@ -54,10 +54,10 @@ index 7f88acc40ec99f0ecd1b71270980ee6e0c3e203e..42cdbc706a33792859fece7741846c4c
if (max_allocation_ != 0 && data)
total_allocation_.fetch_sub(size, std::memory_order_relaxed);
diff --git a/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.cc b/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.cc
index ec217020077613d72eee4b5c408bd5e9eda2ae47..7ab2fa4d00eca9d4896653e29c98654ff75d4306 100644
index dd90a1e579578e6bfc7419634d8c5fecb32cd167..1881ec0194ef0f33a011109ba7870d7993fe4c27 100644
--- a/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.cc
+++ b/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.cc
@@ -149,6 +149,11 @@ void* ArrayBufferContents::AllocateMemoryOrNull(size_t size,
@@ -148,6 +148,11 @@ void* ArrayBufferContents::AllocateMemoryOrNull(size_t size,
return AllocateMemoryWithFlags(size, policy, base::PartitionAllocReturnNull);
}
@ -70,10 +70,10 @@ index ec217020077613d72eee4b5c408bd5e9eda2ae47..7ab2fa4d00eca9d4896653e29c98654f
InstanceCounters::DecrementCounter(
InstanceCounters::kArrayBufferContentsCounter);
diff --git a/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.h b/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.h
index cce802e4fc94c258607bc943d9902e6d18173c44..4f7f4eaf005aac701360e567e6faca7f2e0ff3da 100644
index fcf19e6685686c1c4a40dea4869beccab9de9c03..8aeb0f8db579aa8100a01dedee66f778735e2a9c 100644
--- a/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.h
+++ b/third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.h
@@ -108,6 +108,7 @@ class CORE_EXPORT ArrayBufferContents {
@@ -107,6 +107,7 @@ class CORE_EXPORT ArrayBufferContents {
void CopyTo(ArrayBufferContents& other);
static void* AllocateMemoryOrNull(size_t, InitializationPolicy);

10
patches/chromium/allow_in_process_windows_to_have_different_web_prefs.patch
Просмотреть файл

@ -8,7 +8,7 @@ WebPreferences of in-process child windows, rather than relying on
process-level command line switches, as before.
diff --git a/third_party/blink/common/web_preferences/web_preferences.cc b/third_party/blink/common/web_preferences/web_preferences.cc
index 1363ee73abdfb05f7ff422c75b975a9d74f7dd43..fe7eb954b2aaf5aeb3daf65fda8fcf1ef6a9bab8 100644
index 8a1315f7f89588bb21c6d3c21a7de7c07fed9679..24297949a13d920a2f0bee40fb2b45759c122897 100644
--- a/third_party/blink/common/web_preferences/web_preferences.cc
+++ b/third_party/blink/common/web_preferences/web_preferences.cc
@@ -148,6 +148,25 @@ WebPreferences::WebPreferences()
@ -38,7 +38,7 @@ index 1363ee73abdfb05f7ff422c75b975a9d74f7dd43..fe7eb954b2aaf5aeb3daf65fda8fcf1e
accelerated_video_decode_enabled(false),
animation_policy(
diff --git a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
index 7fa49dd367b28441c1395b11dfe8795dc230b7e3..e7f56dc2764961fe642ad9ba7d56e6a451db8f58 100644
index ab2d320a4073308c249821a060e870afc0dbc3a5..3eafdd66010a649091099348ce25847a42211606 100644
--- a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
+++ b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
@@ -24,6 +24,11 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
@ -78,7 +78,7 @@ index 7fa49dd367b28441c1395b11dfe8795dc230b7e3..e7f56dc2764961fe642ad9ba7d56e6a4
out->accelerated_video_decode_enabled =
data.accelerated_video_decode_enabled();
diff --git a/third_party/blink/public/common/web_preferences/web_preferences.h b/third_party/blink/public/common/web_preferences/web_preferences.h
index c457698eba5dcc2dad1b0e674cb6785ffc666b5b..a82c0e1784bd523ea0f69a7c14c32a949b64f61b 100644
index 6a7194fc499dd6c88b6e205853390dbd3dd09094..eb9cc0f0c9c70a9dc5242d43d6672f579af5180c 100644
--- a/third_party/blink/public/common/web_preferences/web_preferences.h
+++ b/third_party/blink/public/common/web_preferences/web_preferences.h
@@ -9,6 +9,7 @@
@ -118,7 +118,7 @@ index c457698eba5dcc2dad1b0e674cb6785ffc666b5b..a82c0e1784bd523ea0f69a7c14c32a94
// only controls whether or not the "document.cookie" field is properly
// connected to the backing store, for instance if you wanted to be able to
diff --git a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
index e35980e72f5d74a2483f7c62acd1d4b5db7fc5ac..fe0979f55cd04ee1d07117d8c8b05ee6ebe07d84 100644
index 90a2bb1a13afd749b540545fff22ba2134917b5d..56e1db519f36eac90e3b62175daa2087f7983308 100644
--- a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
+++ b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
@@ -6,6 +6,7 @@
@ -211,7 +211,7 @@ index e35980e72f5d74a2483f7c62acd1d4b5db7fc5ac..fe0979f55cd04ee1d07117d8c8b05ee6
return r.cookie_enabled;
}
diff --git a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
index 3e2aae1d92b1c60b725bc8386e1d304dfabe384c..b31719e905693a8d93e1a4b33b2a8ace3b9ae3f2 100644
index db9994ca72f244d6e626d8793ec0cc181a582ea4..8624b88d7fabb207f05f12e8acbc283863a93838 100644
--- a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
+++ b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
@@ -9,6 +9,7 @@ import "third_party/blink/public/mojom/css/preferred_contrast.mojom";

4
patches/chromium/blink_file_path.patch
Просмотреть файл

@ -7,10 +7,10 @@ This is used by editors to obtain the filesystem path from a dragged file. See
documentation at https://electronjs.org/docs/api/file-object
diff --git a/third_party/blink/renderer/core/fileapi/file.h b/third_party/blink/renderer/core/fileapi/file.h
index e9707e037d0018677160ab3088467dd5de3ffd3f..dbc7a488fc2d12bd875ac19dc638fe1b05f1938a 100644
index 4be6229d391db5a01c700948cc1524d85bf82fba..f34daaf19de75c54ea2790b97ab37b007b23298e 100644
--- a/third_party/blink/renderer/core/fileapi/file.h
+++ b/third_party/blink/renderer/core/fileapi/file.h
@@ -192,6 +192,9 @@ class CORE_EXPORT File final : public Blob {
@@ -193,6 +193,9 @@ class CORE_EXPORT File final : public Blob {
}
const String& name() const { return name_; }

8
patches/chromium/blink_local_frame.patch
Просмотреть файл

@ -15,7 +15,7 @@ Refs changes in:
This patch reverts the changes to fix associated crashes in Electron.
diff --git a/third_party/blink/renderer/core/frame/frame.cc b/third_party/blink/renderer/core/frame/frame.cc
index 106d43d67e37bb7abd532d7a898f6b6af3187490..24e69913e0ddeb776df8cae7a85418f97a4cda47 100644
index fd8c91839e3fcbd2ecc19a45008482fddee5c6cc..78bd9c5cf454faa59b2d3b3e1111fb3ba1494e3c 100644
--- a/third_party/blink/renderer/core/frame/frame.cc
+++ b/third_party/blink/renderer/core/frame/frame.cc
@@ -120,14 +120,6 @@ bool Frame::Detach(FrameDetachType type) {
@ -49,10 +49,10 @@ index 106d43d67e37bb7abd532d7a898f6b6af3187490..24e69913e0ddeb776df8cae7a85418f9
// its owning reference back to our owning LocalFrame.
client_->Detached(type);
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
index dda06448dcad89deac8d45b258816ba6c4b95fe1..3913f6532d5ef25f74146fb89795b90239a0030f 100644
index fe637b885d4791e30410715f815ef0abf2564c6e..68c02f04cdf8523ccc6280dabd55bb05a35b6407 100644
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -741,10 +741,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
@@ -780,10 +780,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
}
DCHECK(!view_ || !view_->IsAttached());
@ -63,7 +63,7 @@ index dda06448dcad89deac8d45b258816ba6c4b95fe1..3913f6532d5ef25f74146fb89795b902
if (!Client())
return false;
@@ -790,6 +786,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
@@ -829,6 +825,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
DCHECK(!view_->IsAttached());
Client()->WillBeDetached();

8
patches/chromium/blink_world_context.patch
Просмотреть файл

@ -7,7 +7,7 @@ This exposes a method for obtaining a reference to an isolated world, which is
otherwise not available in the Blink API.
diff --git a/third_party/blink/public/web/web_local_frame.h b/third_party/blink/public/web/web_local_frame.h
index d8cebc01ab2403bbb3286c9fe85b5ba8145779a7..2ef59569d54953863e4e750e99397c4ba791f6f6 100644
index 95b0e08204792c8a872af5da754fa57830d16945..d67c80ad99fcc5f46d4a475412ec862dba69e973 100644
--- a/third_party/blink/public/web/web_local_frame.h
+++ b/third_party/blink/public/web/web_local_frame.h
@@ -370,6 +370,8 @@ class WebLocalFrame : public WebFrame {
@ -20,10 +20,10 @@ index d8cebc01ab2403bbb3286c9fe85b5ba8145779a7..2ef59569d54953863e4e750e99397c4b
// Executes script in the context of the current page and returns the value
// that the script evaluated to with callback. Script execution can be
diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
index 5613506648709e33a3087a2b0050382e8a995652..17fe50f0944f1aeb500a68803fe9700f40d2c582 100644
index c9fa66566c5c81746f82a6af92bbd14da88cec0e..f78d8464f5a6c50970cc2c8b28c83559c1a1c769 100644
--- a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
+++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
@@ -1065,6 +1065,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
@@ -1079,6 +1079,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
return MainWorldScriptContext()->Global();
}
@ -38,7 +38,7 @@ index 5613506648709e33a3087a2b0050382e8a995652..17fe50f0944f1aeb500a68803fe9700f
return BindingSecurity::ShouldAllowAccessToFrame(
CurrentDOMWindow(V8PerIsolateData::MainThreadIsolate()),
diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.h b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
index 1e53901267ebf6850a1da569c4f0764a01e58fc4..82b74a632cc3a7bab1cc98659c2485c2a2bcb399 100644
index d029bf6ca2e0aa646dd7b9b763e5854aa2962c49..e0a4c24b81128a6b0d11af8685be8a01d2ad28e6 100644
--- a/third_party/blink/renderer/core/frame/web_local_frame_impl.h
+++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
@@ -170,6 +170,8 @@ class CORE_EXPORT WebLocalFrameImpl final

4
patches/chromium/build_add_electron_tracing_category.patch
Просмотреть файл

@ -8,10 +8,10 @@ categories in use are known / declared. This patch is required for us
to introduce a new Electron category for Electron-specific tracing.
diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h
index 41f604c21418bfbdc9d4db35c4a84307d586fa5b..a96e2f43d7d4e9bc79a5a1ba99bf99b58911199c 100644
index 563674ae9631732979d973f5233a3b707312d638..779b76fe62c520f1681a82343a21aa4d734b3a55 100644
--- a/base/trace_event/builtin_categories.h
+++ b/base/trace_event/builtin_categories.h
@@ -75,6 +75,7 @@
@@ -77,6 +77,7 @@
X("drmcursor") \
X("dwrite") \
X("DXVA_Decoding") \

28
patches/chromium/can_create_window.patch
Просмотреть файл

@ -9,10 +9,10 @@ potentially prevent a window from being created.
TODO(loc): this patch is currently broken.
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index 63b55b5d12130880da87646df01377588059d2d3..27683c580c3b3759c5b2dcef4690d62fd8017cee 100644
index fdfcd32b87b02e11f68f5a1599300771e4c1c7f2..04dd31f6a392a16aacc8ec613125fb12bab16672 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -5488,6 +5488,7 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -5575,6 +5575,7 @@ void RenderFrameHostImpl::CreateNewWindow(
last_committed_origin_, params->window_container_type,
params->target_url, params->referrer.To<Referrer>(),
params->frame_name, params->disposition, *params->features,
@ -21,10 +21,10 @@ index 63b55b5d12130880da87646df01377588059d2d3..27683c580c3b3759c5b2dcef4690d62f
&no_javascript_access);
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 3d30dcec69c8cb0f2a908654932c71d7ff019160..f20a3d6f701f6849eabfeaee9a885b295f4b74ba 100644
index cee128d842b530dfe00dbd6b7aa1a977fe623d83..6acb183b87ebcfb5d769517985b691b9969bb6e6 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3620,6 +3620,14 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
@@ -3649,6 +3649,14 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
}
auto* new_contents_impl = new_contents.get();
@ -39,7 +39,7 @@ index 3d30dcec69c8cb0f2a908654932c71d7ff019160..f20a3d6f701f6849eabfeaee9a885b29
new_contents_impl->GetController().SetSessionStorageNamespace(
partition_id, session_storage_namespace);
@@ -3662,12 +3670,6 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
@@ -3691,12 +3699,6 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
AddWebContentsDestructionObserver(new_contents_impl);
}
@ -53,10 +53,10 @@ index 3d30dcec69c8cb0f2a908654932c71d7ff019160..f20a3d6f701f6849eabfeaee9a885b29
new_contents_impl, opener, params.target_url,
params.referrer.To<Referrer>(), params.disposition,
diff --git a/content/common/frame.mojom b/content/common/frame.mojom
index cbec1acd2208bebbd6fb9c656145e7c5e8efbe3f..a82ef5f13de1fc52a5ea64b66db0f3d98dbc5e33 100644
index 3344db32aeb41a4c00645e372fee5e52bc909aea..3e3772f93c0d253c111528d9889e662baf6281bc 100644
--- a/content/common/frame.mojom
+++ b/content/common/frame.mojom
@@ -464,6 +464,10 @@ struct CreateNewWindowParams {
@@ -457,6 +457,10 @@ struct CreateNewWindowParams {
// The impression associated with the navigation in the new window, if
// one is specified.
Impression? impression;
@ -68,7 +68,7 @@ index cbec1acd2208bebbd6fb9c656145e7c5e8efbe3f..a82ef5f13de1fc52a5ea64b66db0f3d9
// Operation result when the renderer asks the browser to create a new window.
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index 9778e668c4295f41642697155a54366df74bb3eb..b94eaa26a8768e02f896b2f85ac85611cad3f1ab 100644
index 338c0091490bd3e3d4517cf815fd3caf253d2164..2361f649d7c9cfb7dd8326ae682f4486d2d21167 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -561,6 +561,8 @@ bool ContentBrowserClient::CanCreateWindow(
@ -81,7 +81,7 @@ index 9778e668c4295f41642697155a54366df74bb3eb..b94eaa26a8768e02f896b2f85ac85611
bool opener_suppressed,
bool* no_javascript_access) {
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 28363c69e63a151626f6a85b4eb8b08e7f581bb1..42a877338c34c23ff529121c32b53e56a09f8571 100644
index 802e4f2875769f78365b23edb4edf7ef8a8b6af0..5622d3d9852edee2b2f49f87606f334d0fa2541e 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -157,6 +157,7 @@ class NetworkService;
@ -92,7 +92,7 @@ index 28363c69e63a151626f6a85b4eb8b08e7f581bb1..42a877338c34c23ff529121c32b53e56
} // namespace network
namespace sandbox {
@@ -924,6 +925,8 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -925,6 +926,8 @@ class CONTENT_EXPORT ContentBrowserClient {
const std::string& frame_name,
WindowOpenDisposition disposition,
const blink::mojom::WindowFeatures& features,
@ -173,10 +173,10 @@ index 386a38dd82433a53b82c0d35de44fdfbfce87b89..b24bbf95e879b1e04d686d703340c978
// moved on send.
bool is_background_tab =
diff --git a/content/web_test/browser/web_test_content_browser_client.cc b/content/web_test/browser/web_test_content_browser_client.cc
index e98a48e52631ed70c6aa2fab62f80bdd916f86c5..61650ecaa5c5f726adb43a79119318eb3fab040a 100644
index 5e9b1a409f5fb0dd683cc67318bae9c542816451..e2a3780b6ea5e15839b89ff92c85e57e7c48b017 100644
--- a/content/web_test/browser/web_test_content_browser_client.cc
+++ b/content/web_test/browser/web_test_content_browser_client.cc
@@ -449,6 +449,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
@@ -450,6 +450,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
const std::string& frame_name,
WindowOpenDisposition disposition,
const blink::mojom::WindowFeatures& features,
@ -221,10 +221,10 @@ index 18d045f5de2f93c1f8439c25770e2575429f7c66..039c48d6e0124ff6066214c41d0138f2
} // namespace blink
diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
index 65976802c98738bfee49e1efb156b90d51ba2288..d56b5a5bcb200290fe6dcc26c471ee1c142cef8b 100644
index 3df1ac74802e927c24ae29c762a12cc3cae048fd..682b12f90fa42f877e118ecd432d2fcb460a7f3c 100644
--- a/third_party/blink/renderer/core/frame/local_dom_window.cc
+++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
@@ -1993,6 +1993,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
@@ -1976,6 +1976,7 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
}
WebWindowFeatures window_features = GetWindowFeaturesFromString(features);

26
patches/chromium/cherry-pick-5d3a047a15e0.patch Normal file
Просмотреть файл

@ -0,0 +1,26 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jeremy Rose <jeremya@chromium.org>
Date: Mon, 3 May 2021 15:40:47 -0700
Subject: conditionally import strip_binary.gni in chromedriver tests
This import is conditional elsewhere (see e.g.
https://source.chromium.org/chromium/chromium/src/+/main:chrome/BUILD.gn;l=38;drc=dfe5d22212436b797a2f0dba23fe5152f4c5e871).
This removes a dependency on the //build/linux .gni files from the macos build.
Change-Id: Ia2f2c245f7182c9f48327962d9e8d37d0e9652b4
diff --git a/chrome/test/chromedriver/BUILD.gn b/chrome/test/chromedriver/BUILD.gn
index 31237143bebba64d15c6b021760a416ec022ca00..eae6482aa679680fa078626a5709a28a7da8bff0 100644
--- a/chrome/test/chromedriver/BUILD.gn
+++ b/chrome/test/chromedriver/BUILD.gn
@@ -4,7 +4,9 @@
import("//build/config/python.gni")
import("//build/config/ui.gni")
-import("//build/linux/strip_binary.gni")
+if (is_linux) {
+ import("//build/linux/strip_binary.gni")
+}
import("//build/util/lastchange.gni")
import("//testing/test.gni")
import("//third_party/ffmpeg/ffmpeg_options.gni")

4
patches/chromium/chore_expose_v8_initialization_isolate_callbacks.patch
Просмотреть файл

@ -9,10 +9,10 @@ we're running with contextIsolation enabled, we should be falling back
to Blink's logic. This will be upstreamed in some form.
diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
index 42cdbc706a33792859fece7741846c4cc922008a..27c5a49f539ba438d3e58fc3a4cadb116d440c24 100644
index 04fc1864937150f19945ec06a28f0601be286d0d..a3cc80e6a2751128a01fd5d027b4bd46c21f9fab 100644
--- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
+++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
@@ -450,7 +450,7 @@ CodeGenerationCheckCallbackInMainThread(v8::Local<v8::Context> context,
@@ -449,7 +449,7 @@ CodeGenerationCheckCallbackInMainThread(v8::Local<v8::Context> context,
return {true, std::move(stringified_source)};
}

10
patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
Просмотреть файл

@ -264,10 +264,10 @@ index c5c5a7b63b5b3b62a9517cbef3ae23ce57a3c89c..4f1b7e88d6d2ae89a60311c8aeb1fcee
void AddNewContents(content::WebContents* source,
std::unique_ptr<content::WebContents> new_contents,
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 893caf674e4fc7ed505a5fbbd43d0bc31f1118fc..1e24697533a51853041e5a15b585d0d3f5a80817 100644
index 2426eb615967cbe3d11ece998d97d63266fac184..f4c8d9e8a20f9be8c6566857fcf1d57ba7ec1af7 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3572,8 +3572,7 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
@@ -3601,8 +3601,7 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
if (delegate_ && delegate_->IsWebContentsCreationOverridden(
source_site_instance, params.window_container_type,
@ -362,10 +362,10 @@ index 7d27e12c4e9a7f32af8a26f672359057a643dd67..7a30ac31f79871f2a9afa0345e0e88af
content::RenderFrameHost* opener,
content::SiteInstance* source_site_instance,
diff --git a/fuchsia/engine/browser/frame_impl.cc b/fuchsia/engine/browser/frame_impl.cc
index f50f4343ed5a487538ef9ce819cd19300623a3dd..282bca34f82e5a3b27bc66f0cab494e388f35b9e 100644
index 9e95136de2a8a802e1753ca4a628e120f97a0b74..1af68ff77159a4c08e98440ddf9ff325f0887975 100644
--- a/fuchsia/engine/browser/frame_impl.cc
+++ b/fuchsia/engine/browser/frame_impl.cc
@@ -372,8 +372,7 @@ bool FrameImpl::IsWebContentsCreationOverridden(
@@ -373,8 +373,7 @@ bool FrameImpl::IsWebContentsCreationOverridden(
content::SiteInstance* source_site_instance,
content::mojom::WindowContainerType window_container_type,
const GURL& opener_url,
@ -390,7 +390,7 @@ index fea7e90aa11231009c442e8a449478f63a6d98eb..7b8802fcec4a2fff3b3d147e1bbd97e5
int opener_render_process_id,
int opener_render_frame_id,
diff --git a/headless/lib/browser/headless_web_contents_impl.cc b/headless/lib/browser/headless_web_contents_impl.cc
index 4fdbf1c7030bb2b3765780d1e8c5a502679745de..5b59ce27eaa03897e5cbb3115b485a3ea931e871 100644
index 4e4b37cc0fbbcf8f630a4e928c957261e9a03603..610848b09bba4dfa7dd645ca62354930b74e3ed5 100644
--- a/headless/lib/browser/headless_web_contents_impl.cc
+++ b/headless/lib/browser/headless_web_contents_impl.cc
@@ -198,8 +198,7 @@ class HeadlessWebContentsImpl::Delegate : public content::WebContentsDelegate {

4
patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch
Просмотреть файл

@ -7,10 +7,10 @@ spellchecker uses a few IDS_ resources. We need to load these from
Electrons grit header instead of Chromes
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index c49e314bb5a0d179a50f44e8ce6af6626bfd10a3..def8fd5b9dbed82192222d02619e9691040e8b65 100644
index e4cfc24f6e1aaad9a99f2d68df83b8a6541ee33f..024276e3c4b5bb9c24ea75efec7a4af8baf64c8a 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -6250,6 +6250,7 @@ static_library("browser") {
@@ -6279,6 +6279,7 @@ static_library("browser") {
deps += [
"//components/spellcheck/browser",
"//components/spellcheck/common",

2
patches/chromium/chrome_key_systems.patch
Просмотреть файл

@ -7,7 +7,7 @@ Disable persiste licence support check for widevine cdm,
as its not supported in the current version of chrome.
diff --git a/chrome/renderer/media/chrome_key_systems.cc b/chrome/renderer/media/chrome_key_systems.cc
index d1b62beedb1a9ae378af132cae54ba2417ca64bf..7d4f73ffe6f601110ba46e7537211bb341a765f8 100644
index 6a539eb21f8ba381fd3fe6fddc21e499befbd8a9..d7b9ef789d684c58013179b25cd40569ff773249 100644
--- a/chrome/renderer/media/chrome_key_systems.cc
+++ b/chrome/renderer/media/chrome_key_systems.cc
@@ -15,7 +15,9 @@

6
patches/chromium/crash_allow_setting_more_options.patch
Просмотреть файл

@ -75,10 +75,10 @@ index 39557cce474439238255ecd28030215085db0c81..5b3f980837911c710686ab91a2a81c31
// Used by WebView to sample crashes without generating the unwanted dumps. If
// the returned value is less than 100, crash dumping will be sampled to that
diff --git a/components/crash/core/app/crashpad_mac.mm b/components/crash/core/app/crashpad_mac.mm
index 2be2fd857bc5f6775e20fc595929d984c7543f8c..0d633410842cc4fcb9f1befe452c4fc0776d3af8 100644
index e3fc1fb2bcab31d6a7cb325a892acb26dc00d4e4..fd654d6e514de416457c283caeb1895dba6286e1 100644
--- a/components/crash/core/app/crashpad_mac.mm
+++ b/components/crash/core/app/crashpad_mac.mm
@@ -86,6 +86,8 @@
@@ -85,6 +85,8 @@
} // @autoreleasepool
return process_annotations;
}();
@ -87,7 +87,7 @@ index 2be2fd857bc5f6775e20fc595929d984c7543f8c..0d633410842cc4fcb9f1befe452c4fc0
return annotations;
}
@@ -156,6 +158,13 @@ void DumpProcessWithoutCrashing(task_t task_port) {
@@ -155,6 +157,13 @@ void DumpProcessWithoutCrashing(task_t task_port) {
std::vector<std::string> arguments;

4
patches/chromium/crashpad_pid_check.patch
Просмотреть файл

@ -16,10 +16,10 @@ https://github.com/electron/electron/pull/18483#discussion_r292703588
https://github.com/electron/electron/pull/18483#issuecomment-501090683
diff --git a/third_party/crashpad/crashpad/util/win/exception_handler_server.cc b/third_party/crashpad/crashpad/util/win/exception_handler_server.cc
index c841f7bc5c3d9962ea24664f26c6867ded529c7b..13218a598bbd4b51cd9a045879ee20b0491f8146 100644
index a520c720ceb0152d11acb3acac02e0852a84d786..dd237a7b84350e3c254719630d4f5f9da17bb1aa 100644
--- a/third_party/crashpad/crashpad/util/win/exception_handler_server.cc
+++ b/third_party/crashpad/crashpad/util/win/exception_handler_server.cc
@@ -445,9 +445,16 @@ bool ExceptionHandlerServer::ServiceClientConnection(
@@ -444,9 +444,16 @@ bool ExceptionHandlerServer::ServiceClientConnection(
DWORD real_pid = 0;
if (get_named_pipe_client_process_id(service_context.pipe(), &real_pid) &&
message.registration.client_process_id != real_pid) {

10
patches/chromium/dcheck.patch
Просмотреть файл

@ -17,10 +17,10 @@ only one or two specific checks fail. Then it's better to simply comment out the
failing checks and allow the rest of the target to have them enabled.
diff --git a/content/browser/renderer_host/navigation_controller_impl.cc b/content/browser/renderer_host/navigation_controller_impl.cc
index b4eccf6f9a7a2b0c77bb67862093b1273b2f553b..5e9b0c46bf753e4c6712380b5c07c235557ded6b 100644
index a1a67daa21f93a8e19ee57ea007967e9a0735c18..d826fc5bacf7966e3f910572dd6b0f63de25089d 100644
--- a/content/browser/renderer_host/navigation_controller_impl.cc
+++ b/content/browser/renderer_host/navigation_controller_impl.cc
@@ -1416,8 +1416,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation(
@@ -1417,8 +1417,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation(
return NAVIGATION_TYPE_NEW_SUBFRAME;
}
@ -33,7 +33,7 @@ index b4eccf6f9a7a2b0c77bb67862093b1273b2f553b..5e9b0c46bf753e4c6712380b5c07c235
if (rfh->GetParent()) {
// All manual subframes would be did_create_new_entry and handled above, so
@@ -1732,7 +1734,10 @@ void NavigationControllerImpl::RendererDidNavigateToNewEntry(
@@ -1733,7 +1735,10 @@ void NavigationControllerImpl::RendererDidNavigateToNewEntry(
}
}
@ -46,10 +46,10 @@ index b4eccf6f9a7a2b0c77bb67862093b1273b2f553b..5e9b0c46bf753e4c6712380b5c07c235
// navigation. Now we know that the renderer has updated its state accordingly
// and it is safe to also clear the browser side history.
diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc
index 619b5be9df9e97dc130cbdac82c64e1c413db0f3..8b51d6fc4c7bded2b215bfdd74b18ed723c38c94 100644
index d1f10922b82e4e0578d1c32978784216117e0696..8f0a750d1a5957b987c5ac506455587a09474461 100644
--- a/ui/base/clipboard/clipboard_win.cc
+++ b/ui/base/clipboard/clipboard_win.cc
@@ -880,10 +880,10 @@ SkBitmap ClipboardWin::ReadImageInternal(ClipboardBuffer buffer) const {
@@ -889,10 +889,10 @@ SkBitmap ClipboardWin::ReadImageInternal(ClipboardBuffer buffer) const {
void ClipboardWin::WriteToClipboard(ClipboardFormatType format, HANDLE handle) {
UINT cf_format = format.ToFormatEtc().cfFormat;

4
patches/chromium/delay_lock_the_protocol_scheme_registry.patch
Просмотреть файл

@ -19,10 +19,10 @@ https://chromium-review.googlesource.com/c/chromium/src/+/1901591, we should try
re-submitting the patch.
diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
index 81e48e33cad43875634d4ab6a5625c16d4c37891..230f9348128d2630e80f1c0f346be23b15446dd7 100644
index 8dba74570f7f2c1e622bcbd899c972508b732c68..ca25728909e354990b7285545c2544918996874f 100644
--- a/content/app/content_main_runner_impl.cc
+++ b/content/app/content_main_runner_impl.cc
@@ -738,7 +738,7 @@ int ContentMainRunnerImpl::Initialize(const ContentMainParams& params) {
@@ -737,7 +737,7 @@ int ContentMainRunnerImpl::Initialize(const ContentMainParams& params) {
}
#endif

4
patches/chromium/disable-redraw-lock.patch
Просмотреть файл

@ -15,7 +15,7 @@ the redraw locking mechanism, which fixes these issues. The electron issue
can be found at https://github.com/electron/electron/issues/1821
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
index 73970def395271d4d66796f2d77a0fca35eeb847..b47486d445ebdbea90f7d8bdfc1edb5be6180ac3 100644
index 91dd04b117e16192c450923c0833d0ba82722886..464b8bacb9009e0b4448822541b53c12e57dc2a5 100644
--- a/ui/views/win/hwnd_message_handler.cc
+++ b/ui/views/win/hwnd_message_handler.cc
@@ -306,6 +306,10 @@ constexpr int kSynthesizedMouseMessagesTimeDifference = 500;
@ -37,7 +37,7 @@ index 73970def395271d4d66796f2d77a0fca35eeb847..b47486d445ebdbea90f7d8bdfc1edb5b
(!(GetWindowLong(hwnd_, GWL_STYLE) & WS_CAPTION) ||
!ui::win::IsAeroGlassEnabled())) {
if (should_lock_)
@@ -974,6 +979,10 @@ HWNDMessageHandler::RegisterUnadjustedMouseEvent() {
@@ -977,6 +982,10 @@ HWNDMessageHandler::RegisterUnadjustedMouseEvent() {
return scoped_enable;
}

40
patches/chromium/disable_color_correct_rendering.patch
Просмотреть файл

@ -20,7 +20,7 @@ to deal with color spaces. That is being tracked at
https://crbug.com/634542 and https://crbug.com/711107.
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index 4b366b5d6bb8d1726c8f11d685c81746c50c1a53..096a37b1a31117b00acf7992c827018427c31bae 100644
index 47f6adf0798feddd8c66db59914b290c34fed5b4..cfc15f026707d1572f3352ecae35fa96acca3229 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -1789,6 +1789,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
@ -81,10 +81,10 @@ index f919df4d79a1168269c1538ac13a2a944586cf4e..fc34cf5d7dab95e7b6fc0576674b3e2b
!command_line->HasSwitch(switches::kUIDisablePartialSwap);
diff --git a/components/viz/service/display/gl_renderer.cc b/components/viz/service/display/gl_renderer.cc
index 8a94e6c42c5ee7c6c3f17979713eb5e4d46a5e13..04723a0c3fe20d0ae6c90d27bdb0a5d574bc27a2 100644
index 153f8fd8dd9255a3f45532be05b5eb4be296fb0f..5a07850683b7e24489cf0448c4faeb7d48e3134f 100644
--- a/components/viz/service/display/gl_renderer.cc
+++ b/components/viz/service/display/gl_renderer.cc
@@ -88,6 +88,9 @@
@@ -87,6 +87,9 @@
using gpu::gles2::GLES2Interface;
@ -94,7 +94,7 @@ index 8a94e6c42c5ee7c6c3f17979713eb5e4d46a5e13..04723a0c3fe20d0ae6c90d27bdb0a5d5
namespace viz {
namespace {
@@ -678,8 +681,9 @@ void GLRenderer::DoDrawQuad(const DrawQuad* quad,
@@ -677,8 +680,9 @@ void GLRenderer::DoDrawQuad(const DrawQuad* quad,
void GLRenderer::DrawDebugBorderQuad(const DebugBorderDrawQuad* quad) {
SetBlendEnabled(quad->ShouldDrawWithBlending());
@ -106,7 +106,7 @@ index 8a94e6c42c5ee7c6c3f17979713eb5e4d46a5e13..04723a0c3fe20d0ae6c90d27bdb0a5d5
// Use the full quad_rect for debug quads to not move the edges based on
// partial swaps.
@@ -1669,7 +1673,8 @@ void GLRenderer::ChooseRPDQProgram(DrawRenderPassDrawQuadParams* params,
@@ -1668,7 +1672,8 @@ void GLRenderer::ChooseRPDQProgram(DrawRenderPassDrawQuadParams* params,
params->use_color_matrix, tint_gl_composited_content_,
params->apply_shader_based_rounded_corner &&
ShouldApplyRoundedCorner(params->quad)),
@ -116,7 +116,7 @@ index 8a94e6c42c5ee7c6c3f17979713eb5e4d46a5e13..04723a0c3fe20d0ae6c90d27bdb0a5d5
}
void GLRenderer::UpdateRPDQUniforms(DrawRenderPassDrawQuadParams* params) {
@@ -2142,15 +2147,16 @@ void GLRenderer::DrawSolidColorQuad(const SolidColorDrawQuad* quad,
@@ -2141,15 +2146,16 @@ void GLRenderer::DrawSolidColorQuad(const SolidColorDrawQuad* quad,
SetUseProgram(ProgramKey::SolidColor(use_aa ? USE_AA : NO_AA,
tint_gl_composited_content_,
ShouldApplyRoundedCorner(quad)),
@ -136,7 +136,7 @@ index 8a94e6c42c5ee7c6c3f17979713eb5e4d46a5e13..04723a0c3fe20d0ae6c90d27bdb0a5d5
gfx::ColorTransform::TriStim col(color_f.fR, color_f.fG, color_f.fB);
color_transform->Transform(&col, 1);
color_f.fR = col.x();
@@ -2372,7 +2378,8 @@ void GLRenderer::DrawContentQuadAA(const ContentDrawQuadBase* quad,
@@ -2371,7 +2377,8 @@ void GLRenderer::DrawContentQuadAA(const ContentDrawQuadBase* quad,
: NON_PREMULTIPLIED_ALPHA,
false, false, tint_gl_composited_content_,
ShouldApplyRoundedCorner(quad)),
@ -146,7 +146,7 @@ index 8a94e6c42c5ee7c6c3f17979713eb5e4d46a5e13..04723a0c3fe20d0ae6c90d27bdb0a5d5
if (current_program_->tint_color_matrix_location() != -1) {
auto matrix = cc::DebugColors::TintCompositedContentColorTransformMatrix();
@@ -2471,7 +2478,8 @@ void GLRenderer::DrawContentQuadNoAA(const ContentDrawQuadBase* quad,
@@ -2470,7 +2477,8 @@ void GLRenderer::DrawContentQuadNoAA(const ContentDrawQuadBase* quad,
!quad->ShouldDrawWithBlending(), has_tex_clamp_rect,
tint_gl_composited_content_,
ShouldApplyRoundedCorner(quad)),
@ -156,7 +156,7 @@ index 8a94e6c42c5ee7c6c3f17979713eb5e4d46a5e13..04723a0c3fe20d0ae6c90d27bdb0a5d5
if (current_program_->tint_color_matrix_location() != -1) {
auto matrix = cc::DebugColors::TintCompositedContentColorTransformMatrix();
@@ -2581,7 +2589,8 @@ void GLRenderer::DrawYUVVideoQuad(const YUVVideoDrawQuad* quad,
@@ -2580,7 +2588,8 @@ void GLRenderer::DrawYUVVideoQuad(const YUVVideoDrawQuad* quad,
// The source color space should never be RGB.
DCHECK_NE(src_color_space, src_color_space.GetAsFullRangeRGB());
@ -166,7 +166,7 @@ index 8a94e6c42c5ee7c6c3f17979713eb5e4d46a5e13..04723a0c3fe20d0ae6c90d27bdb0a5d5
#if defined(OS_WIN)
// Force sRGB output on Windows for overlay candidate video quads to match
@@ -2762,7 +2771,8 @@ void GLRenderer::DrawStreamVideoQuad(const StreamVideoDrawQuad* quad,
@@ -2761,7 +2770,8 @@ void GLRenderer::DrawStreamVideoQuad(const StreamVideoDrawQuad* quad,
SetUseProgram(ProgramKey::VideoStream(tex_coord_precision,
ShouldApplyRoundedCorner(quad)),
@ -176,7 +176,7 @@ index 8a94e6c42c5ee7c6c3f17979713eb5e4d46a5e13..04723a0c3fe20d0ae6c90d27bdb0a5d5
DCHECK_EQ(GL_TEXTURE0, GetActiveTextureUnit(gl_));
gl_->BindTexture(GL_TEXTURE_EXTERNAL_OES, lock.texture_id());
@@ -2833,8 +2843,8 @@ void GLRenderer::FlushTextureQuadCache(BoundGeometry flush_binding) {
@@ -2832,8 +2842,8 @@ void GLRenderer::FlushTextureQuadCache(BoundGeometry flush_binding) {
draw_cache_.nearest_neighbor ? GL_NEAREST : GL_LINEAR);
// Bind the program to the GL state.
@ -187,7 +187,7 @@ index 8a94e6c42c5ee7c6c3f17979713eb5e4d46a5e13..04723a0c3fe20d0ae6c90d27bdb0a5d5
/*adjust_src_white_level=*/draw_cache_.is_video_frame);
if (current_program_->rounded_corner_rect_location() != -1) {
@@ -3662,7 +3672,9 @@ void GLRenderer::SetUseProgram(const ProgramKey& program_key_no_color,
@@ -3661,7 +3671,9 @@ void GLRenderer::SetUseProgram(const ProgramKey& program_key_no_color,
const gfx::ColorSpace& src_color_space,
const gfx::ColorSpace& dst_color_space,
bool adjust_src_white_level) {
@ -198,7 +198,7 @@ index 8a94e6c42c5ee7c6c3f17979713eb5e4d46a5e13..04723a0c3fe20d0ae6c90d27bdb0a5d5
gfx::ColorSpace adjusted_src_color_space = src_color_space;
if (adjust_src_white_level) {
// If the input color space is HDR, and it did not specify a white level,
@@ -4040,9 +4052,9 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource(
@@ -4039,9 +4051,9 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource(
cc::MathUtil::CheckedRoundUp(iosurface_height, iosurface_multiple);
}
@ -211,7 +211,7 @@ index 8a94e6c42c5ee7c6c3f17979713eb5e4d46a5e13..04723a0c3fe20d0ae6c90d27bdb0a5d5
*new_bounds = gfx::RectF(updated_dst_rect.origin(),
gfx::SizeF((*overlay_texture)->texture.size()));
@@ -4262,8 +4274,8 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) {
@@ -4261,8 +4273,8 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) {
PrepareGeometry(SHARED_BINDING);
@ -222,17 +222,17 @@ index 8a94e6c42c5ee7c6c3f17979713eb5e4d46a5e13..04723a0c3fe20d0ae6c90d27bdb0a5d5
gfx::Transform render_matrix;
render_matrix.Translate(0.5 * output_rect.width() + output_rect.x(),
@@ -4453,3 +4465,5 @@ GLRenderer::OverlayTexture::OverlayTexture() = default;
@@ -4452,3 +4464,5 @@ GLRenderer::OverlayTexture::OverlayTexture() = default;
GLRenderer::OverlayTexture::~OverlayTexture() = default;
} // namespace viz
+
+#undef PATCH_CS
diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
index ed098dec8efc5e5c72dbdbc8e17f1cb5da9f1b1f..a831cd8c40be9f6ac8b63ee702ec2baa3b9ae9c5 100644
index cbb30f8900ed07d5cccbf250f2f1e6fafb66b40e..411fabb7e8c3e2a1aceb9db0fefdc4c6d3a9c156 100644
--- a/content/browser/gpu/gpu_process_host.cc
+++ b/content/browser/gpu/gpu_process_host.cc
@@ -224,6 +224,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus(
@@ -225,6 +225,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus(
// Command-line switches to propagate to the GPU process.
static const char* const kSwitchNames[] = {
@ -241,10 +241,10 @@ index ed098dec8efc5e5c72dbdbc8e17f1cb5da9f1b1f..a831cd8c40be9f6ac8b63ee702ec2baa
sandbox::policy::switches::kGpuSandboxAllowSysVShm,
sandbox::policy::switches::kGpuSandboxFailuresFatal,
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 5730c695f3106573953c131b6721baabcfbc4226..45046b2d1651ef56c68e59fade9206a71c92fffa 100644
index 08fd62722a0bcb996f2dfab5329ebaecfe5c50c0..d3e89b9aa2500ce920e77637b1e1e79967d30137 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -212,6 +212,7 @@
@@ -211,6 +211,7 @@
#include "ui/accessibility/accessibility_switches.h"
#include "ui/base/ui_base_switches.h"
#include "ui/display/display_switches.h"
@ -252,7 +252,7 @@ index 5730c695f3106573953c131b6721baabcfbc4226..45046b2d1651ef56c68e59fade9206a7
#include "ui/gl/gl_switches.h"
#include "ui/native_theme/native_theme_features.h"
#include "url/origin.h"
@@ -3165,6 +3166,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
@@ -3191,6 +3192,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
// Propagate the following switches to the renderer command line (along
// with any associated values) if present in the browser command line.
static const char* const kSwitchNames[] = {

4
patches/chromium/disable_compositor_recycling.patch
Просмотреть файл

@ -6,10 +6,10 @@ Subject: fix: disabling compositor recycling
Compositor recycling is useful for Chrome because there can be many tabs and spinning up a compositor for each one would be costly. In practice, Chrome uses the parent compositor code path of browser_compositor_view_mac.mm; the NSView of each tab is detached when it's hidden and attached when it's shown. For Electron, there is no parent compositor, so we're forced into the "own compositor" code path, which seems to be non-optimal and pretty ruthless in terms of the release of resources. Electron has no real concept of multiple tabs per window, so it should be okay to disable this ruthless recycling altogether in Electron.
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
index 1b4014ad558c9030a495c79458008915c28e7516..fde56ab94dc2fdf66e05cd58a58e8518817bef7d 100644
index 3e7d3dbd8fd39a3554d91bd15c567b8fadb27d6f..88faeca16f13dbdb28ec3fb276e2b537c35a08f4 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -488,7 +488,11 @@
@@ -489,7 +489,11 @@
return;
host()->WasHidden();

6
patches/chromium/disable_hidden.patch
Просмотреть файл

@ -6,10 +6,10 @@ Subject: disable_hidden.patch
Electron uses this to disable background throttling for hidden windows.
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index b45f6c87126490c5a1950829dac073d01d530b5b..f80754952223fd544206c0ebb49205e6f0aabd7a 100644
index 7aaea0969a47e0e34e529863867e0a0a7b586692..06524496cdad2dfecc8a7cba98a44eac4fa87101 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -711,6 +711,9 @@ void RenderWidgetHostImpl::WasHidden() {
@@ -712,6 +712,9 @@ void RenderWidgetHostImpl::WasHidden() {
if (is_hidden_)
return;
@ -34,7 +34,7 @@ index 81c55683ea0c08bc87487b7d0bd45160634d3aa3..bb1b37ae5cb6fce48aaa7a8e9e636a7b
// |routing_id| must not be MSG_ROUTING_NONE.
// If this object outlives |delegate|, DetachDelegate() must be called when
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index c219aee6f7b704a5fbbb520bfdc3dca25a1acafb..413a27df92be918c9eeae3d0a55eb4fd11e826bb 100644
index c3c9629206280dcd6b61bd1ba9342eeb30c4d2b0..e4bbc1d36e7291c5a504710ca7b8b57cb2e531c9 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -599,7 +599,7 @@ void RenderWidgetHostViewAura::HideImpl() {

2
patches/chromium/disable_unload_metrics.patch
Просмотреть файл

@ -24,7 +24,7 @@ This patch temporarily disables the metrics so we can have green CI, and we
should continue seeking for a real fix.
diff --git a/content/browser/renderer_host/navigator.cc b/content/browser/renderer_host/navigator.cc
index 22dca70c60a5aa2a40b89ab81cea19369f1e531c..41bf5c3685ddc9fc231707993d0dd48b6480cf37 100644
index bc2d7c7f00b2da0e32d48a2d85aeec81ee2c15aa..a69821a91841a6e28e983307bf46ca698db2a374 100644
--- a/content/browser/renderer_host/navigator.cc
+++ b/content/browser/renderer_host/navigator.cc
@@ -1079,6 +1079,7 @@ void Navigator::RecordNavigationMetrics(

4
patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
Просмотреть файл

@ -11,10 +11,10 @@ This regressed in https://chromium-review.googlesource.com/c/chromium/src/+/2572
Upstream: https://chromium-review.googlesource.com/c/chromium/src/+/2598393
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 00af6096b8a678d274fcfb660924e22b4d306c38..211f08342030f7d2696b2d674b21f522344477fd 100644
index f4abb34513e76cf76deb58810b1b4d9387ac0fec..dbe005d4b0e3eba3f4f94493324681b55818e0e3 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -2370,7 +2370,7 @@ blink::WebLocalFrame* RenderFrameImpl::GetWebFrame() {
@@ -2286,7 +2286,7 @@ blink::WebLocalFrame* RenderFrameImpl::GetWebFrame() {
}
const blink::web_pref::WebPreferences& RenderFrameImpl::GetBlinkPreferences() {

8
patches/chromium/enable_reset_aspect_ratio.patch
Просмотреть файл

@ -6,10 +6,10 @@ Subject: feat: enable setting aspect ratio to 0
Make SetAspectRatio accept 0 as valid input, which would reset to null.
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
index 86a6610341e4c502db38d88dc847799fdc3c063c..d23b35e3109eadc70d1f44b90d4ef3dfbbde2751 100644
index 4dcb1abd6a3a07e57a420804d2308e8e54c43c9d..2104bb79dde6bb05fdfc90ca7c4e759ffe9fba4e 100644
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
@@ -487,7 +487,7 @@ void DesktopWindowTreeHostWin::SetOpacity(float opacity) {
@@ -490,7 +490,7 @@ void DesktopWindowTreeHostWin::SetOpacity(float opacity) {
}
void DesktopWindowTreeHostWin::SetAspectRatio(const gfx::SizeF& aspect_ratio) {
@ -19,10 +19,10 @@ index 86a6610341e4c502db38d88dc847799fdc3c063c..d23b35e3109eadc70d1f44b90d4ef3df
aspect_ratio.height());
}
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
index b47486d445ebdbea90f7d8bdfc1edb5be6180ac3..63b8c4e312a97714c34b318bac941be30ede1dd9 100644
index 464b8bacb9009e0b4448822541b53c12e57dc2a5..ee6939b9b4d04980009ad39c9cd809b22fae2d8e 100644
--- a/ui/views/win/hwnd_message_handler.cc
+++ b/ui/views/win/hwnd_message_handler.cc
@@ -924,8 +924,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen) {
@@ -927,8 +927,11 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen) {
}
void HWNDMessageHandler::SetAspectRatio(float aspect_ratio) {

8
patches/chromium/expose_setuseragent_on_networkcontext.patch
Просмотреть файл

@ -33,7 +33,7 @@ index 0ccfe130f00ec3b6c75cd8ee04d5a2777e1fd00c..653829457d58bf92057cc36aa8a28970
DISALLOW_COPY_AND_ASSIGN(StaticHttpUserAgentSettings);
};
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
index 3dda30a8157648644e8c70d1836d43d4143029dc..08e75a10a91bfe9047e448af589438b332cd984e 100644
index 18f9a7c1277653a4a9e0bd2303d57f40fe5f288a..0344da1de5df9ffec6e71669e3115b138420ec9e 100644
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -1140,6 +1140,13 @@ void NetworkContext::SetNetworkConditions(
@ -51,7 +51,7 @@ index 3dda30a8157648644e8c70d1836d43d4143029dc..08e75a10a91bfe9047e448af589438b3
// This may only be called on NetworkContexts created with the constructor
// that calls MakeURLRequestContext().
diff --git a/services/network/network_context.h b/services/network/network_context.h
index 06b1a0d550de946aa41efca2be4efde694cc24c7..fe7c5c6501838e480c2bc95823e9f562839ad99c 100644
index d669e7822b84170dd938dcb3af142ff217814e20..542dace14be8508ada4d72e0ff74c019450f5f07 100644
--- a/services/network/network_context.h
+++ b/services/network/network_context.h
@@ -254,6 +254,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
@ -63,7 +63,7 @@ index 06b1a0d550de946aa41efca2be4efde694cc24c7..fe7c5c6501838e480c2bc95823e9f562
void SetEnableReferrers(bool enable_referrers) override;
#if BUILDFLAG(IS_CHROMEOS_ASH)
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
index 78e3e6f03ef771e2a29bf017538c8f92f9a296cf..bb371e4df1e199e8940f194f9d5c564ca2ba4541 100644
index 6f830a84d20e39b802b44465882f9ae0627a0759..b425a47d5a70267418fee69b55080ac05328a0b5 100644
--- a/services/network/public/mojom/network_context.mojom
+++ b/services/network/public/mojom/network_context.mojom
@@ -952,6 +952,9 @@ interface NetworkContext {
@ -77,7 +77,7 @@ index 78e3e6f03ef771e2a29bf017538c8f92f9a296cf..bb371e4df1e199e8940f194f9d5c564c
SetAcceptLanguage(string new_accept_language);
diff --git a/services/network/test/test_network_context.h b/services/network/test/test_network_context.h
index f233265ccc0be9b412bf2e3e702e12614fa435c4..51006ddb52a0c4c4ea9f1cdb631cf4d75967bb66 100644
index 75ecf5f80d4d67ef25de3a02805201682bde9ad0..75489d54a61ae7a21ef9881f7af424476af5cff3 100644
--- a/services/network/test/test_network_context.h
+++ b/services/network/test/test_network_context.h
@@ -117,6 +117,7 @@ class TestNetworkContext : public mojom::NetworkContext {

4
patches/chromium/extend_apply_webpreferences.patch
Просмотреть файл

@ -12,7 +12,7 @@ Ideally we could add an embedder observer pattern here but that can be
done in future work.
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
index affad073f806c509779c041128708fb074fee8ad..0d3486f136f77375a8977cefeef1e1dea7549045 100644
index 90636a53231ce906a57e30596ebe8385802cecfa..259f945f0117ced38a24aa0dda0a845f9f8bf955 100644
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -155,6 +155,7 @@
@ -23,7 +23,7 @@ index affad073f806c509779c041128708fb074fee8ad..0d3486f136f77375a8977cefeef1e1de
#include "third_party/blink/renderer/platform/graphics/image.h"
#include "third_party/blink/renderer/platform/graphics/paint/cull_rect.h"
#include "third_party/blink/renderer/platform/graphics/paint/paint_record_builder.h"
@@ -1755,6 +1756,16 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
@@ -1747,6 +1748,16 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
RuntimeEnabledFeatures::SetTranslateServiceEnabled(
prefs.translate_service_available);

4
patches/chromium/feat_add_set_theme_source_to_allow_apps_to.patch
Просмотреть файл

@ -13,10 +13,10 @@ uses internally for things like menus and devtools.
We can remove this patch once it has in some shape been upstreamed.
diff --git a/ui/native_theme/native_theme.cc b/ui/native_theme/native_theme.cc
index b58740eaff3a808534933ce20ceac084693658a9..df911cda7c5b083ecf7180db91980e5b1e807208 100644
index 94bc883b019f6311b513edaa5e35f3de015bfb0f..47a81a75e7ef926d3bbf37971b1e3254d3d3e08a 100644
--- a/ui/native_theme/native_theme.cc
+++ b/ui/native_theme/native_theme.cc
@@ -134,6 +134,8 @@ base::Optional<SkColor> NativeTheme::GetColorProviderColor(
@@ -135,6 +135,8 @@ base::Optional<SkColor> NativeTheme::GetColorProviderColor(
}
bool NativeTheme::ShouldUseDarkColors() const {

2
patches/chromium/feat_add_support_for_overriding_the_base_spellchecker_download_url.patch
Просмотреть файл

@ -9,7 +9,7 @@ production use cases. This is unlikely to be upstreamed as the change
is entirely in //chrome.
diff --git a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
index ca81ec53b3316bfc01c083818d5d2b4c0b59e967..c303a5bdd8cc3d19c61b03206c5e17ed98fefabf 100644
index afe8d213363f61f49a3be323f1f5e8eb8c5a1dd9..191c12c845e18e37ace1935580c859546303fab1 100644
--- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
+++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
@@ -50,6 +50,9 @@ namespace {

10
patches/chromium/feat_allow_disabling_blink_scheduler_throttling_per_renderview.patch
Просмотреть файл

@ -6,10 +6,10 @@ Subject: feat: allow disabling blink scheduler throttling per RenderView
This allows us to disable throttling for hidden windows.
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
index cf7e07971a0df4138df089ebb65b6b484970564c..844b17adb38436f9450096fd174310ed347122d8 100644
index 756ad32666dcf1be906e348706af4b1dbdb1bb92..c0dd093e9e396af70f7b5f7003f1e6599fa6b870 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -611,6 +611,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
@@ -612,6 +612,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
GetWidget()->GetAssociatedFrameWidget()->SetBackgroundOpaque(opaque);
}
@ -85,10 +85,10 @@ index 733afd6ead8ff4103c3273401d8c68ac24b51b45..d6b08817ed5446b45d29996178d2fe22
// Visibility -----------------------------------------------------------
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
index 6716ec77b43373654e278a26de8d5d5691a81bcf..affad073f806c509779c041128708fb074fee8ad 100644
index 540b321309ff594dc120077e0219d35cc92c9117..90636a53231ce906a57e30596ebe8385802cecfa 100644
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -3527,6 +3527,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
@@ -3519,6 +3519,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
return GetPage()->GetPageScheduler();
}
@ -102,7 +102,7 @@ index 6716ec77b43373654e278a26de8d5d5691a81bcf..affad073f806c509779c041128708fb0
void WebViewImpl::SetVisibilityState(
mojom::blink::PageVisibilityState visibility_state,
bool is_initial_state) {
@@ -3539,7 +3546,8 @@ void WebViewImpl::SetVisibilityState(
@@ -3531,7 +3538,8 @@ void WebViewImpl::SetVisibilityState(
}
GetPage()->SetVisibilityState(visibility_state, is_initial_state);
GetPage()->GetPageScheduler()->SetPageVisible(

12
patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
Просмотреть файл

@ -81,10 +81,10 @@ index 1026b739d283f0fc252fa2af83a6d4cf51bc8553..fe562ab60ce98b8bb0c5080a6428deb3
private:
const HWND hwnd_;
diff --git a/components/viz/service/BUILD.gn b/components/viz/service/BUILD.gn
index 159fa9efa79fd429bcef4a45028801e398d97ca2..c0410d8aa5b4352fca5ab5f33577dc5a5f999dd9 100644
index 2ff8732060011e2e1d06861e1197c80b2fba2692..3b954f2f5ae931bf4c297141137315ebbff03cdc 100644
--- a/components/viz/service/BUILD.gn
+++ b/components/viz/service/BUILD.gn
@@ -133,6 +133,8 @@ viz_component("service") {
@@ -135,6 +135,8 @@ viz_component("service") {
"display_embedder/output_surface_provider_impl.h",
"display_embedder/server_shared_bitmap_manager.cc",
"display_embedder/server_shared_bitmap_manager.h",
@ -108,7 +108,7 @@ index 77d463e683d8b8d3a202681a6884eacaab79d70d..05d51cb2637d34c073cd0025e3658036
} // namespace viz
diff --git a/components/viz/service/display_embedder/output_surface_provider_impl.cc b/components/viz/service/display_embedder/output_surface_provider_impl.cc
index 79c800e77a160cc0b10a29dd560d37e19c9d05fd..a9b1b267c97ed513890ba8466f66c3eafcbd5d5b 100644
index 827084542417d45c9db8082e2c2537e7bdb8ff7f..927b48bbd855fdaebe2b26b8efbb7c48fec0c1a6 100644
--- a/components/viz/service/display_embedder/output_surface_provider_impl.cc
+++ b/components/viz/service/display_embedder/output_surface_provider_impl.cc
@@ -25,6 +25,7 @@
@ -146,7 +146,7 @@ index 79c800e77a160cc0b10a29dd560d37e19c9d05fd..a9b1b267c97ed513890ba8466f66c3ea
} else if (renderer_settings.use_skia_renderer) {
DCHECK(gpu_dependency);
{
@@ -241,10 +244,22 @@ std::unique_ptr<OutputSurface> OutputSurfaceProviderImpl::CreateOutputSurface(
@@ -251,10 +254,22 @@ std::unique_ptr<OutputSurface> OutputSurfaceProviderImpl::CreateOutputSurface(
std::unique_ptr<SoftwareOutputDevice>
OutputSurfaceProviderImpl::CreateSoftwareOutputDeviceForPlatform(
gpu::SurfaceHandle surface_handle,
@ -511,10 +511,10 @@ index 04d2ba6d844ee85520a6c51784bf37c818f1bd3f..6095e8b8e177d11782f333cfb3e1c94f
// Creating output surface failed. The host can send a new request, possibly
// with a different compositing mode.
diff --git a/content/browser/compositor/viz_process_transport_factory.cc b/content/browser/compositor/viz_process_transport_factory.cc
index b1d4cf3b353a5937b575960739d9aa2ad70961f4..5d5a0e3904d3528d11a58568d4fd09c96e48471d 100644
index 83a23404d1c029af6f7e7aa695bfe60e71d86fde..eef92d3366715774670ebcdcb76ad84ddd8a4ed0 100644
--- a/content/browser/compositor/viz_process_transport_factory.cc
+++ b/content/browser/compositor/viz_process_transport_factory.cc
@@ -418,8 +418,14 @@ void VizProcessTransportFactory::OnEstablishedGpuChannel(
@@ -395,8 +395,14 @@ void VizProcessTransportFactory::OnEstablishedGpuChannel(
compositor_data.display_private.reset();
root_params->display_private =
compositor_data.display_private.BindNewEndpointAndPassReceiver();

6
patches/chromium/fix_expose_decrementcapturercount_in_web_contents_impl.patch
Просмотреть файл

@ -8,10 +8,10 @@ we invoke it in order to expose contents.decrementCapturerCount([stayHidden, sta
to users. We should try to upstream this.
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 35f052b26017eac5f919cb372d986e8106c79ba7..ac96276ee4d09ca5f5693459dc953fb1685b99be 100644
index 860301d6374687ab8f155e5091aba6239c37af35..8b5e624cf456241c7649456ea92716e8233f4c0f 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -1728,9 +1728,11 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
@@ -1736,9 +1736,11 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
// shown in the address bar), as opposed to one in for example a Prerender.
bool IsPrimaryFrameTree(const FrameTree& frame_tree) const;
@ -25,7 +25,7 @@ index 35f052b26017eac5f919cb372d986e8106c79ba7..ac96276ee4d09ca5f5693459dc953fb1
// Calculates the PageVisibilityState for |visibility|, taking the capturing
// state into account.
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
index 450cff790462dc8659ae668a7efcd9b42050f434..09aebfc15cf461792221f058971fe32c735fe134 100644
index 4a80cbc4c290a21a8b2a5e5c570f97258d97a95c..d1cc03ac29cb3a1cf0ea2ac52a1d850fe821de43 100644
--- a/content/public/browser/web_contents.h
+++ b/content/public/browser/web_contents.h
@@ -563,6 +563,7 @@ class WebContents : public PageNavigator,

6
patches/chromium/fix_properly_honor_printing_page_ranges.patch
Просмотреть файл

@ -10,10 +10,10 @@ them should they exist.
This will be upstreamed.
diff --git a/printing/printing_context_mac.h b/printing/printing_context_mac.h
index 6249cfe4d5a77401ac0d8d31844f11a8c7271e14..da137f8b540d3f6dd4c02ecf500d1f496c523f9d 100644
index 07fcfad6ecf676068d3f0b44f97e748d58b13016..f165eea20ca3b120f5fb499248d65fa7befc7686 100644
--- a/printing/printing_context_mac.h
+++ b/printing/printing_context_mac.h
@@ -82,6 +82,10 @@ class PRINTING_EXPORT PrintingContextMac : public PrintingContext {
@@ -82,6 +82,10 @@ class COMPONENT_EXPORT(PRINTING) PrintingContextMac : public PrintingContext {
// Returns true if the orientation was set.
bool SetOrientationIsLandscape(bool landscape);
@ -25,7 +25,7 @@ index 6249cfe4d5a77401ac0d8d31844f11a8c7271e14..da137f8b540d3f6dd4c02ecf500d1f49
// Returns true if duplex mode is set.
bool SetDuplexModeInPrintSettings(mojom::DuplexMode mode);
diff --git a/printing/printing_context_mac.mm b/printing/printing_context_mac.mm
index ff9b3e08d49cb0daec83df36257729ff2636fe66..20031e220903f0882bef091ed048f47c4c5dc61c 100644
index 90da306872814ed166cc38c769491d3a32af7ab0..4e3a9fb906ec91dda5e13d8e185dce068895e99f 100644
--- a/printing/printing_context_mac.mm
+++ b/printing/printing_context_mac.mm
@@ -189,7 +189,8 @@ PMPaper MatchPaper(CFArrayRef paper_list,

4
patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch
Просмотреть файл

@ -13,10 +13,10 @@ This patch can be removed once app.allowRendererProcessReuse is forced
to true as then Chromiums assumptions around processes become correct.
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index e451a7c6a2bc979458907a15d995693f7d5d38b8..a46dd1572734f50e435f9992d0e30adf15db7966 100644
index 96a40070b3aab960d8e0639636f1a0ee346b0ed3..9c0eb584b755dfe9e366bd0ba7baadc4457eba33 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3033,11 +3033,13 @@ bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) {
@@ -3062,11 +3062,13 @@ bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) {
WebContentsImpl* outermost = GetOutermostWebContents();
if (event.button == blink::WebPointerProperties::Button::kBack &&
outermost->GetController().CanGoBack()) {

4
patches/chromium/fix_use_electron_generated_resources.patch
Просмотреть файл

@ -12,10 +12,10 @@ as they will loaded as empty strings.
* IDS_UTILITY_PROCESS_PRINTING_SERVICE_NAME on Windows
diff --git a/chrome/browser/pdf/pdf_extension_util.cc b/chrome/browser/pdf/pdf_extension_util.cc
index cbdd07cf496b4c0c06e530f4e26c32db0d29d1f9..5eb8d483013d24c21742a6ce658416cdbd1fde7c 100644
index 67a7140453728a685ad8fca283a1465ddc4a8a51..1b7bed03e5c3231fdd73aa369a598db5a883bfec 100644
--- a/chrome/browser/pdf/pdf_extension_util.cc
+++ b/chrome/browser/pdf/pdf_extension_util.cc
@@ -9,8 +9,7 @@
@@ -10,8 +10,7 @@
#include "build/chromeos_buildflags.h"
#include "chrome/browser/browser_process.h"
#include "chrome/common/chrome_content_client.h"

6
patches/chromium/frame_host_manager.patch
Просмотреть файл

@ -6,7 +6,7 @@ Subject: frame_host_manager.patch
Allows embedder to intercept site instances created by chromium.
diff --git a/content/browser/renderer_host/render_frame_host_manager.cc b/content/browser/renderer_host/render_frame_host_manager.cc
index 3eac2b389f4dad1902157ab13ba495e2526ebbe7..9a27359d49b375fc5347c105949a5f02398db230 100644
index f2ccdb02af3278fe955ca1658f4cc50b90e81637..3a4abaad35285b9bf7e9bd77293ca0b2b982f15b 100644
--- a/content/browser/renderer_host/render_frame_host_manager.cc
+++ b/content/browser/renderer_host/render_frame_host_manager.cc
@@ -2922,6 +2922,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
@ -20,10 +20,10 @@ index 3eac2b389f4dad1902157ab13ba495e2526ebbe7..9a27359d49b375fc5347c105949a5f02
}
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 42a877338c34c23ff529121c32b53e56a09f8571..664af0800b211b583d841bfc56b8e579357dd940 100644
index 5622d3d9852edee2b2f49f87606f334d0fa2541e..54e7028025790a9d8119eed53ebf28b16ddf8656 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -261,6 +261,11 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -262,6 +262,11 @@ class CONTENT_EXPORT ContentBrowserClient {
virtual ~ContentBrowserClient() = default;

16
patches/chromium/gpu_notify_when_dxdiag_request_fails.patch
Просмотреть файл

@ -12,10 +12,10 @@ rendering and there is no signal from browser process on this event
to identify it.
diff --git a/content/browser/gpu/gpu_data_manager_impl.cc b/content/browser/gpu/gpu_data_manager_impl.cc
index 2b70aa2406a9edf1af9eaafcf2833935a2089c03..cf420ceda62facea9c871d2754d0d86a22ed2434 100644
index 37cf0780ed47c6d37576a4d6a8eacb33a3efecba..1eaec96a2326c54df9e7d360ad3cfb82294aae41 100644
--- a/content/browser/gpu/gpu_data_manager_impl.cc
+++ b/content/browser/gpu/gpu_data_manager_impl.cc
@@ -234,6 +234,11 @@ void GpuDataManagerImpl::TerminateInfoCollectionGpuProcess() {
@@ -229,6 +229,11 @@ void GpuDataManagerImpl::TerminateInfoCollectionGpuProcess() {
base::AutoLock auto_lock(lock_);
private_->TerminateInfoCollectionGpuProcess();
}
@ -28,10 +28,10 @@ index 2b70aa2406a9edf1af9eaafcf2833935a2089c03..cf420ceda62facea9c871d2754d0d86a
void GpuDataManagerImpl::UpdateGpuFeatureInfo(
diff --git a/content/browser/gpu/gpu_data_manager_impl.h b/content/browser/gpu/gpu_data_manager_impl.h
index 15ee11b33aca857edf44d799004f4424214ecf2e..2735668757843639ca30aa7e270abbdb8f4acbdf 100644
index e04aace2230b3ff6b44235b2c91038c54f2a2c8a..1f7667c39193b330725f88412680c0c3c2ad8ed5 100644
--- a/content/browser/gpu/gpu_data_manager_impl.h
+++ b/content/browser/gpu/gpu_data_manager_impl.h
@@ -105,6 +105,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDataManager,
@@ -103,6 +103,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDataManager,
// BrowserMainParts override instead.
void PostCreateThreads();
void TerminateInfoCollectionGpuProcess();
@ -40,10 +40,10 @@ index 15ee11b33aca857edf44d799004f4424214ecf2e..2735668757843639ca30aa7e270abbdb
// Update the GPU feature info. This updates the blocklist and enabled status
// of GPU rasterization. In the future this will be used for more features.
diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc
index 6a117c1d092afb9f8a459faed07b7deb1cbd97ec..7bd6420444c4692053290bb520c56e1ef0c62621 100644
index 1e20caac3910a41e9fffeef2411b553644192c3c..21543552efe849a058fe27b65c610fbd4b284ae9 100644
--- a/content/browser/gpu/gpu_data_manager_impl_private.cc
+++ b/content/browser/gpu/gpu_data_manager_impl_private.cc
@@ -1093,6 +1093,11 @@ void GpuDataManagerImplPrivate::TerminateInfoCollectionGpuProcess() {
@@ -1082,6 +1082,11 @@ void GpuDataManagerImplPrivate::TerminateInfoCollectionGpuProcess() {
host->ForceShutdown();
}
@ -56,10 +56,10 @@ index 6a117c1d092afb9f8a459faed07b7deb1cbd97ec..7bd6420444c4692053290bb520c56e1e
void GpuDataManagerImplPrivate::UpdateGpuFeatureInfo(
diff --git a/content/browser/gpu/gpu_data_manager_impl_private.h b/content/browser/gpu/gpu_data_manager_impl_private.h
index 40b736989347b13e0ec0393bd02d67d2cae5ef96..90c561e1fc0d9b6ebf7c6dde6912c55505cc7c56 100644
index b024f38cef70991a354a6498c5a46400230dec25..8e01059b128732c460d7ddc74db55eb12e437c17 100644
--- a/content/browser/gpu/gpu_data_manager_impl_private.h
+++ b/content/browser/gpu/gpu_data_manager_impl_private.h
@@ -77,6 +77,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
@@ -76,6 +76,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
bool VulkanRequested() const;
void PostCreateThreads();
void TerminateInfoCollectionGpuProcess();

4
patches/chromium/gritsettings_resource_ids.patch
Просмотреть файл

@ -6,10 +6,10 @@ Subject: gritsettings_resource_ids.patch
Add electron resources file to the list of resource ids generation.
diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec
index e63a3400260a22a968921fbe6eadd75244e11245..68134c69be6b61d9b9f2103411927d89e47549dd 100644
index 58356e7b6d647165d965587e63d3a7ceca212a87..18166539c39398e9863bef7abdde6321e12ca7fb 100644
--- a/tools/gritsettings/resource_ids.spec
+++ b/tools/gritsettings/resource_ids.spec
@@ -751,6 +751,11 @@
@@ -763,6 +763,11 @@
"includes": [3880],
},

15
patches/chromium/mas_disable_custom_window_frame.patch
Просмотреть файл

@ -7,7 +7,7 @@ Disable private window frame APIs (NSNextStepFrame and NSThemeFrame) for MAS
build.
diff --git a/components/remote_cocoa/app_shim/browser_native_widget_window_mac.mm b/components/remote_cocoa/app_shim/browser_native_widget_window_mac.mm
index 69580888047c4ac6abb68873315bcafb78dda706..aa347913a75084f669bf7d89fbcc919b5222c2d5 100644
index cf88f696a46ff0ac84bcf466b44d1080438426c1..7672eee30a811001a0149edfa4eed9dc6a4b11f6 100644
--- a/components/remote_cocoa/app_shim/browser_native_widget_window_mac.mm
+++ b/components/remote_cocoa/app_shim/browser_native_widget_window_mac.mm
@@ -9,6 +9,7 @@
@ -18,7 +18,7 @@ index 69580888047c4ac6abb68873315bcafb78dda706..aa347913a75084f669bf7d89fbcc919b
@interface NSWindow (PrivateBrowserNativeWidgetAPI)
+ (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle;
@end
@@ -63,6 +64,8 @@ - (NSRect)_draggableFrame NS_DEPRECATED_MAC(10_10, 10_11) {
@@ -63,10 +64,13 @@ - (NSRect)_draggableFrame NS_DEPRECATED_MAC(10_10, 10_11) {
@end
@ -26,16 +26,13 @@ index 69580888047c4ac6abb68873315bcafb78dda706..aa347913a75084f669bf7d89fbcc919b
+
@implementation BrowserNativeWidgetWindow
// Prevent detached tabs from glitching when the window is partially offscreen.
@@ -84,6 +87,7 @@ - (NSRect)constrainFrameRect:(NSRect)rect toScreen:(NSScreen*)screen {
// NSWindow (PrivateAPI) overrides.
+#ifndef MAS_BUILD
+ (Class)frameViewClassForStyleMask:(NSUInteger)windowStyle {
// - NSThemeFrame and its subclasses will be nil if it's missing at runtime.
if ([BrowserWindowFrame class])
@@ -98,6 +102,8 @@ - (BOOL)_usesCustomDrawing {
@@ -81,6 +85,8 @@ - (BOOL)_usesCustomDrawing {
return NO;
}
@ -98,7 +95,7 @@ index 5a23ea7558814eec59eda349bc7194afcb70d01e..c9147bbe5a225291552082434e5db342
// The NSWindow used by BridgedNativeWidget. Provides hooks into AppKit that
// can only be accomplished by overriding methods.
diff --git a/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm b/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm
index a071d1f91bfcc1bbd513d2c62e820ddac6bca27f..e94585cd138e350714f9482be79a339e4e51d484 100644
index ca3d6a6626d191bcc6253ab35e2b5094e50d11d3..a693e44156a82dad9846be60436c5ada3972d0d9 100644
--- a/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm
+++ b/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm
@@ -16,7 +16,9 @@
@ -129,7 +126,7 @@ index a071d1f91bfcc1bbd513d2c62e820ddac6bca27f..e94585cd138e350714f9482be79a339e
@implementation NativeWidgetMacNSWindow {
@private
base::scoped_nsobject<CommandDispatcher> _commandDispatcher;
@@ -177,6 +183,8 @@ - (BOOL)hasViewsMenuActive {
@@ -181,6 +187,8 @@ - (BOOL)hasViewsMenuActive {
// NSWindow overrides.
@ -138,7 +135,7 @@ index a071d1f91bfcc1bbd513d2c62e820ddac6bca27f..e94585cd138e350714f9482be79a339e
+ (Class)frameViewClassForStyleMask:(NSWindowStyleMask)windowStyle {
if (windowStyle & NSWindowStyleMaskTitled) {
if (Class customFrame = [NativeWidgetMacNSWindowTitledFrame class])
@@ -188,6 +196,8 @@ + (Class)frameViewClassForStyleMask:(NSWindowStyleMask)windowStyle {
@@ -192,6 +200,8 @@ + (Class)frameViewClassForStyleMask:(NSWindowStyleMask)windowStyle {
return [super frameViewClassForStyleMask:windowStyle];
}

24
patches/chromium/mas_disable_remote_accessibility.patch
Просмотреть файл

@ -90,7 +90,7 @@ index c3a9fbf0f9d2b80c1de42a22ad094a286f0b559b..02493d4b62c98a3aebd3e460c459218a
DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostNSViewBridgeOwner);
};
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.h b/content/browser/renderer_host/render_widget_host_view_mac.h
index e90a65944dff6987341a571b2f9fdaeaa7a54e8d..b5890b54640111537fa30c954670931bc5ac96c2 100644
index 03c0e80b45ea616862a65b5e37ac734ac204c483..4d3b4a097247afcab477e32ae6300e745f60b1d3 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.h
+++ b/content/browser/renderer_host/render_widget_host_view_mac.h
@@ -47,7 +47,9 @@ class ScopedPasswordInputEnabler;
@ -103,7 +103,7 @@ index e90a65944dff6987341a571b2f9fdaeaa7a54e8d..b5890b54640111537fa30c954670931b
@class RenderWidgetHostViewCocoa;
namespace content {
@@ -651,10 +653,12 @@ class CONTENT_EXPORT RenderWidgetHostViewMac
@@ -654,10 +656,12 @@ class CONTENT_EXPORT RenderWidgetHostViewMac
// EnsureSurfaceSynchronizedForWebTest().
uint32_t latest_capture_sequence_number_ = 0u;
@ -117,10 +117,10 @@ index e90a65944dff6987341a571b2f9fdaeaa7a54e8d..b5890b54640111537fa30c954670931b
// Used to force the NSApplication's focused accessibility element to be the
// content::BrowserAccessibilityCocoa accessibility tree when the NSView for
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
index fea56a43d4e02e0f1ece22c91c2ba47be9b6aca1..1b4014ad558c9030a495c79458008915c28e7516 100644
index e99a5a11a5f48b985aa3cc28eae2c53eec34a518..3e7d3dbd8fd39a3554d91bd15c567b8fadb27d6f 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -237,8 +237,10 @@
@@ -238,8 +238,10 @@
void RenderWidgetHostViewMac::MigrateNSViewBridge(
remote_cocoa::mojom::Application* remote_cocoa_application,
uint64_t parent_ns_view_id) {
@ -131,7 +131,7 @@ index fea56a43d4e02e0f1ece22c91c2ba47be9b6aca1..1b4014ad558c9030a495c79458008915
// Disconnect from the previous bridge (this will have the effect of
// destroying the associated bridge), and close the receiver (to allow it
@@ -1398,8 +1400,10 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
@@ -1401,8 +1403,10 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
gfx::NativeViewAccessible
RenderWidgetHostViewMac::AccessibilityGetNativeViewAccessibleForWindow() {
@ -142,7 +142,7 @@ index fea56a43d4e02e0f1ece22c91c2ba47be9b6aca1..1b4014ad558c9030a495c79458008915
return [GetInProcessNSView() window];
}
@@ -1443,9 +1447,11 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
@@ -1446,9 +1450,11 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
}
void RenderWidgetHostViewMac::SetAccessibilityWindow(NSWindow* window) {
@ -154,7 +154,7 @@ index fea56a43d4e02e0f1ece22c91c2ba47be9b6aca1..1b4014ad558c9030a495c79458008915
}
bool RenderWidgetHostViewMac::SyncIsWidgetForMainFrame(
@@ -1933,12 +1939,14 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
@@ -1937,12 +1943,14 @@ void CombineTextNodesAndMakeCallback(SpeechCallback callback,
void RenderWidgetHostViewMac::SetRemoteAccessibilityWindowToken(
const std::vector<uint8_t>& window_token) {
@ -170,10 +170,10 @@ index fea56a43d4e02e0f1ece22c91c2ba47be9b6aca1..1b4014ad558c9030a495c79458008915
///////////////////////////////////////////////////////////////////////////////
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
index 07b180bec103efbb35d3bdc118e8d9bf229efd98..2f52f2a10e7737c3130f4f775375442bd97e7465 100644
index 2bcb3fd35fd4505ee29d5030ce9434cbf23a8447..3990639fa204ec44a3d4e49ee200337bed86f53c 100644
--- a/ui/base/BUILD.gn
+++ b/ui/base/BUILD.gn
@@ -316,6 +316,13 @@ component("base") {
@@ -314,6 +314,13 @@ component("base") {
]
}
@ -236,7 +236,7 @@ index b6d860060e4ba86d8871bd19e7011a64eb057350..040a18fa5049698429d2c51b52d32409
// Used to force the NSApplication's focused accessibility element to be the
// views::Views accessibility tree when the NSView for this is focused.
diff --git a/ui/views/cocoa/native_widget_mac_ns_window_host.mm b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
index 67ce94cee02709aacb681d1ed78530576a8e81f3..3da45d8ca23e470fe571da0b468af766ab19bdb5 100644
index 44973b5dce26d297eb5339cf9ede2ff06767a453..af92ed3311c14e54845bf743fdea7654f8b6c93d 100644
--- a/ui/views/cocoa/native_widget_mac_ns_window_host.mm
+++ b/ui/views/cocoa/native_widget_mac_ns_window_host.mm
@@ -284,14 +284,22 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
@ -262,7 +262,7 @@ index 67ce94cee02709aacb681d1ed78530576a8e81f3..3da45d8ca23e470fe571da0b468af766
}
remote_cocoa::mojom::NativeWidgetNSWindow*
@@ -1164,6 +1172,7 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
@@ -1172,6 +1180,7 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
void NativeWidgetMacNSWindowHost::SetRemoteAccessibilityTokens(
const std::vector<uint8_t>& window_token,
const std::vector<uint8_t>& view_token) {
@ -270,7 +270,7 @@ index 67ce94cee02709aacb681d1ed78530576a8e81f3..3da45d8ca23e470fe571da0b468af766
remote_window_accessible_ =
ui::RemoteAccessibility::GetRemoteElementFromToken(window_token);
remote_view_accessible_ =
@@ -1171,14 +1180,17 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
@@ -1179,14 +1188,17 @@ void HandleAccelerator(const ui::Accelerator& accelerator,
[remote_view_accessible_ setWindowUIElement:remote_window_accessible_.get()];
[remote_view_accessible_
setTopLevelUIElement:remote_window_accessible_.get()];

66
patches/chromium/mas_no_private_api.patch
Просмотреть файл

@ -7,10 +7,10 @@ Guard usages in blink of private Mac APIs by MAS_BUILD, so they can be
excluded for people who want to submit their apps to the Mac App store.
diff --git a/content/browser/accessibility/accessibility_tree_formatter_mac.mm b/content/browser/accessibility/accessibility_tree_formatter_mac.mm
index 1659e070cae733cf2213d752fcc262fb2bce2b54..57a3a34365f723b6e75a5f90d50533a45773e395 100644
index 4336e1d01f88605ea7f2bbbb644869c5ee7b9b5a..a3eaef03a435d5b06fd8cb97264c19b08358013f 100644
--- a/content/browser/accessibility/accessibility_tree_formatter_mac.mm
+++ b/content/browser/accessibility/accessibility_tree_formatter_mac.mm
@@ -261,7 +261,7 @@
@@ -264,7 +264,7 @@
return PopulateSize([value sizeValue]);
}
}
@ -19,7 +19,7 @@ index 1659e070cae733cf2213d752fcc262fb2bce2b54..57a3a34365f723b6e75a5f90d50533a4
// AXTextMarker
if (content::IsAXTextMarker(value)) {
return PopulateTextPosition(content::AXTextMarkerToAXPosition(value),
@@ -272,6 +272,7 @@
@@ -275,6 +275,7 @@
if (content::IsAXTextMarkerRange(value)) {
return PopulateTextMarkerRange(value, line_indexer);
}
@ -27,8 +27,8 @@ index 1659e070cae733cf2213d752fcc262fb2bce2b54..57a3a34365f723b6e75a5f90d50533a4
// AXValue
if (CFGetTypeID(value) == AXValueGetTypeID()) {
@@ -384,7 +385,7 @@
kConstValuePrefix + affinity);
@@ -392,7 +393,7 @@
AXMakeConst(affinity));
return set;
}
-
@ -36,7 +36,7 @@ index 1659e070cae733cf2213d752fcc262fb2bce2b54..57a3a34365f723b6e75a5f90d50533a4
base::Value AccessibilityTreeFormatterMac::PopulateTextMarkerRange(
id marker_range,
const LineIndexer* line_indexer) const {
@@ -400,7 +401,7 @@
@@ -408,7 +409,7 @@
PopulateTextPosition(ax_range.focus()->Clone(), line_indexer));
return dict;
}
@ -125,7 +125,7 @@ index a7d6351854d08926c4e9c43c95e9075bd4d4c728..9c89595cb6c37527b96b4afde3871333
// is concerned.
@property(nonatomic, readonly) NSString* subrole;
diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm
index f4114de49429d79e897db7914b458ab2659dee2a..17ccd4093acfe6a43088bf829de34036594843a2 100644
index 4e2e99418b4023abd59e82437bd7964dbb34fbe7..53f3295695dc7d83f2785cbe78050449c882deef 100644
--- a/content/browser/accessibility/browser_accessibility_cocoa.mm
+++ b/content/browser/accessibility/browser_accessibility_cocoa.mm
@@ -203,6 +203,7 @@
@ -152,7 +152,7 @@ index f4114de49429d79e897db7914b458ab2659dee2a..17ccd4093acfe6a43088bf829de34036
extern "C" {
// The following are private accessibility APIs required for cursor navigation
@@ -473,6 +476,7 @@ void AddMisspelledTextAttributes(const BrowserAccessibility::AXRange& ax_range,
@@ -476,6 +479,7 @@ void AddMisspelledTextAttributes(const BrowserAccessibility::AXRange& ax_range,
AddMisspelledTextAttributes(ax_range, attributed_text);
return attributed_text;
}
@ -160,7 +160,7 @@ index f4114de49429d79e897db7914b458ab2659dee2a..17ccd4093acfe6a43088bf829de34036
// Returns an autoreleased copy of the AXNodeData's attribute.
NSString* NSStringForStringAttribute(BrowserAccessibility* browserAccessibility,
@@ -744,6 +748,7 @@ bool IsSelectedStateRelevant(BrowserAccessibility* item) {
@@ -747,6 +751,7 @@ bool IsSelectedStateRelevant(BrowserAccessibility* item) {
#define NSAccessibilityLanguageAttribute @"AXLanguage"
#endif
@ -168,7 +168,7 @@ index f4114de49429d79e897db7914b458ab2659dee2a..17ccd4093acfe6a43088bf829de34036
bool content::IsAXTextMarker(id object) {
if (object == nil)
return false;
@@ -787,6 +792,7 @@ bool IsSelectedStateRelevant(BrowserAccessibility* item) {
@@ -790,6 +795,7 @@ bool IsSelectedStateRelevant(BrowserAccessibility* item) {
kCFAllocatorDefault, anchor_textmarker, focus_textmarker);
return [static_cast<id>(cf_marker_range) autorelease];
}
@ -176,7 +176,7 @@ index f4114de49429d79e897db7914b458ab2659dee2a..17ccd4093acfe6a43088bf829de34036
@implementation BrowserAccessibilityCocoa
@@ -826,7 +832,9 @@ + (void)initialize {
@@ -829,7 +835,9 @@ + (void)initialize {
{NSAccessibilityEditableAncestorAttribute, @"editableAncestor"},
{NSAccessibilityElementBusyAttribute, @"elementBusy"},
{NSAccessibilityEnabledAttribute, @"enabled"},
@ -186,7 +186,7 @@ index f4114de49429d79e897db7914b458ab2659dee2a..17ccd4093acfe6a43088bf829de34036
{NSAccessibilityExpandedAttribute, @"expanded"},
{NSAccessibilityFocusableAncestorAttribute, @"focusableAncestor"},
{NSAccessibilityFocusedAttribute, @"focused"},
@@ -838,8 +846,10 @@ + (void)initialize {
@@ -841,8 +849,10 @@ + (void)initialize {
{NSAccessibilityHighestEditableAncestorAttribute,
@"highestEditableAncestor"},
{NSAccessibilityIndexAttribute, @"index"},
@ -197,7 +197,7 @@ index f4114de49429d79e897db7914b458ab2659dee2a..17ccd4093acfe6a43088bf829de34036
{NSAccessibilityInvalidAttribute, @"invalid"},
{NSAccessibilityIsMultiSelectableAttribute, @"isMultiSelectable"},
{NSAccessibilityLanguageAttribute, @"language"},
@@ -861,13 +871,17 @@ + (void)initialize {
@@ -864,13 +874,17 @@ + (void)initialize {
{NSAccessibilityRowsAttribute, @"rows"},
// TODO(aboxhall): expose
// NSAccessibilityServesAsTitleForUIElementsAttribute
@ -215,7 +215,7 @@ index f4114de49429d79e897db7914b458ab2659dee2a..17ccd4093acfe6a43088bf829de34036
{NSAccessibilitySizeAttribute, @"size"},
{NSAccessibilitySortDirectionAttribute, @"sortDirection"},
{NSAccessibilitySubroleAttribute, @"subrole"},
@@ -1371,6 +1385,7 @@ - (NSNumber*)enabled {
@@ -1374,6 +1388,7 @@ - (NSNumber*)enabled {
ax::mojom::Restriction::kDisabled);
}
@ -223,7 +223,7 @@ index f4114de49429d79e897db7914b458ab2659dee2a..17ccd4093acfe6a43088bf829de34036
// Returns a text marker that points to the last character in the document that
// can be selected with VoiceOver.
- (id)endTextMarker {
@@ -1379,6 +1394,7 @@ - (id)endTextMarker {
@@ -1382,6 +1397,7 @@ - (id)endTextMarker {
BrowserAccessibility::AXPosition position = _owner->CreatePositionAt(0);
return CreateTextMarker(position->CreatePositionAtEndOfContent());
}
@ -231,7 +231,7 @@ index f4114de49429d79e897db7914b458ab2659dee2a..17ccd4093acfe6a43088bf829de34036
- (NSNumber*)expanded {
if (![self instanceActive])
@@ -1579,6 +1595,7 @@ - (bool)findRowIndex:(BrowserAccessibilityCocoa*)toFind
@@ -1582,6 +1598,7 @@ - (bool)findRowIndex:(BrowserAccessibilityCocoa*)toFind
return false;
}
@ -239,7 +239,7 @@ index f4114de49429d79e897db7914b458ab2659dee2a..17ccd4093acfe6a43088bf829de34036
- (NSNumber*)insertionPointLineNumber {
if (![self instanceActive])
return nil;
@@ -1604,6 +1621,7 @@ - (NSNumber*)insertionPointLineNumber {
@@ -1607,6 +1624,7 @@ - (NSNumber*)insertionPointLineNumber {
caretPosition->AsTextPosition()->text_offset());
return @(std::distance(lineBreaks.begin(), iterator));
}
@ -247,7 +247,7 @@ index f4114de49429d79e897db7914b458ab2659dee2a..17ccd4093acfe6a43088bf829de34036
// Returns whether or not this node should be ignored in the
// accessibility tree.
@@ -1955,8 +1973,12 @@ - (BOOL)shouldExposeTitleUIElement {
@@ -1958,8 +1976,12 @@ - (BOOL)shouldExposeTitleUIElement {
return content::AXTextEdit(newValue, std::u16string(), nil);
}
}
@ -260,7 +260,7 @@ index f4114de49429d79e897db7914b458ab2659dee2a..17ccd4093acfe6a43088bf829de34036
}
- (BOOL)instanceActive {
@@ -2283,6 +2305,7 @@ - (NSArray*)selectedChildren {
@@ -2285,6 +2307,7 @@ - (NSArray*)selectedChildren {
return ret;
}
@ -268,7 +268,7 @@ index f4114de49429d79e897db7914b458ab2659dee2a..17ccd4093acfe6a43088bf829de34036
- (NSString*)selectedText {
if (![self instanceActive])
return nil;
@@ -2294,11 +2317,13 @@ - (NSString*)selectedText {
@@ -2296,11 +2319,13 @@ - (NSString*)selectedText {
return nil;
return base::SysUTF16ToNSString(range.GetText());
}
@ -282,7 +282,7 @@ index f4114de49429d79e897db7914b458ab2659dee2a..17ccd4093acfe6a43088bf829de34036
- (NSValue*)selectedTextRange {
if (![self instanceActive])
return nil;
@@ -2323,7 +2348,9 @@ - (NSValue*)selectedTextRange {
@@ -2325,7 +2350,9 @@ - (NSValue*)selectedTextRange {
int selLength = range.GetText().length();
return [NSValue valueWithRange:NSMakeRange(selStart, selLength)];
}
@ -292,7 +292,7 @@ index f4114de49429d79e897db7914b458ab2659dee2a..17ccd4093acfe6a43088bf829de34036
- (id)selectedTextMarkerRange {
if (![self instanceActive])
return nil;
@@ -2335,6 +2362,7 @@ - (id)selectedTextMarkerRange {
@@ -2337,6 +2364,7 @@ - (id)selectedTextMarkerRange {
// words correctly.
return CreateTextMarkerRange(ax_range.AsBackwardRange());
}
@ -300,7 +300,7 @@ index f4114de49429d79e897db7914b458ab2659dee2a..17ccd4093acfe6a43088bf829de34036
- (NSValue*)size {
if (![self instanceActive])
@@ -2367,6 +2395,7 @@ - (NSString*)sortDirection {
@@ -2369,6 +2397,7 @@ - (NSString*)sortDirection {
return nil;
}
@ -308,7 +308,7 @@ index f4114de49429d79e897db7914b458ab2659dee2a..17ccd4093acfe6a43088bf829de34036
// Returns a text marker that points to the first character in the document that
// can be selected with VoiceOver.
- (id)startTextMarker {
@@ -2375,6 +2404,7 @@ - (id)startTextMarker {
@@ -2377,6 +2406,7 @@ - (id)startTextMarker {
BrowserAccessibility::AXPosition position = _owner->CreatePositionAt(0);
return CreateTextMarker(position->CreatePositionAtStartOfContent());
}
@ -316,7 +316,7 @@ index f4114de49429d79e897db7914b458ab2659dee2a..17ccd4093acfe6a43088bf829de34036
// Returns a subrole based upon the role.
- (NSString*)subrole {
@@ -2704,12 +2734,14 @@ - (NSAttributedString*)attributedValueForRange:(NSRange)range {
@@ -2706,12 +2736,14 @@ - (NSAttributedString*)attributedValueForRange:(NSRange)range {
NSMutableAttributedString* attributedInnerText =
[[[NSMutableAttributedString alloc]
initWithString:base::SysUTF16ToNSString(innerText)] autorelease];
@ -331,7 +331,7 @@ index f4114de49429d79e897db7914b458ab2659dee2a..17ccd4093acfe6a43088bf829de34036
return [attributedInnerText attributedSubstringFromRange:range];
}
@@ -2822,6 +2854,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
@@ -2824,6 +2856,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
return ToBrowserAccessibilityCocoa(cell);
}
@ -339,7 +339,7 @@ index f4114de49429d79e897db7914b458ab2659dee2a..17ccd4093acfe6a43088bf829de34036
if ([attribute
isEqualToString:
NSAccessibilityUIElementForTextMarkerParameterizedAttribute]) {
@@ -3145,6 +3178,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
@@ -3147,6 +3180,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
return CreateTextMarker(root->CreatePositionAt(index));
}
@ -347,7 +347,7 @@ index f4114de49429d79e897db7914b458ab2659dee2a..17ccd4093acfe6a43088bf829de34036
if ([attribute isEqualToString:
NSAccessibilityBoundsForRangeParameterizedAttribute]) {
@@ -3175,6 +3209,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
@@ -3177,6 +3211,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
return nil;
}
@ -355,7 +355,7 @@ index f4114de49429d79e897db7914b458ab2659dee2a..17ccd4093acfe6a43088bf829de34036
if ([attribute
isEqualToString:
NSAccessibilityLineTextMarkerRangeForTextMarkerParameterizedAttribute]) {
@@ -3294,6 +3329,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
@@ -3296,6 +3331,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
return @(child->GetIndexInParent());
}
@ -363,15 +363,15 @@ index f4114de49429d79e897db7914b458ab2659dee2a..17ccd4093acfe6a43088bf829de34036
return nil;
}
@@ -3823,6 +3859,7 @@ - (void)accessibilitySetValue:(id)value forAttribute:(NSString*)attribute {
_owner->CreatePositionAt(range.location),
_owner->CreatePositionAt(NSMaxRange(range))));
@@ -3825,6 +3861,7 @@ - (void)accessibilitySetValue:(id)value forAttribute:(NSString*)attribute {
_owner->CreatePositionAt(range.location)->AsLeafTextPosition(),
_owner->CreatePositionAt(NSMaxRange(range))->AsLeafTextPosition()));
}
+#ifndef MAS_BUILD
if ([attribute
isEqualToString:NSAccessibilitySelectedTextMarkerRangeAttribute]) {
BrowserAccessibility::AXRange range = CreateRangeFromTextMarkerRange(value);
@@ -3833,6 +3870,7 @@ - (void)accessibilitySetValue:(id)value forAttribute:(NSString*)attribute {
@@ -3835,6 +3872,7 @@ - (void)accessibilitySetValue:(id)value forAttribute:(NSString*)attribute {
BrowserAccessibility::AXRange(range.anchor()->AsLeafTextPosition(),
range.focus()->AsLeafTextPosition()));
}

8
patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
Просмотреть файл

@ -7,12 +7,12 @@ This adds a callback from the network service that's used to implement
session.setCertificateVerifyCallback.
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
index 1532b031db2cc3a7fc0cc03969000d57d87cd914..3dda30a8157648644e8c70d1836d43d4143029dc 100644
index eeadeb1b81259e81e73a0a31080c2803c0e84f0c..18f9a7c1277653a4a9e0bd2303d57f40fe5f288a 100644
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -117,6 +117,11 @@
#include "services/network/url_loader.h"
#include "services/network/url_request_context_builder_mojo.h"
#include "services/network/web_transport.h"
+// Electron
+#include "net/cert/caching_cert_verifier.h"
@ -127,7 +127,7 @@ index 1532b031db2cc3a7fc0cc03969000d57d87cd914..3dda30a8157648644e8c70d1836d43d4
builder.SetCertVerifier(IgnoreErrorsCertVerifier::MaybeWrapCertVerifier(
diff --git a/services/network/network_context.h b/services/network/network_context.h
index 72885bc1d20a4da5ad4df3fb8185f05bcf6fbfba..06b1a0d550de946aa41efca2be4efde694cc24c7 100644
index 807173939f192a8aa839554ee503552ed49038eb..d669e7822b84170dd938dcb3af142ff217814e20 100644
--- a/services/network/network_context.h
+++ b/services/network/network_context.h
@@ -90,6 +90,7 @@ class DomainReliabilityMonitor;
@ -157,7 +157,7 @@ index 72885bc1d20a4da5ad4df3fb8185f05bcf6fbfba..06b1a0d550de946aa41efca2be4efde6
// CertNetFetcher is not used by the current platform, or if the actual
// net::CertVerifier is instantiated outside of the network service.
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
index c89e5ae1d90db787190f67d1497217981b806abc..78e3e6f03ef771e2a29bf017538c8f92f9a296cf 100644
index e24ec4cb3c49ade12be048d96aaca2f672fb292f..6f830a84d20e39b802b44465882f9ae0627a0759 100644
--- a/services/network/public/mojom/network_context.mojom
+++ b/services/network/public/mojom/network_context.mojom
@@ -192,6 +192,17 @@ struct CTPolicy {

2
patches/chromium/no_cache_storage_check.patch
Просмотреть файл

@ -7,7 +7,7 @@ Do not check for unique origin in CacheStorage, in Electron we may have
scripts running without an origin.
diff --git a/content/browser/cache_storage/legacy/legacy_cache_storage.cc b/content/browser/cache_storage/legacy/legacy_cache_storage.cc
index 4c6c0a5b3cddb0e54352349ca7ff91f8d589f647..05ae7b485b8147b46e4d0ec13b455ab339351f64 100644
index 4c96defefe188f113015b70510a8205deddb7cdb..c309134839b138f649392775b69f3a71d1eec73a 100644
--- a/content/browser/cache_storage/legacy/legacy_cache_storage.cc
+++ b/content/browser/cache_storage/legacy/legacy_cache_storage.cc
@@ -107,7 +107,7 @@ class LegacyCacheStorage::CacheLoader {

6
patches/chromium/notification_provenance.patch
Просмотреть файл

@ -108,10 +108,10 @@ index 71dad766e05ac4726e1e18159f2af5ea01079a91..ef8e55a4420288fe64c99e68d0a649a9
const GURL& document_url,
mojo::PendingReceiver<blink::mojom::NotificationService> receiver);
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 7f27667bd444e8b6f081c02a8a30aecdd937b122..9a57706a1f1cfaad240cd1ccc626b548e4c9e0f6 100644
index 8ed81f9cc14157827c33aab5952e2b28c0755027..458f004ce92f719795dbc91f65a6bb6f05244291 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -2123,7 +2123,7 @@ void RenderProcessHostImpl::CreateNotificationService(
@@ -2152,7 +2152,7 @@ void RenderProcessHostImpl::CreateNotificationService(
document_url = rfh->GetLastCommittedURL();
storage_partition_impl_->GetPlatformNotificationContext()->CreateService(
@ -142,7 +142,7 @@ index 9646cbeb31141e3518f51482801431f3a6010360..b13b6ab07b4931b892749c84879d9a6a
const GURL& origin,
const GURL& document_url,
diff --git a/content/test/mock_platform_notification_service.cc b/content/test/mock_platform_notification_service.cc
index 686d5b5e53de58b4b9dc8d9cbaae5b75c7e47f2f..4d276041e0b7429186f1cc443aea09eff6c63851 100644
index d36d0c40d61f4e131c4a996d283a6ce2d3657ac3..ee08f52a9f8a02c380e8aac52c59849540e8bf4a 100644
--- a/content/test/mock_platform_notification_service.cc
+++ b/content/test/mock_platform_notification_service.cc
@@ -29,6 +29,7 @@ MockPlatformNotificationService::MockPlatformNotificationService(

6
patches/chromium/picture-in-picture.patch
Просмотреть файл

@ -48,7 +48,7 @@ index 4b741d67c4c20766e248f0799825103ba4f2a1ce..adf85811da98e1666e8e93e5b339e176
#include "ui/base/l10n/l10n_util.h"
#include "ui/gfx/paint_vector_icon.h"
diff --git a/chrome/browser/ui/views/overlay/overlay_window_views.cc b/chrome/browser/ui/views/overlay/overlay_window_views.cc
index 5fa109767bd140ea9c484ec8dd6f4f385993b1d9..1682aca7888a28667c822233131c90e83e501965 100644
index c996365b075abf026b4c26bce0ec89668cf933b8..04c6218f5f59b2d0d3d8e005461fa016fc4e1f33 100644
--- a/chrome/browser/ui/views/overlay/overlay_window_views.cc
+++ b/chrome/browser/ui/views/overlay/overlay_window_views.cc
@@ -16,9 +16,11 @@
@ -72,7 +72,7 @@ index 5fa109767bd140ea9c484ec8dd6f4f385993b1d9..1682aca7888a28667c822233131c90e8
#include "components/url_formatter/url_formatter.h"
#include "components/vector_icons/vector_icons.h"
#include "content/public/browser/picture_in_picture_window_controller.h"
@@ -55,7 +57,7 @@
@@ -56,7 +58,7 @@
#include "ui/aura/window.h"
#endif
@ -81,7 +81,7 @@ index 5fa109767bd140ea9c484ec8dd6f4f385993b1d9..1682aca7888a28667c822233131c90e8
#include "chrome/browser/shell_integration_win.h"
#include "ui/aura/window.h"
#include "ui/aura/window_tree_host.h"
@@ -239,7 +241,7 @@ std::unique_ptr<OverlayWindowViews> OverlayWindowViews::Create(
@@ -240,7 +242,7 @@ std::unique_ptr<OverlayWindowViews> OverlayWindowViews::Create(
overlay_window->Init(std::move(params));
overlay_window->OnRootViewReady();

6
patches/chromium/preconnect_feature.patch
Просмотреть файл

@ -8,7 +8,7 @@ this patch removes that dependency so we can reuse it.
Ideally we would change this class in upstream to not depend on Profile.
diff --git a/chrome/browser/predictors/preconnect_manager.cc b/chrome/browser/predictors/preconnect_manager.cc
index c4ea16e117cbf0cedfc6b2b208341cbef8b42a34..de5cf3faaca8f082ba208e19afe9f186a9680ec6 100644
index 7cbe5b3ebac99849dc784e1dc587b3a091abbf49..6de33ea6f7e452cdfbf3271827a943828e93fb8f 100644
--- a/chrome/browser/predictors/preconnect_manager.cc
+++ b/chrome/browser/predictors/preconnect_manager.cc
@@ -69,7 +69,7 @@ PreresolveJob::PreresolveJob(PreresolveJob&& other) = default;
@ -32,8 +32,8 @@ index c4ea16e117cbf0cedfc6b2b208341cbef8b42a34..de5cf3faaca8f082ba208e19afe9f186
}
+#endif
return content::BrowserContext::GetDefaultStoragePartition(profile_)
->GetNetworkContext();
return profile_->GetDefaultStoragePartition()->GetNetworkContext();
}
diff --git a/chrome/browser/predictors/preconnect_manager.h b/chrome/browser/predictors/preconnect_manager.h
index dbdde3dfd9bb160486a1d06f16ef86548798b61c..a4373ebdbe8bb833c3b782e3d3cb27a5116f976d 100644
--- a/chrome/browser/predictors/preconnect_manager.h

4
patches/chromium/printing.patch
Просмотреть файл

@ -622,10 +622,10 @@ index 92561ff7c6bce6febd8cd2f39f59e3df707f8bdb..241686fa8bdc346f073b5fb92f57c72c
std::unique_ptr<PrintSettings> settings =
PrintSettingsFromJobSettings(job_settings);
diff --git a/printing/printing_context.h b/printing/printing_context.h
index c8d087c3f2f3feee2f110a3597affc693fbb6de8..f26bd191fbbb6b80b563523f44a770971f08fd2a 100644
index a45e0a76781513552295d6b1e6f46d1345088e76..47554e55a0aa7d1074f9c38dbe36b8a575838531 100644
--- a/printing/printing_context.h
+++ b/printing/printing_context.h
@@ -133,12 +133,12 @@ class PRINTING_EXPORT PrintingContext {
@@ -133,12 +133,12 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext {
int job_id() const { return job_id_; }

6
patches/chromium/put_back_deleted_colors_for_autofill.patch
Просмотреть файл

@ -8,7 +8,7 @@ needed in chromium but our autofill implementation uses them. This patch can be
our autofill implementation to work like Chromium's.
diff --git a/ui/native_theme/common_theme.cc b/ui/native_theme/common_theme.cc
index 0726aaf384626c6e5d103fe674bac0847a8bb6cf..7c76636270e907e9770c55f7c446f67a26e4c75f 100644
index 4436af30ea86d7949ae5f387fbeab9e6369ac12e..575aafe2d19c150e288141fb85cec3f78103ba4a 100644
--- a/ui/native_theme/common_theme.cc
+++ b/ui/native_theme/common_theme.cc
@@ -72,6 +72,14 @@ base::Optional<SkColor> GetDarkSchemeColor(NativeTheme::ColorId color_id,
@ -26,7 +26,7 @@ index 0726aaf384626c6e5d103fe674bac0847a8bb6cf..7c76636270e907e9770c55f7c446f67a
// Button
case NativeTheme::kColorId_ProminentButtonColor:
return gfx::kGoogleBlue300;
@@ -568,6 +576,18 @@ SkColor GetDefaultColor(NativeTheme::ColorId color_id,
@@ -570,6 +578,18 @@ SkColor GetDefaultColor(NativeTheme::ColorId color_id,
case NativeTheme::kColorId_WindowBackground:
return SK_ColorWHITE;
@ -46,7 +46,7 @@ index 0726aaf384626c6e5d103fe674bac0847a8bb6cf..7c76636270e907e9770c55f7c446f67a
// Keeping the kColorId_NumColors case instead of using the default case
// allows ColorId additions to trigger compile error for an incomplete
diff --git a/ui/native_theme/native_theme_color_id.h b/ui/native_theme/native_theme_color_id.h
index 9cfa124430631227639d4f94b3cdd565f97efff4..6debfe01925780f243303438911a0cb84fbac2fa 100644
index 64e6d428d805a71f1e8779c4c169d232bed79d2d..93086c17e231dbd2226bdc805f26d59703862d3b 100644
--- a/ui/native_theme/native_theme_color_id.h
+++ b/ui/native_theme/native_theme_color_id.h
@@ -151,6 +151,11 @@

12
patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
Просмотреть файл

@ -30,10 +30,10 @@ index fb25b91e254ca03002fda226861ff5b9c24f6b11..752f5e26b4f60561f38f08a8ce10cbce
// RenderWidgetHost on the main frame, and false otherwise.
virtual bool IsWidgetForMainFrame(RenderWidgetHostImpl*);
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index f80754952223fd544206c0ebb49205e6f0aabd7a..bfe862d73bdd16b4a01cc6249570cff0d37ee0de 100644
index 06524496cdad2dfecc8a7cba98a44eac4fa87101..77cdeea65429b28bbb178d797406b7362c022624 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -1945,6 +1945,8 @@ void RenderWidgetHostImpl::FilterDropData(DropData* drop_data) {
@@ -1946,6 +1946,8 @@ void RenderWidgetHostImpl::FilterDropData(DropData* drop_data) {
void RenderWidgetHostImpl::SetCursor(const ui::Cursor& cursor) {
if (view_)
view_->UpdateCursor(WebCursor(cursor));
@ -43,10 +43,10 @@ index f80754952223fd544206c0ebb49205e6f0aabd7a..bfe862d73bdd16b4a01cc6249570cff0
void RenderWidgetHostImpl::ShowContextMenuAtPoint(
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index f20a3d6f701f6849eabfeaee9a885b295f4b74ba..893caf674e4fc7ed505a5fbbd43d0bc31f1118fc 100644
index 6acb183b87ebcfb5d769517985b691b9969bb6e6..2426eb615967cbe3d11ece998d97d63266fac184 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4163,6 +4163,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
@@ -4192,6 +4192,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
return text_input_manager_.get();
}
@ -59,10 +59,10 @@ index f20a3d6f701f6849eabfeaee9a885b295f4b74ba..893caf674e4fc7ed505a5fbbd43d0bc3
RenderWidgetHostImpl* render_widget_host) {
return render_widget_host == GetMainFrame()->GetRenderWidgetHost();
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index e5c5e8d10713c64ba255e44620dc3b040c680ad2..35f052b26017eac5f919cb372d986e8106c79ba7 100644
index 345cdec6cb509341b23f5870c0660029c984e0bf..860301d6374687ab8f155e5091aba6239c37af35 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -955,6 +955,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
@@ -960,6 +960,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
blink::mojom::FrameVisibility visibility) override;
void SendScreenRects() override;
TextInputManager* GetTextInputManager() override;

4
patches/chromium/render_widget_host_view_base.patch
Просмотреть файл

@ -6,10 +6,10 @@ Subject: render_widget_host_view_base.patch
... something to do with OSR? and maybe <webview> as well? terrifying.
diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc
index 76555719db36ec4b20a66868f623307e2342bf7d..ccf431485388ea8bb7f43c3f40c1b0b80970a6a0 100644
index fe8443d5411c73f1fb71fd20315173b0023be758..d4cd7ddcd50c512d07ca2175179e41634d84d588 100644
--- a/content/browser/renderer_host/render_widget_host_view_base.cc
+++ b/content/browser/renderer_host/render_widget_host_view_base.cc
@@ -624,6 +624,13 @@ bool RenderWidgetHostViewBase::ScreenRectIsUnstableFor(
@@ -630,6 +630,13 @@ bool RenderWidgetHostViewBase::ScreenRectIsUnstableFor(
return false;
}

2
patches/chromium/render_widget_host_view_mac.patch
Просмотреть файл

@ -10,7 +10,7 @@ kinds of utility windows. Similarly for `disableAutoHideCursor`.
Additionally, disables usage of some private APIs in MAS builds.
diff --git a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
index b2b2f842cc549d5c63fbbcd9a420d69df45458bb..36b0f6a037509175de6d6a7eeb31d6ba32873b2b 100644
index c17242f7d07f74c1a91d0ef44665a3cfb29b4e40..2b30bd1094e494d1f6eef5a57dc23e9ac6525634 100644
--- a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
+++ b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
@@ -153,6 +153,15 @@ void ExtractUnderlines(NSAttributedString* string,

8
patches/chromium/revert_remove_contentrendererclient_shouldfork.patch
Просмотреть файл

@ -9,10 +9,10 @@ for every navigation to keep Node.js working properly. Once Native Modules in th
are required to be NAPI or context aware (Electron v11), this patch can be removed.
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index 4a8cc622711067a1e9ef6596387f85adf4b8c3c0..bde436c2080b101bb02270ddf9343c8338aeebc5 100644
index 1aee7c39073ebbcd882d784626c305239e27dffb..00bf1cb692e4692ef1ad27dd26b440224c9c3c8f 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -1301,6 +1301,24 @@ ChromeContentRendererClient::GetProtocolHandlerSecurityLevel() {
@@ -1300,6 +1300,24 @@ ChromeContentRendererClient::GetProtocolHandlerSecurityLevel() {
#endif
}
@ -88,10 +88,10 @@ index 6191d4774ae35f00c3b58f62719962de616c8ad7..f717ae1d8e3bf642792f1dcfebbaa287
// |url|. If the function returns a valid |new_url|, the request must be
// updated to use it.
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 59f578d55b07c3d0da424782bf1f33de2b610bff..00af6096b8a678d274fcfb660924e22b4d306c38 100644
index 2d0d35843ee2ed2e13c053790fdbfd625a9a0071..f4abb34513e76cf76deb58810b1b4d9387ac0fec 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -4996,6 +4996,22 @@ void RenderFrameImpl::BeginNavigation(
@@ -4928,6 +4928,22 @@ void RenderFrameImpl::BeginNavigation(
// we can do a per-frame check here rather than a process-wide check.
bool should_fork = HasWebUIScheme(url) || HasWebUIScheme(old_url) ||
(enabled_bindings_ & kWebUIBindingsPolicyMask);

4
patches/chromium/scroll_bounce_flag.patch
Просмотреть файл

@ -6,10 +6,10 @@ Subject: scroll_bounce_flag.patch
Patch to make scrollBounce option work.
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 9ed730205696864a7059fbf9095e637a2112a811..7cdc7308bf71959da05fc41ea99473b2bd0bdb2b 100644
index fcb90d8024c7677ea15ff73064f51886b333a512..fa2ecae71873d4d83b805f73b8978fbadb5b1245 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -1269,7 +1269,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
@@ -1270,7 +1270,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
}
bool RenderThreadImpl::IsElasticOverscrollEnabled() {

10
patches/chromium/support_mixed_sandbox_with_zygote.patch
Просмотреть файл

@ -22,10 +22,10 @@ However, the patch would need to be reviewed by the security team, as it
does touch a security-sensitive class.
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 9a57706a1f1cfaad240cd1ccc626b548e4c9e0f6..5730c695f3106573953c131b6721baabcfbc4226 100644
index 458f004ce92f719795dbc91f65a6bb6f05244291..08fd62722a0bcb996f2dfab5329ebaecfe5c50c0 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -389,10 +389,18 @@ class RendererSandboxedProcessLauncherDelegate
@@ -388,10 +388,18 @@ class RendererSandboxedProcessLauncherDelegate
public:
RendererSandboxedProcessLauncherDelegate() = default;
@ -44,7 +44,7 @@ index 9a57706a1f1cfaad240cd1ccc626b548e4c9e0f6..5730c695f3106573953c131b6721baab
const base::CommandLine& browser_command_line =
*base::CommandLine::ForCurrentProcess();
base::CommandLine::StringType renderer_prefix =
@@ -410,6 +418,11 @@ class RendererSandboxedProcessLauncherDelegate
@@ -409,6 +417,11 @@ class RendererSandboxedProcessLauncherDelegate
sandbox::policy::SandboxType GetSandboxType() override {
return sandbox::policy::SandboxType::kRenderer;
}
@ -56,7 +56,7 @@ index 9a57706a1f1cfaad240cd1ccc626b548e4c9e0f6..5730c695f3106573953c131b6721baab
};
#if defined(OS_WIN)
@@ -420,6 +433,9 @@ class RendererSandboxedProcessLauncherDelegateWin
@@ -419,6 +432,9 @@ class RendererSandboxedProcessLauncherDelegateWin
RendererSandboxedProcessLauncherDelegateWin(base::CommandLine* cmd_line)
: renderer_code_integrity_enabled_(
GetContentClient()->browser()->IsRendererCodeIntegrityEnabled()) {
@ -66,7 +66,7 @@ index 9a57706a1f1cfaad240cd1ccc626b548e4c9e0f6..5730c695f3106573953c131b6721baab
if (cmd_line->HasSwitch(switches::kJavaScriptFlags)) {
std::string js_flags =
cmd_line->GetSwitchValueASCII(switches::kJavaScriptFlags);
@@ -1841,9 +1857,15 @@ bool RenderProcessHostImpl::Init() {
@@ -1870,9 +1886,15 @@ bool RenderProcessHostImpl::Init() {
std::unique_ptr<SandboxedProcessLauncherDelegate> sandbox_delegate =
std::make_unique<RendererSandboxedProcessLauncherDelegateWin>(
cmd_line.get());

8
patches/chromium/web_contents.patch
Просмотреть файл

@ -9,10 +9,10 @@ is needed for OSR.
Originally landed in https://github.com/electron/libchromiumcontent/pull/226.
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 1e24697533a51853041e5a15b585d0d3f5a80817..e451a7c6a2bc979458907a15d995693f7d5d38b8 100644
index f4c8d9e8a20f9be8c6566857fcf1d57ba7ec1af7..96a40070b3aab960d8e0639636f1a0ee346b0ed3 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -2745,6 +2745,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -2774,6 +2774,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
frame_tree_.Init(site_instance.get(), params.renderer_initiated_creation,
params.main_frame_name);
@ -25,7 +25,7 @@ index 1e24697533a51853041e5a15b585d0d3f5a80817..e451a7c6a2bc979458907a15d995693f
WebContentsViewDelegate* delegate =
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
@@ -2755,6 +2761,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -2784,6 +2790,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
view_.reset(CreateWebContentsView(this, delegate,
&render_view_host_delegate_view_));
}
@ -34,7 +34,7 @@ index 1e24697533a51853041e5a15b585d0d3f5a80817..e451a7c6a2bc979458907a15d995693f
CHECK(view_.get());
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
index 3c37b58ff833ee4be121b7c285a8740fdc797a2a..450cff790462dc8659ae668a7efcd9b42050f434 100644
index e441c4089e00707912f5ddd90d57a309e73e455a..4a80cbc4c290a21a8b2a5e5c570f97258d97a95c 100644
--- a/content/public/browser/web_contents.h
+++ b/content/public/browser/web_contents.h
@@ -88,8 +88,11 @@ class BrowserContext;

2
patches/chromium/webview_cross_drag.patch
Просмотреть файл

@ -8,7 +8,7 @@ This allows dragging and dropping between <webview>s.
Originally landed in https://github.com/electron/libchromiumcontent/pull/267
diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
index 6a91156e6616854d65d47ac7823ffa1928034b0b..ef364428811e9740500e11b43541f4d2ad5330e2 100644
index 3ef2c45c345bdf1015ba070921366df2d381336f..799b7230972d85e5c87a196eed40090af1ba97a9 100644
--- a/content/browser/web_contents/web_contents_view_aura.cc
+++ b/content/browser/web_contents/web_contents_view_aura.cc
@@ -789,9 +789,7 @@ gfx::NativeView WebContentsViewAura::GetRenderWidgetHostViewParent() const {

8
patches/chromium/worker_context_will_destroy.patch
Просмотреть файл

@ -26,10 +26,10 @@ index a0d7f49d1e4ca4009fbebc0bd7df234eb6850b08..6191d4774ae35f00c3b58f62719962de
// An empty URL is returned if the URL is not overriden.
virtual GURL OverrideFlashEmbedWithHTML(const GURL& url);
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
index 3b7991a699b2a0e17fb27fbc8e35db896f1e2753..7325feb81dc2bd533e19d6942b5c9a796d254196 100644
index 1db5cf167274eefc24be8071aecfae23e6b35c9c..eccb1b6257d8e57e4c20c015e96987852c90eafa 100644
--- a/content/renderer/renderer_blink_platform_impl.cc
+++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -914,6 +914,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
@@ -917,6 +917,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
WorkerThreadRegistry::Instance()->WillStopCurrentWorkerThread();
}
@ -55,10 +55,10 @@ index 5405fe0dc6367f2a356b07aa1cc2311f9d929208..6cac9ce793939864d38f1521af9c11a1
const blink::WebSecurityOrigin& script_origin) override;
blink::ProtocolHandlerSecurityLevel GetProtocolHandlerSecurityLevel()
diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
index 93f3403bcaacab801ac94306abc56bd4981c18a4..0fc7c5f31ea3e2eb3961d66a38f913da2de8606f 100644
index fb98c93af1855672cfd05928379833f30c2cbec8..68f2d67950cb34e99a4cb875df1bd8214a49ecbf 100644
--- a/third_party/blink/public/platform/platform.h
+++ b/third_party/blink/public/platform/platform.h
@@ -687,6 +687,7 @@ class BLINK_PLATFORM_EXPORT Platform {
@@ -697,6 +697,7 @@ class BLINK_PLATFORM_EXPORT Platform {
virtual void DidStartWorkerThread() {}
virtual void WillStopWorkerThread() {}
virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}

8
patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
Просмотреть файл

@ -35,10 +35,10 @@ index f717ae1d8e3bf642792f1dcfebbaa2870ff97694..65d3085260e054a671afbecf55062d17
// from the worker thread.
virtual void WillDestroyWorkerContextOnWorkerThread(
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
index 7325feb81dc2bd533e19d6942b5c9a796d254196..561bf1dbddd2a71e8aba25bd692da741bd25851f 100644
index eccb1b6257d8e57e4c20c015e96987852c90eafa..9b6ce666b9e268bf4157e00e94d54f5b87491e3b 100644
--- a/content/renderer/renderer_blink_platform_impl.cc
+++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -926,6 +926,12 @@ void RendererBlinkPlatformImpl::WorkerContextCreated(
@@ -929,6 +929,12 @@ void RendererBlinkPlatformImpl::WorkerContextCreated(
worker);
}
@ -65,10 +65,10 @@ index 6cac9ce793939864d38f1521af9c11a1310fb498..4a8de2bd53f5b1ef4e9e3379f6ae4e38
bool AllowScriptExtensionForServiceWorker(
const blink::WebSecurityOrigin& script_origin) override;
diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
index 0fc7c5f31ea3e2eb3961d66a38f913da2de8606f..709bad87de8c87817395d6c4cb396d06b34e0f2e 100644
index 68f2d67950cb34e99a4cb875df1bd8214a49ecbf..1b0b2744a95e67833f1c8057aad89349fe84e5eb 100644
--- a/third_party/blink/public/platform/platform.h
+++ b/third_party/blink/public/platform/platform.h
@@ -687,6 +687,8 @@ class BLINK_PLATFORM_EXPORT Platform {
@@ -697,6 +697,8 @@ class BLINK_PLATFORM_EXPORT Platform {
virtual void DidStartWorkerThread() {}
virtual void WillStopWorkerThread() {}
virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}

6
patches/v8/add_realloc.patch
Просмотреть файл

@ -12,10 +12,10 @@ when we override ReallocateBufferMemory, so we therefore need to implement
Realloc on the v8 side.
diff --git a/include/v8.h b/include/v8.h
index efa7ebac96ca9345a56428d7804a638fa8c638b5..a4f5ac4c2c07f995ab6436856109744e7072b78b 100644
index b63a8aae24ca6216a67ecf3fc1337d6478805c86..29f74b2a211b0ff08dc68afecb2c98d6eedddd08 100644
--- a/include/v8.h
+++ b/include/v8.h
@@ -5362,6 +5362,13 @@ class V8_EXPORT ArrayBuffer : public Object {
@@ -5364,6 +5364,13 @@ class V8_EXPORT ArrayBuffer : public Object {
*/
virtual void* AllocateUninitialized(size_t length) = 0;
@ -30,7 +30,7 @@ index efa7ebac96ca9345a56428d7804a638fa8c638b5..a4f5ac4c2c07f995ab6436856109744e
* Free the memory block of size |length|, pointed to by |data|.
* That memory is guaranteed to be previously allocated by |Allocate|.
diff --git a/src/api/api.cc b/src/api/api.cc
index e9d191eb3235928978619153018c1ada63bd4913..c7ef474879fbff4c31020a4c6a0657028bb0bc97 100644
index 2383682428f0144211fd3e67fc998083386fc69d..85412c681c71db79cce01a607cf8c27f19940efb 100644
--- a/src/api/api.cc
+++ b/src/api/api.cc
@@ -324,6 +324,10 @@ void V8::SetSnapshotDataBlob(StartupData* snapshot_blob) {

8
patches/v8/build_gn.patch
Просмотреть файл

@ -9,10 +9,10 @@ necessary for native modules to load.
Also, some fixes relating to mksnapshot on ARM.
diff --git a/BUILD.gn b/BUILD.gn
index cd18cda9a74aa2820b116c24a483cf39818f185a..1885810cf967a111acd5df279da5f333b89629a0 100644
index 1a94829652fb309759927dab9b67951d14d43c01..34cfa21668d409cd0e2de2c96ee52f5b575df742 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -505,7 +505,7 @@ config("internal_config") {
@@ -510,7 +510,7 @@ config("internal_config") {
":cppgc_header_features",
]
@ -21,7 +21,7 @@ index cd18cda9a74aa2820b116c24a483cf39818f185a..1885810cf967a111acd5df279da5f333
defines += [ "BUILDING_V8_SHARED" ]
}
}
@@ -5165,7 +5165,7 @@ if (current_toolchain == v8_generator_toolchain) {
@@ -5183,7 +5183,7 @@ if (current_toolchain == v8_generator_toolchain) {
"src/interpreter/bytecodes.h",
]
@ -30,7 +30,7 @@ index cd18cda9a74aa2820b116c24a483cf39818f185a..1885810cf967a111acd5df279da5f333
deps = [
":v8_libbase",
@@ -5203,6 +5203,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
@@ -5221,6 +5221,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
configs = [ ":internal_config" ]

8
patches/v8/dcheck.patch
Просмотреть файл

@ -6,10 +6,10 @@ Subject: dcheck.patch
https://github.com/auchenberg/volkswagen
diff --git a/src/api/api.cc b/src/api/api.cc
index c7ef474879fbff4c31020a4c6a0657028bb0bc97..a8653ed94337c21b413b4b6db43a755ef84181e8 100644
index 85412c681c71db79cce01a607cf8c27f19940efb..43e1815c4cbbcb1dbeae0b9fd7464619f884fd1b 100644
--- a/src/api/api.cc
+++ b/src/api/api.cc
@@ -8733,7 +8733,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
@@ -8734,7 +8734,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
}
void Isolate::PerformMicrotaskCheckpoint() {
@ -19,10 +19,10 @@ index c7ef474879fbff4c31020a4c6a0657028bb0bc97..a8653ed94337c21b413b4b6db43a755e
isolate->default_microtask_queue()->PerformCheckpoint(this);
}
diff --git a/src/heap/heap.cc b/src/heap/heap.cc
index 628b3ca47cc7119ddf21285ee96b938a0b01c02b..80c7997762dffe9068cf5a5d72f21eb1ced80209 100644
index 46462f57264968e3d4fbbc8e07371ff96e8237e7..ad629663f7f76ac3aa4ec221310708e35cb25bd0 100644
--- a/src/heap/heap.cc
+++ b/src/heap/heap.cc
@@ -5716,9 +5716,9 @@ void Heap::TearDown() {
@@ -5751,9 +5751,9 @@ void Heap::DeinitSharedSpaces() {
void Heap::AddGCPrologueCallback(v8::Isolate::GCCallbackWithData callback,
GCType gc_type, void* data) {
DCHECK_NOT_NULL(callback);

4
patches/v8/do_not_export_private_v8_symbols_on_windows.patch
Просмотреть файл

@ -12,10 +12,10 @@ This patch can be safely removed if, when it is removed, `node.lib` does not
contain any standard C++ library exports (e.g. `std::ostringstream`).
diff --git a/BUILD.gn b/BUILD.gn
index 26bee58424ca7cba6134e285e36c97e4bd25cc50..786cfc93f261921f16eccd50b8d8ecc4ec6b4aec 100644
index 04ded39fa48c2a46b3603e56e06e198f1ea5dc15..aefef3f07bb843bd84f6d4e5b70e98bedf189ac5 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -505,6 +505,10 @@ config("internal_config") {
@@ -510,6 +510,10 @@ config("internal_config") {
":cppgc_header_features",
]

4
patches/v8/export_symbols_needed_for_windows_build.patch
Просмотреть файл

@ -6,7 +6,7 @@ Subject: Export symbols needed for Windows build
These symbols are required to build v8 with BUILD_V8_SHARED on Windows.
diff --git a/src/objects/objects.h b/src/objects/objects.h
index a7718783f3d34c55be162607c589a2f3378ee9a8..f2d09289a9204451c9d9e0e3a6f449eb9c65520a 100644
index e80098dfe8df39132272fb23525f02ec4112e355..e3f73c939f285c98ca77aa273933457f19765d63 100644
--- a/src/objects/objects.h
+++ b/src/objects/objects.h
@@ -841,7 +841,7 @@ enum class KeyCollectionMode {
@ -19,7 +19,7 @@ index a7718783f3d34c55be162607c589a2f3378ee9a8..f2d09289a9204451c9d9e0e3a6f449eb
explicit inline Relocatable(Isolate* isolate);
inline virtual ~Relocatable();
diff --git a/src/objects/ordered-hash-table.h b/src/objects/ordered-hash-table.h
index 1746e2dc89625a00c6cae0b249142a11de7072c3..cd076405a17f99f77d51b6c146223becf4fb4587 100644
index 1110352e46b9bac191d5ca12a936e0366d41168f..050610a1a35b162d19c16ae9d5bdc7f6bd10396f 100644
--- a/src/objects/ordered-hash-table.h
+++ b/src/objects/ordered-hash-table.h
@@ -63,7 +63,7 @@ namespace internal {

4
patches/v8/expose_mksnapshot.patch
Просмотреть файл

@ -6,10 +6,10 @@ Subject: expose_mksnapshot.patch
Needed in order to target mksnapshot for mksnapshot zip.
diff --git a/BUILD.gn b/BUILD.gn
index 1885810cf967a111acd5df279da5f333b89629a0..26bee58424ca7cba6134e285e36c97e4bd25cc50 100644
index 34cfa21668d409cd0e2de2c96ee52f5b575df742..04ded39fa48c2a46b3603e56e06e198f1ea5dc15 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -5177,7 +5177,6 @@ if (current_toolchain == v8_generator_toolchain) {
@@ -5195,7 +5195,6 @@ if (current_toolchain == v8_generator_toolchain) {
if (current_toolchain == v8_snapshot_toolchain) {
v8_executable("mksnapshot") {

6
patches/v8/fix_build_deprecated_attirbute_for_older_msvc_versions.patch
Просмотреть файл

@ -9,10 +9,10 @@ higher versions, but native module compiling with this version
will have an issue.
diff --git a/include/v8config.h b/include/v8config.h
index acd34d7a1f255db4207a03506166ea8f4486195b..0c34547885bb6fea3da9c86c6cd852085d0bfb74 100644
index 20bd56854efbdf4b730a02b3ef7a709cbe84fb4c..141cf459f148885a18daf5ab61ea331e62f7faad 100644
--- a/include/v8config.h
+++ b/include/v8config.h
@@ -409,10 +409,13 @@ path. Add it with -I<path> to the command line
@@ -412,10 +412,13 @@ path. Add it with -I<path> to the command line
# define V8_NOINLINE /* NOT SUPPORTED */
#endif
@ -28,7 +28,7 @@ index acd34d7a1f255db4207a03506166ea8f4486195b..0c34547885bb6fea3da9c86c6cd85208
#else
# define V8_DEPRECATED(message)
#endif
@@ -420,7 +423,11 @@ path. Add it with -I<path> to the command line
@@ -423,7 +426,11 @@ path. Add it with -I<path> to the command line
// A macro (V8_DEPRECATE_SOON) to make it easier to see what will be deprecated.
#if defined(V8_IMMINENT_DEPRECATION_WARNINGS)

12
shell/browser/api/electron_api_cookies.cc
Просмотреть файл

@ -233,8 +233,7 @@ v8::Local<v8::Promise> Cookies::Get(v8::Isolate* isolate,
gin_helper::Promise<net::CookieList> promise(isolate);
v8::Local<v8::Promise> handle = promise.GetHandle();
auto* storage_partition =
content::BrowserContext::GetDefaultStoragePartition(browser_context_);
auto* storage_partition = browser_context_->GetDefaultStoragePartition();
auto* manager = storage_partition->GetCookieManagerForBrowserProcess();
base::DictionaryValue dict;
@ -270,8 +269,7 @@ v8::Local<v8::Promise> Cookies::Remove(v8::Isolate* isolate,
cookie_deletion_filter->url = url;
cookie_deletion_filter->cookie_name = name;
auto* storage_partition =
content::BrowserContext::GetDefaultStoragePartition(browser_context_);
auto* storage_partition = browser_context_->GetDefaultStoragePartition();
auto* manager = storage_partition->GetCookieManagerForBrowserProcess();
manager->DeleteCookies(
@ -339,8 +337,7 @@ v8::Local<v8::Promise> Cookies::Set(v8::Isolate* isolate,
options.set_same_site_cookie_context(
net::CookieOptions::SameSiteCookieContext::MakeInclusive());
auto* storage_partition =
content::BrowserContext::GetDefaultStoragePartition(browser_context_);
auto* storage_partition = browser_context_->GetDefaultStoragePartition();
auto* manager = storage_partition->GetCookieManagerForBrowserProcess();
manager->SetCanonicalCookie(
*canonical_cookie, url, options,
@ -361,8 +358,7 @@ v8::Local<v8::Promise> Cookies::FlushStore(v8::Isolate* isolate) {
gin_helper::Promise<void> promise(isolate);
v8::Local<v8::Promise> handle = promise.GetHandle();
auto* storage_partition =
content::BrowserContext::GetDefaultStoragePartition(browser_context_);
auto* storage_partition = browser_context_->GetDefaultStoragePartition();
auto* manager = storage_partition->GetCookieManagerForBrowserProcess();
manager->FlushCookieStore(base::BindOnce(

3
shell/browser/api/electron_api_net_log.cc
Просмотреть файл

@ -132,8 +132,7 @@ v8::Local<v8::Promise> NetLog::StartLogging(base::FilePath log_path,
command_line_string, channel_string));
auto* network_context =
content::BrowserContext::GetDefaultStoragePartition(browser_context_)
->GetNetworkContext();
browser_context_->GetDefaultStoragePartition()->GetNetworkContext();
network_context->CreateNetLogExporter(mojo::MakeRequest(&net_log_exporter_));
net_log_exporter_.set_connection_error_handler(base::BindOnce(

6
shell/browser/api/electron_api_service_worker_context.cc
Просмотреть файл

@ -74,11 +74,9 @@ gin::WrapperInfo ServiceWorkerContext::kWrapperInfo = {gin::kEmbedderNativeGin};
ServiceWorkerContext::ServiceWorkerContext(
v8::Isolate* isolate,
ElectronBrowserContext* browser_context)
: browser_context_(browser_context) {
ElectronBrowserContext* browser_context) {
service_worker_context_ =
content::BrowserContext::GetDefaultStoragePartition(browser_context_)
->GetServiceWorkerContext();
browser_context->GetDefaultStoragePartition()->GetServiceWorkerContext();
service_worker_context_->AddObserver(this);
}

2
shell/browser/api/electron_api_service_worker_context.h
Просмотреть файл

@ -49,8 +49,6 @@ class ServiceWorkerContext
~ServiceWorkerContext() override;
private:
ElectronBrowserContext* browser_context_;
content::ServiceWorkerContext* service_worker_context_;
base::WeakPtrFactory<ServiceWorkerContext> weak_ptr_factory_{this};

30
shell/browser/api/electron_api_session.cc
Просмотреть файл

@ -17,6 +17,7 @@
#include "base/guid.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/task/post_task.h"
#include "chrome/browser/browser_process.h"
#include "chrome/common/chrome_switches.h"
@ -420,7 +421,7 @@ v8::Local<v8::Promise> Session::GetCacheSize() {
gin_helper::Promise<int64_t> promise(isolate_);
auto handle = promise.GetHandle();
content::BrowserContext::GetDefaultStoragePartition(browser_context_)
browser_context_->GetDefaultStoragePartition()
->GetNetworkContext()
->ComputeHttpCacheSize(
base::Time(), base::Time::Max(),
@ -443,7 +444,7 @@ v8::Local<v8::Promise> Session::ClearCache() {
gin_helper::Promise<void> promise(isolate_);
auto handle = promise.GetHandle();
content::BrowserContext::GetDefaultStoragePartition(browser_context_)
browser_context_->GetDefaultStoragePartition()
->GetNetworkContext()
->ClearHttpCache(base::Time(), base::Time::Max(), nullptr,
base::BindOnce(gin_helper::Promise<void>::ResolvePromise,
@ -460,8 +461,7 @@ v8::Local<v8::Promise> Session::ClearStorageData(gin::Arguments* args) {
ClearStorageDataOptions options;
args->GetNext(&options);
auto* storage_partition =
content::BrowserContext::GetStoragePartition(browser_context(), nullptr);
auto* storage_partition = browser_context()->GetStoragePartition(nullptr);
if (options.storage_types & StoragePartition::REMOVE_DATA_MASK_COOKIES) {
// Reset media device id salt when cookies are cleared.
// https://w3c.github.io/mediacapture-main/#dom-mediadeviceinfo-deviceid
@ -477,8 +477,7 @@ v8::Local<v8::Promise> Session::ClearStorageData(gin::Arguments* args) {
}
void Session::FlushStorageData() {
auto* storage_partition =
content::BrowserContext::GetStoragePartition(browser_context(), nullptr);
auto* storage_partition = browser_context()->GetStoragePartition(nullptr);
storage_partition->Flush();
}
@ -551,7 +550,7 @@ v8::Local<v8::Promise> Session::ForceReloadProxyConfig() {
gin_helper::Promise<void> promise(isolate_);
auto handle = promise.GetHandle();
content::BrowserContext::GetDefaultStoragePartition(browser_context_)
browser_context_->GetDefaultStoragePartition()
->GetNetworkContext()
->ForceReloadProxyConfig(base::BindOnce(
gin_helper::Promise<void>::ResolvePromise, std::move(promise)));
@ -576,16 +575,14 @@ void Session::EnableNetworkEmulation(const gin_helper::Dictionary& options) {
}
auto* network_context =
content::BrowserContext::GetDefaultStoragePartition(browser_context_)
->GetNetworkContext();
browser_context_->GetDefaultStoragePartition()->GetNetworkContext();
network_context->SetNetworkConditions(network_emulation_token_,
std::move(conditions));
}
void Session::DisableNetworkEmulation() {
auto* network_context =
content::BrowserContext::GetDefaultStoragePartition(browser_context_)
->GetNetworkContext();
browser_context_->GetDefaultStoragePartition()->GetNetworkContext();
network_context->SetNetworkConditions(
network_emulation_token_, network::mojom::NetworkConditions::New());
}
@ -605,7 +602,7 @@ void Session::SetCertVerifyProc(v8::Local<v8::Value> val,
std::make_unique<CertVerifierClient>(proc),
cert_verifier_client_remote.InitWithNewPipeAndPassReceiver());
}
content::BrowserContext::GetDefaultStoragePartition(browser_context_)
browser_context_->GetDefaultStoragePartition()
->GetNetworkContext()
->SetCertVerifierClient(std::move(cert_verifier_client_remote));
}
@ -654,7 +651,7 @@ v8::Local<v8::Promise> Session::ClearHostResolverCache(gin::Arguments* args) {
gin_helper::Promise<void> promise(isolate);
v8::Local<v8::Promise> handle = promise.GetHandle();
content::BrowserContext::GetDefaultStoragePartition(browser_context_)
browser_context_->GetDefaultStoragePartition()
->GetNetworkContext()
->ClearHostCache(nullptr,
base::BindOnce(gin_helper::Promise<void>::ResolvePromise,
@ -667,7 +664,7 @@ v8::Local<v8::Promise> Session::ClearAuthCache() {
gin_helper::Promise<void> promise(isolate_);
v8::Local<v8::Promise> handle = promise.GetHandle();
content::BrowserContext::GetDefaultStoragePartition(browser_context_)
browser_context_->GetDefaultStoragePartition()
->GetNetworkContext()
->ClearHttpAuthCache(
base::Time(), base::Time::Max(),
@ -694,8 +691,7 @@ void Session::SetUserAgent(const std::string& user_agent,
gin::Arguments* args) {
browser_context_->SetUserAgent(user_agent);
auto* network_context =
content::BrowserContext::GetDefaultStoragePartition(browser_context_)
->GetNetworkContext();
browser_context_->GetDefaultStoragePartition()->GetNetworkContext();
network_context->SetUserAgent(user_agent);
std::string accept_lang;
@ -956,7 +952,7 @@ v8::Local<v8::Promise> Session::CloseAllConnections() {
gin_helper::Promise<void> promise(isolate_);
auto handle = promise.GetHandle();
content::BrowserContext::GetDefaultStoragePartition(browser_context_)
browser_context_->GetDefaultStoragePartition()
->GetNetworkContext()
->CloseAllConnections(base::BindOnce(
gin_helper::Promise<void>::ResolvePromise, std::move(promise)));

2
shell/browser/cookie_change_notifier.cc
Просмотреть файл

@ -37,7 +37,7 @@ void CookieChangeNotifier::StartListening() {
DCHECK(!receiver_.is_bound());
network::mojom::CookieManager* cookie_manager =
content::BrowserContext::GetDefaultStoragePartition(browser_context_)
browser_context_->GetDefaultStoragePartition()
->GetCookieManagerForBrowserProcess();
// Cookie manager should be created whenever network context is created,

3
shell/browser/electron_browser_context.cc
Просмотреть файл

@ -347,8 +347,7 @@ ElectronBrowserContext::GetURLLoaderFactory() {
// the non-NetworkService implementation always has web security enabled.
params->disable_web_security = false;
auto* storage_partition =
content::BrowserContext::GetDefaultStoragePartition(this);
auto* storage_partition = GetDefaultStoragePartition();
params->url_loader_network_observer =
storage_partition->CreateURLLoaderNetworkObserverForNavigationRequest(-1);
storage_partition->GetNetworkContext()->CreateURLLoaderFactory(

4
shell/browser/electron_browser_main_parts.cc
Просмотреть файл

@ -287,8 +287,8 @@ void ElectronBrowserMainParts::PostEarlyInitialization() {
int ElectronBrowserMainParts::PreCreateThreads() {
#if defined(USE_AURA)
display::Screen* screen = views::CreateDesktopScreen();
display::Screen::SetScreenInstance(screen);
screen_ = views::CreateDesktopScreen();
display::Screen::SetScreenInstance(screen_.get());
#if defined(OS_LINUX)
views::LinuxUI::instance()->UpdateDeviceScaleFactor();
#endif

5
shell/browser/electron_browser_main_parts.h
Просмотреть файл

@ -28,6 +28,10 @@ class IconManager;
namespace wm {
class WMState;
}
namespace display {
class Screen;
}
#endif
#if defined(USE_X11)
@ -126,6 +130,7 @@ class ElectronBrowserMainParts : public content::BrowserMainParts {
#if defined(USE_AURA)
std::unique_ptr<wm::WMState> wm_state_;
std::unique_ptr<display::Screen> screen_;
#endif
#if defined(OS_LINUX)

1
shell/browser/extensions/api/management/electron_management_api_delegate.cc
Просмотреть файл

@ -12,6 +12,7 @@
#include "base/bind.h"
#include "base/macros.h"
#include "base/strings/strcat.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task/post_task.h"
#include "chrome/common/extensions/extension_metrics.h"

1
shell/browser/net/electron_url_loader_factory.cc
Просмотреть файл

@ -10,6 +10,7 @@
#include "base/guid.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/storage_partition.h"
#include "mojo/public/cpp/system/data_pipe_producer.h"

1
shell/browser/net/proxying_url_loader_factory.cc
Просмотреть файл

@ -9,6 +9,7 @@
#include "base/command_line.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "content/public/browser/browser_context.h"
#include "extensions/browser/extension_navigation_ui_data.h"
#include "net/base/completion_repeating_callback.h"

2
shell/browser/net/resolve_proxy_helper.cc
Просмотреть файл

@ -53,7 +53,7 @@ void ResolveProxyHelper::StartPendingRequest() {
receiver_.set_disconnect_handler(
base::BindOnce(&ResolveProxyHelper::OnProxyLookupComplete,
base::Unretained(this), net::ERR_ABORTED, base::nullopt));
content::BrowserContext::GetDefaultStoragePartition(browser_context_)
browser_context_->GetDefaultStoragePartition()
->GetNetworkContext()
->LookUpProxyForURL(pending_requests_.front().url,
net::NetworkIsolationKey::Todo(),

5
shell/browser/ui/inspectable_web_contents.cc
Просмотреть файл

@ -700,8 +700,9 @@ void InspectableWebContents::LoadNetworkResource(DispatchCallback callback,
std::make_unique<network::WrapperPendingSharedURLLoaderFactory>(
std::move(pending_remote)));
} else {
auto* partition = content::BrowserContext::GetDefaultStoragePartition(
GetDevToolsWebContents()->GetBrowserContext());
auto* partition = GetDevToolsWebContents()
->GetBrowserContext()
->GetDefaultStoragePartition();
url_loader_factory = partition->GetURLLoaderFactoryForBrowserProcess();
}