mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
0a0d7a8202
* chore: bump chromium in DEPS to 78.0.3899.1 * chore: bump chromium in DEPS to 78.0.3900.1 * chore: bump chromium in DEPS to 78.0.3900.2 * chore: bump chromium in DEPS to 78.0.3901.1 * chore: bump chromium in DEPS to 78.0.3902.1 * chore: remove tts.patch https://chromium-review.googlesource.com/c/chromium/src/+/1717595 * build: disable widevine cdm component https://chromium-review.googlesource.com/c/chromium/src/+/1767596 * chore: bump chromium in DEPS to 78.0.3903.1 * build: redo network_context.h mojification187df411f2%5E%21/#F7 * build: disable widevine Disable widevine, atleast for the moment by deleting the patch and removing the build argument. > At the moment its horribly broken, we would have to look into fixing on all > three platforms now that upstream also supports linux. * chore: bump chromium in DEPS to 78.0.3904.1 * update pepper_flash.patch https://chromium-review.googlesource.com/c/chromium/src/+/1771371 * chore: bump chromium in DEPS to 78.0.3905.1 * Update patches * Convert Web Speech Synthesis API over to Mojo https://chromium-review.googlesource.com/c/chromium/src/+/1717595 (cherry picked from commite0163b0185) * Update patches * CookieInclusionStatus: Support warnings and multiple exclusion reasons https://chromium-review.googlesource.com/c/chromium/src/+/1756157 (cherry picked from commitab2f5ac40b) * Pass request_unadjusted_movement to lock mouse https://chromium-review.googlesource.com/c/chromium/src/+/1767098 (cherry picked from commita17daff6f1) * chore: rename thread_pool to thread_pool_instance Refs: https://chromium-review.googlesource.com/c/chromium/src/+/1773663 (cherry picked from commit8547b09de8) * Remove the typemap from network::mojom::URLResponseHead. https://chromium-review.googlesource.com/c/chromium/src/+/1758653 (cherry picked from commita768ad210d) * ServiceWorker: Make Extension WebRequestAPI aware of service worker update check script requests https://chromium-review.googlesource.com/c/chromium/src/+/1782230 (cherry picked from commit615d33517a) * Convert CertVerifierClient to new Mojo types https://bugs.chromium.org/p/chromium/issues/detail?id=955171 (cherry picked from commitac5e8dbce5) * Convert DataPipeGetterPtr and DataPipeGetterRequest to new Mojo types https://chromium-review.googlesource.com/c/chromium/src/+/1787760 https://chromium-review.googlesource.com/c/chromium/src/+/1787659 (cherry picked from commit8611783898) * Add tts patch * build: fix compilation with MSSTL (cherry picked from commit4d8cb7de9b)
52 lines
2.6 KiB
Diff
52 lines
2.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Anonymous <anonymous@electronjs.org>
|
|
Date: Thu, 20 Sep 2018 17:45:11 -0700
|
|
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 a781a44399a31f048419311d2317229c912752c2..131c0dcb125b00215e3ad469c11c4b47d7cb126b 100644
|
|
--- a/third_party/blink/public/web/web_local_frame.h
|
|
+++ b/third_party/blink/public/web/web_local_frame.h
|
|
@@ -356,6 +356,9 @@ class WebLocalFrame : public WebFrame {
|
|
// be calling this API.
|
|
virtual v8::Local<v8::Context> MainWorldScriptContext() const = 0;
|
|
|
|
+ virtual v8::Local<v8::Context> WorldScriptContext(
|
|
+ v8::Isolate* isolate, int world_id) const = 0;
|
|
+
|
|
// Executes script in the context of the current page and returns the value
|
|
// 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 d1f07949b2049924ca34d07ac9384da6d5f790ad..ad66990c0389ffb5306d2f3c847b78d190d113c0 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
|
|
@@ -877,6 +877,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
|
|
return MainWorldScriptContext()->Global();
|
|
}
|
|
|
|
+v8::Local<v8::Context> WebLocalFrameImpl::WorldScriptContext(
|
|
+ v8::Isolate* isolate, int world_id) const {
|
|
+ scoped_refptr<DOMWrapperWorld> world = DOMWrapperWorld::EnsureIsolatedWorld(
|
|
+ isolate, world_id);
|
|
+ return ToScriptState(GetFrame(), *world)->GetContext();
|
|
+}
|
|
+
|
|
bool WebFrame::ScriptCanAccess(WebFrame* target) {
|
|
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 9fbb94efc829928a1b1e284d529dd5562619dc20..0a0904ab66d55753252ccf484c03c07c8dac002b 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
|
|
@@ -150,6 +150,8 @@ class CORE_EXPORT WebLocalFrameImpl final
|
|
int argc,
|
|
v8::Local<v8::Value> argv[]) override;
|
|
v8::Local<v8::Context> MainWorldScriptContext() const override;
|
|
+ v8::Local<v8::Context> WorldScriptContext(
|
|
+ v8::Isolate* isolate, int world_id) const override;
|
|
v8::Local<v8::Object> GlobalProxy() const override;
|
|
void StartReload(WebFrameLoadType) override;
|
|
void ReloadImage(const WebNode&) override;
|