X Tutup
Skip to content

Commit bf89237

Browse files
electron-botelectron-bot
authored
chore: bump chromium to 9b2191ea59cba1e2f6da4dbb7dee0 (master) (electron#25995)
1 parent 284c1b9 commit bf89237

File tree

77 files changed

+441
-610
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+441
-610
lines changed

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ gclient_gn_args = [
1414

1515
vars = {
1616
'chromium_version':
17-
'9269f9eb1d98d29564c2b2ab97f30c6e148c4e11',
17+
'2a55c4f55b99b2191ea59cba1e2f6da4dbb7dee0',
1818
'node_version':
1919
'v14.14.0',
2020
'nan_version':

‎appveyor.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,11 @@ build_script:
101101
} else {
102102
# update external binaries
103103
python src/electron/script/update-external-binaries.py
104+
# update angle
105+
cd src\third_party\angle
106+
git remote set-url origin https://chromium.googlesource.com/angle/angle.git
107+
git fetch
108+
cd ..\..\..
104109
}
105110
} else {
106111
# file does not exist, gclient sync, then zip

‎build/zip.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
'.pdb',
1010
'.mojom.js',
1111
'.mojom-lite.js',
12-
'.info'
12+
'.info',
13+
'.m.js'
1314
]
1415

1516
PATHS_TO_SKIP = [

‎chromium_src/BUILD.gn‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,6 @@ source_set("plugins") {
305305
sources += [
306306
"//chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc",
307307
"//chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h",
308-
"//chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc",
309-
"//chrome/browser/renderer_host/pepper/pepper_broker_message_filter.h",
310308
"//chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc",
311309
"//chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h",
312310
]

‎electron_paks.gni‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,6 @@ template("electron_extra_paks") {
9494
sources +=
9595
[ "$root_gen_dir/content/browser/devtools/devtools_resources.pak" ]
9696
deps += [ "//content/browser/devtools:devtools_resources" ]
97-
if (enable_pdf_viewer) {
98-
sources += [ "$root_gen_dir/chrome/print_preview_pdf_resources.pak" ]
99-
deps += [ "//chrome/browser/resources:print_preview_pdf_resources" ]
100-
}
10197
if (enable_print_preview) {
10298
sources += [ "$root_gen_dir/chrome/print_preview_resources.pak" ]
10399
deps += [ "//chrome/browser/resources:print_preview_resources" ]

‎patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ Allows Electron to restore WER when ELECTRON_DEFAULT_ERROR_MODE is set.
1010
This should be upstreamed.
1111

1212
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
13-
index d7cab7265bc75d4df0d570cab10508327fc82afe..95deade7499c9c7e3762cfa9cceba0d13d2f62ae 100644
13+
index 4ee038653b069be1e03040c01db55c8923bcdb1c..8a57a9a301960be03f1cf9a79c39713fc1bae95c 100644
1414
--- a/content/gpu/gpu_main.cc
1515
+++ b/content/gpu/gpu_main.cc
16-
@@ -256,6 +256,10 @@ int GpuMain(const MainFunctionParams& parameters) {
16+
@@ -263,6 +263,10 @@ int GpuMain(const MainFunctionParams& parameters) {
1717
// to the GpuProcessHost once the GpuServiceImpl has started.
1818
viz::GpuServiceImpl::InstallPreInitializeLogHandler();
1919

@@ -24,7 +24,7 @@ index d7cab7265bc75d4df0d570cab10508327fc82afe..95deade7499c9c7e3762cfa9cceba0d1
2424
// We are experiencing what appear to be memory-stomp issues in the GPU
2525
// process. These issues seem to be impacting the task executor and listeners
2626
// registered to it. Create the task executor on the heap to guard against
27-
@@ -393,7 +397,6 @@ int GpuMain(const MainFunctionParams& parameters) {
27+
@@ -400,7 +404,6 @@ int GpuMain(const MainFunctionParams& parameters) {
2828
}
2929
#endif
3030

‎patches/chromium/add_didinstallconditionalfeatures.patch‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ index f63b17435218d0d67bba044da67c1c80015fc996..d0fe24182f2cb48a1333054ce44b6a7f
2323
int32_t world_id) {}
2424
virtual void DidClearWindowObject() {}
2525
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
26-
index f7feec16308f9fe8d49c3e6a15765eb86153e683..3a01380b4fc373f41d631f585d4576b10129b130 100644
26+
index 9b63b6caae325f0e29ccfccbbea23b27c7b8cd65..8c82f4809e4544bb5f12ec5a5e9d6133f0154c47 100644
2727
--- a/content/renderer/render_frame_impl.cc
2828
+++ b/content/renderer/render_frame_impl.cc
29-
@@ -5004,6 +5004,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
29+
@@ -4910,6 +4910,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
3030
observer.DidCreateScriptContext(context, world_id);
3131
}
3232

@@ -40,11 +40,11 @@ index f7feec16308f9fe8d49c3e6a15765eb86153e683..3a01380b4fc373f41d631f585d4576b1
4040
int world_id) {
4141
for (auto& observer : observers_)
4242
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
43-
index dffe4596a0bd88124017177795390c2db1b574b2..7dfbb18e6a1701224c6cb0231a1f67e7c6251b91 100644
43+
index 161f911589360a4eba18f289e66fb1534089aec4..ba4c9389fb877a3a4fd05960ed8609d0fb25de7e 100644
4444
--- a/content/renderer/render_frame_impl.h
4545
+++ b/content/renderer/render_frame_impl.h
46-
@@ -706,6 +706,8 @@ class CONTENT_EXPORT RenderFrameImpl
47-
bool ShouldTrackUseCounter(const blink::WebURL& url) override;
46+
@@ -683,6 +683,8 @@ class CONTENT_EXPORT RenderFrameImpl
47+
blink::WebLocalFrameClient::LazyLoadBehavior lazy_load_behavior) override;
4848
void DidCreateScriptContext(v8::Local<v8::Context> context,
4949
int world_id) override;
5050
+ void DidInstallConditionalFeatures(v8::Local<v8::Context> context,
@@ -53,10 +53,10 @@ index dffe4596a0bd88124017177795390c2db1b574b2..7dfbb18e6a1701224c6cb0231a1f67e7
5353
int world_id) override;
5454
void DidChangeScrollOffset() override;
5555
diff --git a/third_party/blink/public/web/web_local_frame_client.h b/third_party/blink/public/web/web_local_frame_client.h
56-
index cba17ff34e880de151c8fc30563da5c1ba0e4a88..4249b961b0d4361d4b13440ecd6e470b7142ed00 100644
56+
index a1ffdddc549f328d16bf7641e2079320a02cb07d..fe8149b9440851d99b0592d134cccfe5237865d6 100644
5757
--- a/third_party/blink/public/web/web_local_frame_client.h
5858
+++ b/third_party/blink/public/web/web_local_frame_client.h
59-
@@ -543,6 +543,9 @@ class BLINK_EXPORT WebLocalFrameClient {
59+
@@ -539,6 +539,9 @@ class BLINK_EXPORT WebLocalFrameClient {
6060
virtual void DidCreateScriptContext(v8::Local<v8::Context>,
6161
int32_t world_id) {}
6262

@@ -67,7 +67,7 @@ index cba17ff34e880de151c8fc30563da5c1ba0e4a88..4249b961b0d4361d4b13440ecd6e470b
6767
virtual void WillReleaseScriptContext(v8::Local<v8::Context>,
6868
int32_t world_id) {}
6969
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
70-
index be4c8053f2bc5e2ad9da6a038a1a70edb37656c9..953e436fc09e9afa2189ad2ebdfdb085cabe51a7 100644
70+
index 16d2cc458b3a61c0974b258111ad154be61d55db..119f080e0ea00300dc4df8e9ec14d735b424c3f5 100644
7171
--- a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
7272
+++ b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
7373
@@ -203,6 +203,7 @@ void LocalWindowProxy::Initialize() {
@@ -78,10 +78,23 @@ index be4c8053f2bc5e2ad9da6a038a1a70edb37656c9..953e436fc09e9afa2189ad2ebdfdb085
7878

7979
if (World().IsMainWorld()) {
8080
GetFrame()->Loader().DispatchDidClearWindowObjectInMainWorld();
81-
diff --git a/third_party/blink/renderer/core/exported/local_frame_client_impl.cc b/third_party/blink/renderer/core/exported/local_frame_client_impl.cc
82-
index f46bec1838788df47ca8c6290028361be89695b2..ff7f45078ec1c8508c22861f7bca9281cd1b51a8 100644
83-
--- a/third_party/blink/renderer/core/exported/local_frame_client_impl.cc
84-
+++ b/third_party/blink/renderer/core/exported/local_frame_client_impl.cc
81+
diff --git a/third_party/blink/renderer/core/frame/local_frame_client.h b/third_party/blink/renderer/core/frame/local_frame_client.h
82+
index d76577dbecf8f9e86e356d50661184fe465200e9..8b0defa85f4e204188885d966fd0bc261692f3fd 100644
83+
--- a/third_party/blink/renderer/core/frame/local_frame_client.h
84+
+++ b/third_party/blink/renderer/core/frame/local_frame_client.h
85+
@@ -286,6 +286,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
86+
87+
virtual void DidCreateScriptContext(v8::Local<v8::Context>,
88+
int32_t world_id) = 0;
89+
+ virtual void DidInstallConditionalFeatures(v8::Local<v8::Context>,
90+
+ int32_t world_id) = 0;
91+
virtual void WillReleaseScriptContext(v8::Local<v8::Context>,
92+
int32_t world_id) = 0;
93+
virtual bool AllowScriptExtensions() = 0;
94+
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
95+
index 5f2ff8d701936be593e722912b01e12ee618f941..d663e53ef38df99f4bc4c586452d244bf4d08071 100644
96+
--- a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
97+
+++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
8598
@@ -392,6 +392,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
8699
web_frame_->Client()->DidCreateScriptContext(context, world_id);
87100
}
@@ -96,10 +109,10 @@ index f46bec1838788df47ca8c6290028361be89695b2..ff7f45078ec1c8508c22861f7bca9281
96109
void LocalFrameClientImpl::WillReleaseScriptContext(
97110
v8::Local<v8::Context> context,
98111
int32_t world_id) {
99-
diff --git a/third_party/blink/renderer/core/exported/local_frame_client_impl.h b/third_party/blink/renderer/core/exported/local_frame_client_impl.h
100-
index f4b653a52cdf0bb71e3cdc3f090c1a5f044282e3..d9d7f15cdad4edde0d27671d66beb5d1d9735079 100644
101-
--- a/third_party/blink/renderer/core/exported/local_frame_client_impl.h
102-
+++ b/third_party/blink/renderer/core/exported/local_frame_client_impl.h
112+
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
113+
index c71ed356c9c9bdc013059383d0a3d2cde97aeac0..2f63ebbe6d4a67cd8e59131e2ba6f2395f35c8f6 100644
114+
--- a/third_party/blink/renderer/core/frame/local_frame_client_impl.h
115+
+++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
103116
@@ -77,6 +77,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient {
104117

105118
void DidCreateScriptContext(v8::Local<v8::Context>,
@@ -109,24 +122,11 @@ index f4b653a52cdf0bb71e3cdc3f090c1a5f044282e3..d9d7f15cdad4edde0d27671d66beb5d1
109122
void WillReleaseScriptContext(v8::Local<v8::Context>,
110123
int32_t world_id) override;
111124

112-
diff --git a/third_party/blink/renderer/core/frame/local_frame_client.h b/third_party/blink/renderer/core/frame/local_frame_client.h
113-
index ca739d620185e7e771f563d1a94bc5fb4fa129b7..94a23f135e628500be38dd5b468ce3513e968f92 100644
114-
--- a/third_party/blink/renderer/core/frame/local_frame_client.h
115-
+++ b/third_party/blink/renderer/core/frame/local_frame_client.h
116-
@@ -290,6 +290,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
117-
118-
virtual void DidCreateScriptContext(v8::Local<v8::Context>,
119-
int32_t world_id) = 0;
120-
+ virtual void DidInstallConditionalFeatures(v8::Local<v8::Context>,
121-
+ int32_t world_id) = 0;
122-
virtual void WillReleaseScriptContext(v8::Local<v8::Context>,
123-
int32_t world_id) = 0;
124-
virtual bool AllowScriptExtensions() = 0;
125125
diff --git a/third_party/blink/renderer/core/loader/empty_clients.h b/third_party/blink/renderer/core/loader/empty_clients.h
126-
index 50beea038e1cf928ea18cac3e0a4071ca7686cc4..d47a028bdcdf67b892ce82a9d9660e1fb8ddb760 100644
126+
index ab15a135d879fda7c4d7408afde9f41e6cb6464f..72c152d63d1ed78aee7a38845bb338c085bcf8f9 100644
127127
--- a/third_party/blink/renderer/core/loader/empty_clients.h
128128
+++ b/third_party/blink/renderer/core/loader/empty_clients.h
129-
@@ -325,6 +325,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
129+
@@ -330,6 +330,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {
130130

131131
void DidCreateScriptContext(v8::Local<v8::Context>,
132132
int32_t world_id) override {}

‎patches/chromium/add_trustedauthclient_to_urlloaderfactory.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ WebContents, and cancels the authentication if there's no WebContents
1010
available, which there isn't in the case of the 'net' module.
1111

1212
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
13-
index 7332e25e8a182e35ffdba0a4e98c01641e60ee8a..fdb952a2ea9b80d7f75edb250a494f0ddad639be 100644
13+
index c6e9b42a85d25e613dbe5431db08430c87799e0a..397a2e0b8afe7aa78729132dad1eb8a307a730f3 100644
1414
--- a/services/network/public/mojom/network_context.mojom
1515
+++ b/services/network/public/mojom/network_context.mojom
1616
@@ -215,6 +215,25 @@ struct CTPolicy {
@@ -49,7 +49,7 @@ index 7332e25e8a182e35ffdba0a4e98c01641e60ee8a..fdb952a2ea9b80d7f75edb250a494f0d
4949
// the per-context allow patterns that is managed via NetworkContext
5050
// interface. This still respects the per-context block lists.
5151
diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
52-
index 65893457556402e93ea85e93c48ca8f4a00bb1c1..cf05119ade526ae2b48b9e3b223d4b318e94900c 100644
52+
index 794fcd3774af9bc119a310bf93412da2a7dfd8fe..4a55b407b4647e16906b3b28bbd31a7ccd65e0f4 100644
5353
--- a/services/network/url_loader.cc
5454
+++ b/services/network/url_loader.cc
5555
@@ -459,6 +459,7 @@ URLLoader::URLLoader(
@@ -128,7 +128,7 @@ index 70518f42849e5d1d6e1dd0faf4cae866ba39ef09..b081be5d939b17ecaffa85e75ebb0124
128128
std::unique_ptr<FileOpenerForUpload> file_opener_for_upload_;
129129

130130
diff --git a/services/network/url_loader_factory.cc b/services/network/url_loader_factory.cc
131-
index 75ae8488efa7e5acfda0b21029657b525fa95f86..5dce71ee5efc97f9f63d0b5f236dccdfb05cfc79 100644
131+
index 7b9ec0454dfde7e1b950c51eb8d00dcb89e1f900..07da4723043fef85dd8530a844008859f92e3937 100644
132132
--- a/services/network/url_loader_factory.cc
133133
+++ b/services/network/url_loader_factory.cc
134134
@@ -75,6 +75,7 @@ URLLoaderFactory::URLLoaderFactory(

‎patches/chromium/blink-worker-enable-csp-in-file-scheme.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ Subject: blink-worker-enable-csp-in-file-scheme.patch
66
This allows file:// URLs in workers to have a CSP.
77

88
diff --git a/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc b/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
9-
index 9c697793db98ddaaece76f7f8a7890ca0773f936..d264acf0173de6f2ebbf600187d4ceeea4625e42 100644
9+
index f924a17eb0bff18d4463f70e437791eaa7c02a19..26918625a478be8c3f80bd3a9a74cf783e951a96 100644
1010
--- a/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
1111
+++ b/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
12-
@@ -367,7 +367,6 @@ void WorkerClassicScriptLoader::ProcessContentSecurityPolicy(
12+
@@ -365,7 +365,6 @@ void WorkerClassicScriptLoader::ProcessContentSecurityPolicy(
1313
// document (which is implemented in WorkerMessagingProxy, and
1414
// m_contentSecurityPolicy should be left as nullptr to inherit the policy).
1515
if (!response.CurrentRequestUrl().ProtocolIs("blob") &&

‎patches/chromium/blink_fix_prototype_assert.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ In the long term we should investigate why it happened, and take a more
1111
formal fix. But for now I'm just make this assertion silently pass away.
1212

1313
diff --git a/third_party/blink/renderer/platform/bindings/v8_object_constructor.cc b/third_party/blink/renderer/platform/bindings/v8_object_constructor.cc
14-
index ac84b10418753f1df8e9f21c9dbbe9dff2f85194..36146a5939c0cc70f18c0ffc459940e3ea041180 100644
14+
index 196548f9b1a817348df05c889b315a8124e1692d..359165f1c52b8afb0d91d4a363da0429cf5372ef 100644
1515
--- a/third_party/blink/renderer/platform/bindings/v8_object_constructor.cc
1616
+++ b/third_party/blink/renderer/platform/bindings/v8_object_constructor.cc
17-
@@ -98,8 +98,10 @@ v8::Local<v8::Function> V8ObjectConstructor::CreateInterfaceObject(
17+
@@ -95,8 +95,10 @@ v8::Local<v8::Function> V8ObjectConstructor::CreateInterfaceObject(
1818
bool get_prototype_value =
1919
interface_object->Get(context, V8AtomicString(isolate, "prototype"))
2020
.ToLocal(&prototype_value);

0 commit comments

Comments
 (0)
X Tutup