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

update chromium patches

Browse source
This commit is contained in:
Jeremy Apthorp 2019-02-26 13:31:29 -08:00 • committed by Samuel Attard
parent 1650ca3699
commit 7245546274
29 changed files with 106 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

8
patches/common/chromium/blink_world_context.patch
View file

@ -5,10 +5,10 @@ Subject: blink_world_context.patch
diff --git a/third_party/blink/public/web/web_local_frame.h b/third_party/blink/public/web/web_local_frame.h
index 6fa653b04cf6613cd1fbde502731be27216a9140..97cdb13e8129dae1fa6fc390b63d738ff5d71ed0 100644
index 72fb1b51ded3b6e090b475641cefb1af4e3803c3..82b57892350adeb7f65ea17882f0b1b08090eebe 100644
--- a/third_party/blink/public/web/web_local_frame.h
+++ b/third_party/blink/public/web/web_local_frame.h
@@ -342,6 +342,9 @@ class WebLocalFrame : public WebFrame {
@@ -344,6 +344,9 @@ class WebLocalFrame : public WebFrame {
// be calling this API.
virtual v8::Local<v8::Context> MainWorldScriptContext() const = 0;
@ -19,7 +19,7 @@ index 6fa653b04cf6613cd1fbde502731be27216a9140..97cdb13e8129dae1fa6fc390b63d738f
// 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 ae240d4c7d998256f3ca73a0fd37aad64d68da4d..256e5021b2402d9899f5c0b103668b731e1ed454 100644
index c059f16582ecd6310bf523bc315b6107c69c34f8..b0dc3cde086ad53e5432406c2ce44cc5693b9310 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
@@ -889,6 +889,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
@ -37,7 +37,7 @@ index ae240d4c7d998256f3ca73a0fd37aad64d68da4d..256e5021b2402d9899f5c0b103668b73
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 eeafc634da8688033bbad20f0a0fb67e3ac92e44..9f606f407f112ad5cf9f1bfccd548719121b02df 100644
index 9074fabf2d2fb199cbd3f6d73f11ff8c9239a847..24ab8fc628815d94d420f9ec7f9b979010831dea 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
@@ -147,6 +147,8 @@ class CORE_EXPORT WebLocalFrameImpl final