chore: bump chromium to 4563763ef26ad940d4e988d7245dd (master) (#23219)
* chore: bump chromium in DEPS to 461ecae368fd0832f18e0b13e61f3561d83f0031 * update patches * update patches * Remove both vs browser/child split in content gn files.2157965
* chore: bump chromium in DEPS to 7ff3897f3104563763ef26ad940d4e988d7245dd * update patches * update patches * Add ElectronKioskDelegate for extensions2159760
Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: Electron Bot <anonymous@electronjs.org>
This commit is contained in:
parent
176a120ec2
commit
37db307153
46 changed files with 226 additions and 174 deletions
|
@ -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 afbed9686b4fccd43991f16be15a261486c127b9..80398b633bed8cd7d04f1ecb44abc306131fa977 100644
|
||||
index 30cb8bc97e0820b6aaa6e36f472c49fa4c0293cd..38ade540bae40bec1d0f38d5d9bced660a52910a 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 afbed9686b4fccd43991f16be15a261486c127b9..80398b633bed8cd7d04f1ecb44abc306
|
|||
// 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 bef9aa2ebcebea5e57f67ac03a1b16f6b0bfaa97..5deb335845057b1fb4e051af91f926ffeb2dd270 100644
|
||||
index 6671ee42a602baf120c3ab2bda6590cacb5f07ae..5fb828cfb76098a20f48e0dd9a11291fd04bae9e 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
|
||||
@@ -925,6 +925,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
|
||||
@@ -923,6 +923,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
|
||||
return MainWorldScriptContext()->Global();
|
||||
}
|
||||
|
||||
|
@ -39,7 +39,7 @@ index bef9aa2ebcebea5e57f67ac03a1b16f6b0bfaa97..5deb335845057b1fb4e051af91f926ff
|
|||
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 7f031166c0e98c06a93b419e11e1b2b9989a8e4e..ca5eb27215f12d0c15d9cd4a5ecc121327977ba4 100644
|
||||
index b7365c92f2428341b6892f8750e4b7d9f16ede89..7e1f1dea70e8caefd00fceb1d3921fced17ea146 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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue