|
@@ -10,7 +10,7 @@ DidCreateScriptContext is called, not all JS APIs are available in the
|
|
|
context, which can cause some preload scripts to trip.
|
|
|
|
|
|
diff --git a/content/public/renderer/render_frame_observer.h b/content/public/renderer/render_frame_observer.h
|
|
|
-index 7eaed5e4ce1f8a46d1e25f8838cf52b3676a7fb5..8f2bd75d29acfc212f2e680caf63c428aedb16b9 100644
|
|
|
+index 6c92a2856e447bdda11c7ed2c64b79b93a0eca26..03dedde2d83e6b09fb7e90be7dfdce246f301d8f 100644
|
|
|
--- a/content/public/renderer/render_frame_observer.h
|
|
|
+++ b/content/public/renderer/render_frame_observer.h
|
|
|
@@ -136,6 +136,8 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
|
|
@@ -23,10 +23,10 @@ index 7eaed5e4ce1f8a46d1e25f8838cf52b3676a7fb5..8f2bd75d29acfc212f2e680caf63c428
|
|
|
int32_t world_id) {}
|
|
|
virtual void DidClearWindowObject() {}
|
|
|
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
|
|
-index a0123eac7193282dbfba9712f0d88b2b87fccd9f..137c78c4441d58d9e8822aa87a2389126a80e1aa 100644
|
|
|
+index af97f29bbe4e1f4e67845cbd14c7aeb9bf4177ab..6a400f5d28f3e2485073a366e50cdfe2a83904ef 100644
|
|
|
--- a/content/renderer/render_frame_impl.cc
|
|
|
+++ b/content/renderer/render_frame_impl.cc
|
|
|
-@@ -4407,6 +4407,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
|
|
|
+@@ -4412,6 +4412,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
|
|
|
observer.DidCreateScriptContext(context, world_id);
|
|
|
}
|
|
|
|
|
@@ -40,10 +40,10 @@ index a0123eac7193282dbfba9712f0d88b2b87fccd9f..137c78c4441d58d9e8822aa87a238912
|
|
|
int world_id) {
|
|
|
for (auto& observer : observers_)
|
|
|
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
|
|
|
-index c0d24c1715b4714c5f179dbba4f0d91cddef1946..c819e1429630342cb34476847b3c25b140dfc593 100644
|
|
|
+index 2dcc6cf737dbe296e966e35b5c512691884f09b3..7c0729d0e38bcdcf61ebba3dd5d5c7e3ed6880f2 100644
|
|
|
--- a/content/renderer/render_frame_impl.h
|
|
|
+++ b/content/renderer/render_frame_impl.h
|
|
|
-@@ -603,6 +603,8 @@ class CONTENT_EXPORT RenderFrameImpl
|
|
|
+@@ -606,6 +606,8 @@ class CONTENT_EXPORT RenderFrameImpl
|
|
|
void DidObserveLayoutShift(double score, bool after_input_or_scroll) override;
|
|
|
void DidCreateScriptContext(v8::Local<v8::Context> context,
|
|
|
int world_id) override;
|
|
@@ -53,10 +53,10 @@ index c0d24c1715b4714c5f179dbba4f0d91cddef1946..c819e1429630342cb34476847b3c25b1
|
|
|
int world_id) override;
|
|
|
void DidChangeScrollOffset() override;
|
|
|
diff --git a/third_party/blink/public/web/web_local_frame_client.h b/third_party/blink/public/web/web_local_frame_client.h
|
|
|
-index 9fa27d4f1c63599d5cfeb095e74a72a88db1d8a2..0d37864c44495615103f5c1dca623c1e181a6460 100644
|
|
|
+index 371e1df42bf2e121f028b297910d5a4b3f61be87..e3da9fe2c16285f45528c9cea32582e81efba146 100644
|
|
|
--- a/third_party/blink/public/web/web_local_frame_client.h
|
|
|
+++ b/third_party/blink/public/web/web_local_frame_client.h
|
|
|
-@@ -592,6 +592,9 @@ class BLINK_EXPORT WebLocalFrameClient {
|
|
|
+@@ -595,6 +595,9 @@ class BLINK_EXPORT WebLocalFrameClient {
|
|
|
virtual void DidCreateScriptContext(v8::Local<v8::Context>,
|
|
|
int32_t world_id) {}
|
|
|
|
|
@@ -79,10 +79,10 @@ index 9736b31c03a32635fb8fde581321cc10ec11b11a..c9fd2170a25a7970648b8210ebe94e22
|
|
|
if (World().IsMainWorld()) {
|
|
|
GetFrame()->Loader().DispatchDidClearWindowObjectInMainWorld();
|
|
|
diff --git a/third_party/blink/renderer/core/frame/local_frame_client.h b/third_party/blink/renderer/core/frame/local_frame_client.h
|
|
|
-index bbcc1a23378d86d716171cf695f641212e64a30a..06b10cdfa96473731958c4a7e6d0839e79714ad3 100644
|
|
|
+index 7b44fbe83599917a3ba44996a84ab7a024a9828d..34c6fa4b532d4a91a68f0779dd606c116cd699ce 100644
|
|
|
--- a/third_party/blink/renderer/core/frame/local_frame_client.h
|
|
|
+++ b/third_party/blink/renderer/core/frame/local_frame_client.h
|
|
|
-@@ -308,6 +308,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
|
|
|
+@@ -311,6 +311,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
|
|
|
|
|
|
virtual void DidCreateScriptContext(v8::Local<v8::Context>,
|
|
|
int32_t world_id) = 0;
|
|
@@ -92,7 +92,7 @@ index bbcc1a23378d86d716171cf695f641212e64a30a..06b10cdfa96473731958c4a7e6d0839e
|
|
|
int32_t world_id) = 0;
|
|
|
virtual bool AllowScriptExtensions() = 0;
|
|
|
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
|
|
|
-index 77850c10195719e320b1fdfc4f13c805a802d4ef..98955dd3da64a2f4b7036466d9e1eefd1704727d 100644
|
|
|
+index 06ee76131d39832ff9f3aa8d341880c0144be8d9..65132045098de42f5ee4925f356469505d9043a4 100644
|
|
|
--- a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
|
|
|
+++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
|
|
|
@@ -283,6 +283,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
|
|
@@ -110,7 +110,7 @@ index 77850c10195719e320b1fdfc4f13c805a802d4ef..98955dd3da64a2f4b7036466d9e1eefd
|
|
|
v8::Local<v8::Context> context,
|
|
|
int32_t world_id) {
|
|
|
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
|
|
|
-index d3f976c53e4ad894bfb808c1184f949871c3df2f..00d95e053dcc274036fc7300ad0b946df969d5fa 100644
|
|
|
+index c6bf61ee8391787522906a2e0d16e460024895ee..0984dcbdc6926c864a6dbc7e4ed4abc8594122e3 100644
|
|
|
--- a/third_party/blink/renderer/core/frame/local_frame_client_impl.h
|
|
|
+++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
|
|
|
@@ -82,6 +82,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient {
|