mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: bump chromium to 2600291d041c530698616a4716cdf (master) (#23122)

Browse source 
* chore: bump chromium in DEPS to 99e60beb593ecf98f8a441e3f03a13b68cfcb311

* update patches

* chore: bump chromium in DEPS to b1abadda21f417ba5e8276c4dd779d31445d16cd

* update patches

* 2146532: gtkui: Fix standalone Ozone/Wayland configuration

2146532

* 2145152: Pass source URL when setting a cookie

2145152

* lint

* chore: bump chromium in DEPS to 8897189f1da5a3670bbe32d343767fd71f80d779

* chore: bump chromium in DEPS to 8ac51eeee93a02ed5b81f47e28627079edeecde0

* chore: bump chromium in DEPS to e897b8003f3a5f3c8d654eee9b03c513046ae7ea

* chore: bump chromium in DEPS to 7b80f9c82122600291d041c530698616a4716cdf

* Update patches

* Move definition of WebInputEvent enums into mojo

2152777

* update patches

Co-authored-by: Electron Bot <anonymous@electronjs.org>
Co-authored-by: Jeremy Apthorp <nornagon@nornagon.net>
Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
This commit is contained in:
Electron Bot 2020-04-20 17:25:38 -07:00 • committed by GitHub
parent ba3928103f
commit 1bbb407dc9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
38 changed files with 138 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

8
patches/chromium/blink_world_context.patch
View file

@ -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 8a545fcae6275e77b4dcc422be52402b96ef9d1c..fb84aa2239222a1b1ed9ddd0dd4194e326758d37 100644
index afbed9686b4fccd43991f16be15a261486c127b9..80398b633bed8cd7d04f1ecb44abc306131fa977 100644
--- a/third_party/blink/public/web/web_local_frame.h
+++ b/third_party/blink/public/web/web_local_frame.h
@@ -334,6 +334,9 @@ class WebLocalFrame : public WebFrame {
@ -21,10 +21,10 @@ index 8a545fcae6275e77b4dcc422be52402b96ef9d1c..fb84aa2239222a1b1ed9ddd0dd4194e3
// that the script evaluated to with callback. Script execution can be
// suspend.
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 8944b0e99d757cbe3aac98af0d86ac386c62052b..a12d14bbc49e8f3f4034cb63377aa274a41f6ffd 100644
index bef9aa2ebcebea5e57f67ac03a1b16f6b0bfaa97..5deb335845057b1fb4e051af91f926ffeb2dd270 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
@@ -924,6 +924,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
@@ -925,6 +925,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
return MainWorldScriptContext()->Global();
}
@ -39,7 +39,7 @@ index 8944b0e99d757cbe3aac98af0d86ac386c62052b..a12d14bbc49e8f3f4034cb63377aa274
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 27ede2774376e2fa348be97c941ab6c6d0cba88f..9d787b5e62efdf7ac495f7ef230ce2eddc47d03d 100644
index 7f031166c0e98c06a93b419e11e1b2b9989a8e4e..ca5eb27215f12d0c15d9cd4a5ecc121327977ba4 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
@@ -161,6 +161,8 @@ class CORE_EXPORT WebLocalFrameImpl final