chore: bump chromium to 138.0.7165.0 (37-x-y) (#46985)
* chore: bump chromium in DEPS to 138.0.7165.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * 6492127: Add new less invasive context menu mode for mobile interesttarget https://chromium-review.googlesource.com/c/chromium/src/+/6492127 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * chore: fixup patch indices Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
parent
5602efb2b6
commit
069c9a9e1f
28 changed files with 93 additions and 93 deletions
2
DEPS
2
DEPS
|
@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
|
||||||
|
|
||||||
vars = {
|
vars = {
|
||||||
'chromium_version':
|
'chromium_version':
|
||||||
'138.0.7164.0',
|
'138.0.7165.0',
|
||||||
'node_version':
|
'node_version':
|
||||||
'v22.15.0',
|
'v22.15.0',
|
||||||
'nan_version':
|
'nan_version':
|
||||||
|
|
|
@ -23,7 +23,7 @@ index db655a7b52eacb74f2a8637db36abd87f6b86792..8014cb08e2090a12ea8b9e92cb8f93c9
|
||||||
int32_t world_id) {}
|
int32_t world_id) {}
|
||||||
virtual void DidClearWindowObject() {}
|
virtual void DidClearWindowObject() {}
|
||||||
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
||||||
index b0aa018f2f4e6865915516ab6b65fac20d9e6f20..c04a544eb8991bfa718322e6e3a090ef4733a50b 100644
|
index 6c569b4a0f4ddea5d071753bb4a72002ba174171..d1085ca830b5a98f1550e6c01728cd760df6141a 100644
|
||||||
--- a/content/renderer/render_frame_impl.cc
|
--- a/content/renderer/render_frame_impl.cc
|
||||||
+++ b/content/renderer/render_frame_impl.cc
|
+++ b/content/renderer/render_frame_impl.cc
|
||||||
@@ -4807,6 +4807,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
|
@@ -4807,6 +4807,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
|
||||||
|
|
|
@ -6,10 +6,10 @@ Subject: allow disabling blink scheduler throttling per RenderView
|
||||||
This allows us to disable throttling for hidden windows.
|
This allows us to disable throttling for hidden windows.
|
||||||
|
|
||||||
diff --git a/content/browser/renderer_host/navigation_controller_impl_unittest.cc b/content/browser/renderer_host/navigation_controller_impl_unittest.cc
|
diff --git a/content/browser/renderer_host/navigation_controller_impl_unittest.cc b/content/browser/renderer_host/navigation_controller_impl_unittest.cc
|
||||||
index f9b27264f7e3e1f8de6f088ccb78e4a4693c5e93..85aebec5028fd6b324a1f1d9416fbf99c150e09a 100644
|
index 495daa75895a4545287da53f305e6cd348db7183..fd749047a7d505d02c4e8e4631da823275c27822 100644
|
||||||
--- a/content/browser/renderer_host/navigation_controller_impl_unittest.cc
|
--- a/content/browser/renderer_host/navigation_controller_impl_unittest.cc
|
||||||
+++ b/content/browser/renderer_host/navigation_controller_impl_unittest.cc
|
+++ b/content/browser/renderer_host/navigation_controller_impl_unittest.cc
|
||||||
@@ -168,6 +168,12 @@ class MockPageBroadcast : public blink::mojom::PageBroadcast {
|
@@ -166,6 +166,12 @@ class MockPageBroadcast : public blink::mojom::PageBroadcast {
|
||||||
(network::mojom::AttributionSupport support),
|
(network::mojom::AttributionSupport support),
|
||||||
(override));
|
(override));
|
||||||
|
|
||||||
|
@ -23,10 +23,10 @@ index f9b27264f7e3e1f8de6f088ccb78e4a4693c5e93..85aebec5028fd6b324a1f1d9416fbf99
|
||||||
return receiver_.BindNewEndpointAndPassDedicatedRemote();
|
return receiver_.BindNewEndpointAndPassDedicatedRemote();
|
||||||
}
|
}
|
||||||
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
|
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
|
||||||
index 9d430ebff1067323f229c3b81b18300e8cb7e8a9..090125bc5a4c485c83d9eaa6b82ed5cf3402cbbd 100644
|
index 4a70fd017915c1d631a47096c735d9c4b6e2c2af..0b2eb574f86e4c192d7cd986abea72e85163a7bd 100644
|
||||||
--- a/content/browser/renderer_host/render_view_host_impl.cc
|
--- a/content/browser/renderer_host/render_view_host_impl.cc
|
||||||
+++ b/content/browser/renderer_host/render_view_host_impl.cc
|
+++ b/content/browser/renderer_host/render_view_host_impl.cc
|
||||||
@@ -768,6 +768,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
|
@@ -759,6 +759,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
|
||||||
GetWidget()->GetAssociatedFrameWidget()->SetBackgroundOpaque(opaque);
|
GetWidget()->GetAssociatedFrameWidget()->SetBackgroundOpaque(opaque);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -80,7 +80,7 @@ index 20ca763ff7f55e8176b77349b41917b11e051ae6..a50c122064b5f0092f57e3d508fb1938
|
||||||
// This interface should only be implemented inside content.
|
// This interface should only be implemented inside content.
|
||||||
friend class RenderViewHostImpl;
|
friend class RenderViewHostImpl;
|
||||||
diff --git a/content/test/test_page_broadcast.h b/content/test/test_page_broadcast.h
|
diff --git a/content/test/test_page_broadcast.h b/content/test/test_page_broadcast.h
|
||||||
index 913e465918750df6852c3ede34a75ecebab8b1fa..c81d6ad098cf977cbd8933721e539c52056c258b 100644
|
index 58895f0ed0e18703c45eee37210003150c24550a..6a138d4cd852f6f2b9fd2294062c9b6ab4f08855 100644
|
||||||
--- a/content/test/test_page_broadcast.h
|
--- a/content/test/test_page_broadcast.h
|
||||||
+++ b/content/test/test_page_broadcast.h
|
+++ b/content/test/test_page_broadcast.h
|
||||||
@@ -50,6 +50,7 @@ class TestPageBroadcast : public blink::mojom::PageBroadcast {
|
@@ -50,6 +50,7 @@ class TestPageBroadcast : public blink::mojom::PageBroadcast {
|
||||||
|
@ -92,10 +92,10 @@ index 913e465918750df6852c3ede34a75ecebab8b1fa..c81d6ad098cf977cbd8933721e539c52
|
||||||
mojo::AssociatedReceiver<blink::mojom::PageBroadcast> receiver_;
|
mojo::AssociatedReceiver<blink::mojom::PageBroadcast> receiver_;
|
||||||
};
|
};
|
||||||
diff --git a/third_party/blink/public/mojom/page/page.mojom b/third_party/blink/public/mojom/page/page.mojom
|
diff --git a/third_party/blink/public/mojom/page/page.mojom b/third_party/blink/public/mojom/page/page.mojom
|
||||||
index f868a3cc56b49b7fdac9fa1415386bd3a59a3dd7..ac7e92740bf7a61f3d8dcf8feff0fee978ffbfee 100644
|
index 4614f84c3d8f709fb2a12d662e5a13dc12c59e8a..76444fcbf68b91ad64c46debc565ffc35a3e2c68 100644
|
||||||
--- a/third_party/blink/public/mojom/page/page.mojom
|
--- a/third_party/blink/public/mojom/page/page.mojom
|
||||||
+++ b/third_party/blink/public/mojom/page/page.mojom
|
+++ b/third_party/blink/public/mojom/page/page.mojom
|
||||||
@@ -173,4 +173,7 @@ interface PageBroadcast {
|
@@ -172,4 +172,7 @@ interface PageBroadcast {
|
||||||
// 2. The ColorProvider associated with the WebContents changes as a result
|
// 2. The ColorProvider associated with the WebContents changes as a result
|
||||||
// of theme changes.
|
// of theme changes.
|
||||||
UpdateColorProviders(ColorProviderColorMaps color_provider_colors);
|
UpdateColorProviders(ColorProviderColorMaps color_provider_colors);
|
||||||
|
@ -104,10 +104,10 @@ index f868a3cc56b49b7fdac9fa1415386bd3a59a3dd7..ac7e92740bf7a61f3d8dcf8feff0fee9
|
||||||
+ SetSchedulerThrottling(bool allowed);
|
+ SetSchedulerThrottling(bool allowed);
|
||||||
};
|
};
|
||||||
diff --git a/third_party/blink/public/web/web_view.h b/third_party/blink/public/web/web_view.h
|
diff --git a/third_party/blink/public/web/web_view.h b/third_party/blink/public/web/web_view.h
|
||||||
index b1689844282d6917b9750fbc6a875848ddf84b70..f1cc159b7c3448a33a6d9e213f8fbd3b47141fb7 100644
|
index 7c1eb9baabfb9e0f3645421b5cbe467862252638..00d2cd41d795cb550e16fb80944b238252e4e53c 100644
|
||||||
--- a/third_party/blink/public/web/web_view.h
|
--- a/third_party/blink/public/web/web_view.h
|
||||||
+++ b/third_party/blink/public/web/web_view.h
|
+++ b/third_party/blink/public/web/web_view.h
|
||||||
@@ -371,6 +371,7 @@ class BLINK_EXPORT WebView {
|
@@ -370,6 +370,7 @@ class BLINK_EXPORT WebView {
|
||||||
// Scheduling -----------------------------------------------------------
|
// Scheduling -----------------------------------------------------------
|
||||||
|
|
||||||
virtual PageScheduler* Scheduler() const = 0;
|
virtual PageScheduler* Scheduler() const = 0;
|
||||||
|
@ -116,7 +116,7 @@ index b1689844282d6917b9750fbc6a875848ddf84b70..f1cc159b7c3448a33a6d9e213f8fbd3b
|
||||||
// Visibility -----------------------------------------------------------
|
// Visibility -----------------------------------------------------------
|
||||||
|
|
||||||
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
|
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
|
||||||
index e167db6d5f208f2f3e923ec7dec7c4da4155dd90..cd31f34df12a94748e4fc9066c6f344610ce73f0 100644
|
index 6b056decc43e9ba9e7970a7d8fefaed6a86d9a2d..0b2956425d2feb84f1d0db7be4f3d4b0875b1d10 100644
|
||||||
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
|
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
|
||||||
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
|
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
|
||||||
@@ -2466,6 +2466,10 @@ void WebViewImpl::SetPageLifecycleStateInternal(
|
@@ -2466,6 +2466,10 @@ void WebViewImpl::SetPageLifecycleStateInternal(
|
||||||
|
@ -155,10 +155,10 @@ index e167db6d5f208f2f3e923ec7dec7c4da4155dd90..cd31f34df12a94748e4fc9066c6f3446
|
||||||
// Do not throttle if the page should be painting.
|
// Do not throttle if the page should be painting.
|
||||||
bool is_visible =
|
bool is_visible =
|
||||||
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.h b/third_party/blink/renderer/core/exported/web_view_impl.h
|
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.h b/third_party/blink/renderer/core/exported/web_view_impl.h
|
||||||
index 06f7cf79b4526ca3ec7670c234a6bb8faec32f04..b8fe2a9b7b6b4de2a689f3857c7ce44909e6f2dc 100644
|
index aff99e7e1feb7addcdf631b7e3ac4209da6b502d..b759aca8d1e61c19904db146840e6f0c57a3d86a 100644
|
||||||
--- a/third_party/blink/renderer/core/exported/web_view_impl.h
|
--- a/third_party/blink/renderer/core/exported/web_view_impl.h
|
||||||
+++ b/third_party/blink/renderer/core/exported/web_view_impl.h
|
+++ b/third_party/blink/renderer/core/exported/web_view_impl.h
|
||||||
@@ -448,6 +448,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
|
@@ -447,6 +447,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
|
||||||
LocalDOMWindow* PagePopupWindow() const;
|
LocalDOMWindow* PagePopupWindow() const;
|
||||||
|
|
||||||
PageScheduler* Scheduler() const override;
|
PageScheduler* Scheduler() const override;
|
||||||
|
@ -166,7 +166,7 @@ index 06f7cf79b4526ca3ec7670c234a6bb8faec32f04..b8fe2a9b7b6b4de2a689f3857c7ce449
|
||||||
void SetVisibilityState(mojom::blink::PageVisibilityState visibility_state,
|
void SetVisibilityState(mojom::blink::PageVisibilityState visibility_state,
|
||||||
bool is_initial_state) override;
|
bool is_initial_state) override;
|
||||||
mojom::blink::PageVisibilityState GetVisibilityState() override;
|
mojom::blink::PageVisibilityState GetVisibilityState() override;
|
||||||
@@ -936,6 +937,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
|
@@ -935,6 +936,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
|
||||||
// If true, we send IPC messages when |preferred_size_| changes.
|
// If true, we send IPC messages when |preferred_size_| changes.
|
||||||
bool send_preferred_size_changes_ = false;
|
bool send_preferred_size_changes_ = false;
|
||||||
|
|
||||||
|
|
|
@ -49,10 +49,10 @@ index 2072f6b14289b1f3a76dbccc98f29aa178c1c35c..d7017437a7e7e6ac130677e52731d048
|
||||||
// its owning reference back to our owning LocalFrame.
|
// its owning reference back to our owning LocalFrame.
|
||||||
client_->Detached(type);
|
client_->Detached(type);
|
||||||
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
|
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
|
||||||
index a309befcbcb1e7fe667bc1d794141fb90fea1035..dd148eb3cce762d20e9117b4f8030c881057b8bb 100644
|
index f075d02c0695ca5fe06152295179b6ec76e3597a..e5d629937aaa175d11731bc1048a1b459927e93a 100644
|
||||||
--- a/third_party/blink/renderer/core/frame/local_frame.cc
|
--- a/third_party/blink/renderer/core/frame/local_frame.cc
|
||||||
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
|
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
|
||||||
@@ -753,10 +753,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
|
@@ -727,10 +727,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
|
||||||
}
|
}
|
||||||
DCHECK(!view_ || !view_->IsAttached());
|
DCHECK(!view_ || !view_->IsAttached());
|
||||||
|
|
||||||
|
@ -63,7 +63,7 @@ index a309befcbcb1e7fe667bc1d794141fb90fea1035..dd148eb3cce762d20e9117b4f8030c88
|
||||||
if (!Client())
|
if (!Client())
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
@@ -810,6 +806,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
|
@@ -784,6 +780,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
|
||||||
DCHECK(!view_->IsAttached());
|
DCHECK(!view_->IsAttached());
|
||||||
Client()->WillBeDetached();
|
Client()->WillBeDetached();
|
||||||
|
|
||||||
|
|
|
@ -11,10 +11,10 @@ if we ever align our .pak file generation with Chrome we can remove this
|
||||||
patch.
|
patch.
|
||||||
|
|
||||||
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
|
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
|
||||||
index 84fab7fcdb1a7ded880c0ff4867e09c740e7a5d2..f03f0e67c083880dc13f8f90d9375ff62717ba00 100644
|
index 4b3f01018a9dea91b46b5917e099f272582991b2..8250f2e447ff19829cfae3f00b3df70b47749874 100644
|
||||||
--- a/chrome/BUILD.gn
|
--- a/chrome/BUILD.gn
|
||||||
+++ b/chrome/BUILD.gn
|
+++ b/chrome/BUILD.gn
|
||||||
@@ -197,11 +197,16 @@ if (!is_android && !is_mac) {
|
@@ -200,11 +200,16 @@ if (!is_android && !is_mac) {
|
||||||
"common/crash_keys.h",
|
"common/crash_keys.h",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
@ -33,7 +33,7 @@ index 84fab7fcdb1a7ded880c0ff4867e09c740e7a5d2..f03f0e67c083880dc13f8f90d9375ff6
|
||||||
"//base",
|
"//base",
|
||||||
"//build:branding_buildflags",
|
"//build:branding_buildflags",
|
||||||
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||||
index ed639e1fd384ce325f56df99d5fcf72f00aaf2b1..ea7919d5a9dd2699822facb47ae974a7a4e87172 100644
|
index 73f7fc927f1c14c038e0ca91066dbb4e9bd8be62..d7d46198d11b7454d07188641f46617c924d63b1 100644
|
||||||
--- a/chrome/browser/BUILD.gn
|
--- a/chrome/browser/BUILD.gn
|
||||||
+++ b/chrome/browser/BUILD.gn
|
+++ b/chrome/browser/BUILD.gn
|
||||||
@@ -4633,7 +4633,7 @@ static_library("browser") {
|
@@ -4633,7 +4633,7 @@ static_library("browser") {
|
||||||
|
@ -46,7 +46,7 @@ index ed639e1fd384ce325f56df99d5fcf72f00aaf2b1..ea7919d5a9dd2699822facb47ae974a7
|
||||||
# than here in :chrome_dll.
|
# than here in :chrome_dll.
|
||||||
deps += [ "//chrome:packed_resources_integrity_header" ]
|
deps += [ "//chrome:packed_resources_integrity_header" ]
|
||||||
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
|
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
|
||||||
index dd82cb96686234350a078536bce94a47aeb96ef8..2cb71c9c12ad89aa6a16c538f97979b3094b9cda 100644
|
index 4866689b354bc9d963638edabf1eb02d16ba984c..c5b383f2c78592a57f0d138538733937b8e76ecd 100644
|
||||||
--- a/chrome/test/BUILD.gn
|
--- a/chrome/test/BUILD.gn
|
||||||
+++ b/chrome/test/BUILD.gn
|
+++ b/chrome/test/BUILD.gn
|
||||||
@@ -7210,9 +7210,12 @@ test("unit_tests") {
|
@@ -7210,9 +7210,12 @@ test("unit_tests") {
|
||||||
|
|
|
@ -9,10 +9,10 @@ potentially prevent a window from being created.
|
||||||
TODO(loc): this patch is currently broken.
|
TODO(loc): this patch is currently broken.
|
||||||
|
|
||||||
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
index 184fb0e5ce15f624300a35f47ef7e34759e2e9eb..73f56d65160a114bea9dcefa6ba03a417b7a273b 100644
|
index ddfefbacebd5d89e112a15f29328c9674f7df3ae..ef8a80d2148c0ec0d8a3493ae58a4e723a9601e1 100644
|
||||||
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
@@ -9777,6 +9777,7 @@ void RenderFrameHostImpl::CreateNewWindow(
|
@@ -9776,6 +9776,7 @@ void RenderFrameHostImpl::CreateNewWindow(
|
||||||
last_committed_origin_, params->window_container_type,
|
last_committed_origin_, params->window_container_type,
|
||||||
params->target_url, params->referrer.To<Referrer>(),
|
params->target_url, params->referrer.To<Referrer>(),
|
||||||
params->frame_name, params->disposition, *params->features,
|
params->frame_name, params->disposition, *params->features,
|
||||||
|
@ -21,10 +21,10 @@ index 184fb0e5ce15f624300a35f47ef7e34759e2e9eb..73f56d65160a114bea9dcefa6ba03a41
|
||||||
&no_javascript_access);
|
&no_javascript_access);
|
||||||
|
|
||||||
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
||||||
index 77954ceccdfb1e94598d5d7ad747721ab84aa1d7..aec96f969800e2a4d09e644df770d367e48b1b63 100644
|
index cb039c0ac747feefd5e8a13ed03715508ae874d0..b6fc96993cdea489450978495ca4c1f3c58166af 100644
|
||||||
--- a/content/browser/web_contents/web_contents_impl.cc
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
||||||
+++ b/content/browser/web_contents/web_contents_impl.cc
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
||||||
@@ -5132,6 +5132,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
@@ -5139,6 +5139,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
||||||
SetPartitionedPopinOpenerOnNewWindowIfNeeded(new_contents_impl, params,
|
SetPartitionedPopinOpenerOnNewWindowIfNeeded(new_contents_impl, params,
|
||||||
opener);
|
opener);
|
||||||
|
|
||||||
|
@ -37,7 +37,7 @@ index 77954ceccdfb1e94598d5d7ad747721ab84aa1d7..aec96f969800e2a4d09e644df770d367
|
||||||
// If the new frame has a name, make sure any SiteInstances that can find
|
// If the new frame has a name, make sure any SiteInstances that can find
|
||||||
// this named frame have proxies for it. Must be called after
|
// this named frame have proxies for it. Must be called after
|
||||||
// SetSessionStorageNamespace, since this calls CreateRenderView, which uses
|
// SetSessionStorageNamespace, since this calls CreateRenderView, which uses
|
||||||
@@ -5173,12 +5179,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
@@ -5180,12 +5186,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
||||||
AddWebContentsDestructionObserver(new_contents_impl);
|
AddWebContentsDestructionObserver(new_contents_impl);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -51,10 +51,10 @@ index 77954ceccdfb1e94598d5d7ad747721ab84aa1d7..aec96f969800e2a4d09e644df770d367
|
||||||
new_contents_impl, opener, params.target_url,
|
new_contents_impl, opener, params.target_url,
|
||||||
params.referrer.To<Referrer>(), params.disposition,
|
params.referrer.To<Referrer>(), params.disposition,
|
||||||
diff --git a/content/common/frame.mojom b/content/common/frame.mojom
|
diff --git a/content/common/frame.mojom b/content/common/frame.mojom
|
||||||
index 55bb4ae3bab4cdf20b3e1dde9450a5c0e4e62b37..fe444c7fa140166a1b65c7a8a2676e2de7c4e0fc 100644
|
index d1e8581724adeca8b6776ded7e7c7e921f68905c..6c4abeaf847328f73b4e53a552a038b29421d9aa 100644
|
||||||
--- a/content/common/frame.mojom
|
--- a/content/common/frame.mojom
|
||||||
+++ b/content/common/frame.mojom
|
+++ b/content/common/frame.mojom
|
||||||
@@ -646,6 +646,10 @@ struct CreateNewWindowParams {
|
@@ -645,6 +645,10 @@ struct CreateNewWindowParams {
|
||||||
pending_associated_remote<blink.mojom.Widget> widget;
|
pending_associated_remote<blink.mojom.Widget> widget;
|
||||||
pending_associated_receiver<blink.mojom.FrameWidgetHost> frame_widget_host;
|
pending_associated_receiver<blink.mojom.FrameWidgetHost> frame_widget_host;
|
||||||
pending_associated_remote<blink.mojom.FrameWidget> frame_widget;
|
pending_associated_remote<blink.mojom.FrameWidget> frame_widget;
|
||||||
|
@ -148,7 +148,7 @@ index da319cb20733150366d85bee95609f0f2d9def7f..8a18958035cc1dd26be558349f64f772
|
||||||
// typically happens when popups are created.
|
// typically happens when popups are created.
|
||||||
virtual void WebContentsCreated(WebContents* source_contents,
|
virtual void WebContentsCreated(WebContents* source_contents,
|
||||||
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
||||||
index 7f33a5452de32f5f4f8a43d0314917f24308d77c..b0aa018f2f4e6865915516ab6b65fac20d9e6f20 100644
|
index 4d40964aa6bb93759dd73f63e48a36c66b50a61d..6c569b4a0f4ddea5d071753bb4a72002ba174171 100644
|
||||||
--- a/content/renderer/render_frame_impl.cc
|
--- a/content/renderer/render_frame_impl.cc
|
||||||
+++ b/content/renderer/render_frame_impl.cc
|
+++ b/content/renderer/render_frame_impl.cc
|
||||||
@@ -6938,6 +6938,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
|
@@ -6938,6 +6938,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
|
||||||
|
|
|
@ -7,7 +7,7 @@ This patch comes after Chromium removed the ScopedAllowIO API in favor
|
||||||
of explicitly adding ScopedAllowBlocking calls as friends.
|
of explicitly adding ScopedAllowBlocking calls as friends.
|
||||||
|
|
||||||
diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h
|
diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h
|
||||||
index 59d6e6e4d899f10d1adeb4f23c32f0dd565cf963..674954816b6c241c1923668f8da7ad5c79a04256 100644
|
index b1abcfaab58df4555d3a26481915d64ef5458e17..f2f43454c1c124da9983998564837ebf3589aefd 100644
|
||||||
--- a/base/threading/thread_restrictions.h
|
--- a/base/threading/thread_restrictions.h
|
||||||
+++ b/base/threading/thread_restrictions.h
|
+++ b/base/threading/thread_restrictions.h
|
||||||
@@ -132,6 +132,7 @@ class KeyStorageLinux;
|
@@ -132,6 +132,7 @@ class KeyStorageLinux;
|
||||||
|
@ -28,7 +28,7 @@ index 59d6e6e4d899f10d1adeb4f23c32f0dd565cf963..674954816b6c241c1923668f8da7ad5c
|
||||||
namespace enterprise_connectors {
|
namespace enterprise_connectors {
|
||||||
class LinuxKeyRotationCommand;
|
class LinuxKeyRotationCommand;
|
||||||
} // namespace enterprise_connectors
|
} // namespace enterprise_connectors
|
||||||
@@ -572,6 +576,7 @@ class BASE_EXPORT ScopedAllowBlocking {
|
@@ -577,6 +581,7 @@ class BASE_EXPORT ScopedAllowBlocking {
|
||||||
friend class ::DesktopNotificationBalloon;
|
friend class ::DesktopNotificationBalloon;
|
||||||
friend class ::FirefoxProfileLock;
|
friend class ::FirefoxProfileLock;
|
||||||
friend class ::GaiaConfig;
|
friend class ::GaiaConfig;
|
||||||
|
@ -36,7 +36,7 @@ index 59d6e6e4d899f10d1adeb4f23c32f0dd565cf963..674954816b6c241c1923668f8da7ad5c
|
||||||
friend class ::ProfileImpl;
|
friend class ::ProfileImpl;
|
||||||
friend class ::ScopedAllowBlockingForProfile;
|
friend class ::ScopedAllowBlockingForProfile;
|
||||||
friend class ::StartupTabProviderImpl;
|
friend class ::StartupTabProviderImpl;
|
||||||
@@ -610,6 +615,7 @@ class BASE_EXPORT ScopedAllowBlocking {
|
@@ -615,6 +620,7 @@ class BASE_EXPORT ScopedAllowBlocking {
|
||||||
friend class cronet::CronetPrefsManager;
|
friend class cronet::CronetPrefsManager;
|
||||||
friend class crypto::ScopedAllowBlockingForNSS; // http://crbug.com/59847
|
friend class crypto::ScopedAllowBlockingForNSS; // http://crbug.com/59847
|
||||||
friend class drive::FakeDriveService;
|
friend class drive::FakeDriveService;
|
||||||
|
|
|
@ -14,10 +14,10 @@ track down the source of this problem & figure out if we can fix it
|
||||||
by changing something in Electron.
|
by changing something in Electron.
|
||||||
|
|
||||||
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
||||||
index 459fc0eff0bfe2ec005d6f34cf7e91c2d601fd06..35de681eac3f65ce3e0435bd984159154ece2b7f 100644
|
index e3085847de7875afa655b3cfa4aa39892be626eb..46fc6d6683c50fb8a340680de2eda340f5be4cca 100644
|
||||||
--- a/content/browser/web_contents/web_contents_impl.cc
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
||||||
+++ b/content/browser/web_contents/web_contents_impl.cc
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
||||||
@@ -5051,7 +5051,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
@@ -5058,7 +5058,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
||||||
: IsGuest();
|
: IsGuest();
|
||||||
// While some guest types do not have a guest SiteInstance, the ones that
|
// While some guest types do not have a guest SiteInstance, the ones that
|
||||||
// don't all override WebContents creation above.
|
// don't all override WebContents creation above.
|
||||||
|
|
|
@ -218,10 +218,10 @@ index c6838c83ef971b88769b1f3fba8095025ae25464..2da6a4e08340e72ba7de5d03444c2f17
|
||||||
content::WebContents* AddNewContents(
|
content::WebContents* AddNewContents(
|
||||||
content::WebContents* source,
|
content::WebContents* source,
|
||||||
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
||||||
index c1c3db2992038cad0c01ce65c57676f8fe281830..2ad1479de622d956c701d8dc4adb75d0114f65b1 100644
|
index 94b4429fffb474304c1d43d1cf1337fde90d9e45..2a683ac9a810d7bc7286e56ce50dd51adfc4f25f 100644
|
||||||
--- a/content/browser/web_contents/web_contents_impl.cc
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
||||||
+++ b/content/browser/web_contents/web_contents_impl.cc
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
||||||
@@ -5014,8 +5014,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
@@ -5021,8 +5021,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
||||||
// TODO(crbug.com/40202416): Support a way for MPArch guests to support this.
|
// TODO(crbug.com/40202416): Support a way for MPArch guests to support this.
|
||||||
if (delegate_ && delegate_->IsWebContentsCreationOverridden(
|
if (delegate_ && delegate_->IsWebContentsCreationOverridden(
|
||||||
source_site_instance, params.window_container_type,
|
source_site_instance, params.window_container_type,
|
||||||
|
|
|
@ -11,7 +11,7 @@ not need this dependency.
|
||||||
refs https://chromium-review.googlesource.com/c/chromium/src/+/5573603
|
refs https://chromium-review.googlesource.com/c/chromium/src/+/5573603
|
||||||
|
|
||||||
diff --git a/chrome/browser/ui/color/BUILD.gn b/chrome/browser/ui/color/BUILD.gn
|
diff --git a/chrome/browser/ui/color/BUILD.gn b/chrome/browser/ui/color/BUILD.gn
|
||||||
index 29c3dafa96df631e36aa1ced6798990c768adeaa..0281a50f04fecfc4ded3805a8f9637e184288581 100644
|
index 77c7485b0fa885ddff38f336d1c7a52f2e969c73..045c0751a0c43f3360e334dd227b6cff7ddfd681 100644
|
||||||
--- a/chrome/browser/ui/color/BUILD.gn
|
--- a/chrome/browser/ui/color/BUILD.gn
|
||||||
+++ b/chrome/browser/ui/color/BUILD.gn
|
+++ b/chrome/browser/ui/color/BUILD.gn
|
||||||
@@ -84,9 +84,6 @@ source_set("mixers") {
|
@@ -84,9 +84,6 @@ source_set("mixers") {
|
||||||
|
|
|
@ -6,10 +6,10 @@ Subject: disable_hidden.patch
|
||||||
Electron uses this to disable background throttling for hidden windows.
|
Electron uses this to disable background throttling for hidden windows.
|
||||||
|
|
||||||
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
|
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
|
||||||
index b722e19e8c660d13750ea7bf505e28a9c1d9d59f..bac913e30ce140d9b370186781cccf5817885076 100644
|
index 00583269d16f4b8eacb4875b12a3e69155839d12..23d5baa267333e18551d449317f3e3a6520f34a6 100644
|
||||||
--- a/content/browser/renderer_host/render_widget_host_impl.cc
|
--- a/content/browser/renderer_host/render_widget_host_impl.cc
|
||||||
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
|
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
|
||||||
@@ -831,6 +831,10 @@ void RenderWidgetHostImpl::WasHidden() {
|
@@ -834,6 +834,10 @@ void RenderWidgetHostImpl::WasHidden() {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -21,10 +21,10 @@ index b722e19e8c660d13750ea7bf505e28a9c1d9d59f..bac913e30ce140d9b370186781cccf58
|
||||||
// Prompts should remain open and functional across tab switches.
|
// Prompts should remain open and functional across tab switches.
|
||||||
if (!delegate_ || !delegate_->IsWaitingForPointerLockPrompt(this)) {
|
if (!delegate_ || !delegate_->IsWaitingForPointerLockPrompt(this)) {
|
||||||
diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
|
diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
|
||||||
index c11b7183397d28c6db61969390d1d078261e4c47..5d92247f088942250fbb6bd1ff83ab1c2c7140f7 100644
|
index 86a80795fb931f569b21c3138697b90d8b38d750..6268d7e3a64bac17b94f0bfb8e24c44a61cf7d3f 100644
|
||||||
--- a/content/browser/renderer_host/render_widget_host_impl.h
|
--- a/content/browser/renderer_host/render_widget_host_impl.h
|
||||||
+++ b/content/browser/renderer_host/render_widget_host_impl.h
|
+++ b/content/browser/renderer_host/render_widget_host_impl.h
|
||||||
@@ -1013,6 +1013,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl
|
@@ -1012,6 +1012,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl
|
||||||
// Requests a commit and forced redraw in the renderer compositor.
|
// Requests a commit and forced redraw in the renderer compositor.
|
||||||
void ForceRedrawForTesting();
|
void ForceRedrawForTesting();
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@ This patch temporarily disables the metrics so we can have green CI, and we
|
||||||
should continue seeking for a real fix.
|
should continue seeking for a real fix.
|
||||||
|
|
||||||
diff --git a/content/browser/renderer_host/navigator.cc b/content/browser/renderer_host/navigator.cc
|
diff --git a/content/browser/renderer_host/navigator.cc b/content/browser/renderer_host/navigator.cc
|
||||||
index 54ce1ea5ac11c9831a9553fbb5c5584c05440071..be95785fa144a4f11a3c97fea562dd4635ffe7b0 100644
|
index d976c082529a62bcef7352531ced808e5970027e..31e95005359f6e8e4e18ebd75324940f4fdd11eb 100644
|
||||||
--- a/content/browser/renderer_host/navigator.cc
|
--- a/content/browser/renderer_host/navigator.cc
|
||||||
+++ b/content/browser/renderer_host/navigator.cc
|
+++ b/content/browser/renderer_host/navigator.cc
|
||||||
@@ -1476,6 +1476,7 @@ void Navigator::RecordNavigationMetrics(
|
@@ -1476,6 +1476,7 @@ void Navigator::RecordNavigationMetrics(
|
||||||
|
|
|
@ -12,7 +12,7 @@ Ideally we could add an embedder observer pattern here but that can be
|
||||||
done in future work.
|
done in future work.
|
||||||
|
|
||||||
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
|
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
|
||||||
index cd31f34df12a94748e4fc9066c6f344610ce73f0..f9298f9ff6f5fc0f16d9366fb6fd569de83b55ce 100644
|
index 0b2956425d2feb84f1d0db7be4f3d4b0875b1d10..f2e37be51049caab4fd6385b5b55f1151708bd82 100644
|
||||||
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
|
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
|
||||||
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
|
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
|
||||||
@@ -171,6 +171,7 @@
|
@@ -171,6 +171,7 @@
|
||||||
|
|
|
@ -239,7 +239,7 @@ index 5e8d2bfbccd0625c2598544a9cba3d71373eded2..e68a97ee75754fc7196f11cf5c731550
|
||||||
bool RenderVSyncNotificationEnabled() const {
|
bool RenderVSyncNotificationEnabled() const {
|
||||||
return render_v_sync_notification_enabled_;
|
return render_v_sync_notification_enabled_;
|
||||||
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
|
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
|
||||||
index f9298f9ff6f5fc0f16d9366fb6fd569de83b55ce..ef16711d93643a0612c8b34db8b3773a70aa210f 100644
|
index f2e37be51049caab4fd6385b5b55f1151708bd82..c0078bff37cfd1a4e5da111f6ec1aa817987a7ab 100644
|
||||||
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
|
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
|
||||||
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
|
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
|
||||||
@@ -3574,6 +3574,9 @@ void WebViewImpl::UpdateRendererPreferences(
|
@@ -3574,6 +3574,9 @@ void WebViewImpl::UpdateRendererPreferences(
|
||||||
|
|
|
@ -28,7 +28,7 @@ index 0527831e1f8d7923ba0f687a5c0da8573189d867..f72af0e6cfcf06d47bd917def993f081
|
||||||
|
|
||||||
// Returns the http referrer of original request which initited this load.
|
// Returns the http referrer of original request which initited this load.
|
||||||
diff --git a/third_party/blink/renderer/core/loader/document_loader.h b/third_party/blink/renderer/core/loader/document_loader.h
|
diff --git a/third_party/blink/renderer/core/loader/document_loader.h b/third_party/blink/renderer/core/loader/document_loader.h
|
||||||
index e86efe8c9fc2d27fefc5e47afe401b8a6b1419ba..9d1ef55e4e122f30564f35406c8b51335e3d6996 100644
|
index 10682e129daf40104a71d0067aa126cc13a1e8b7..fb8696d850fc3fbbcd66087c8cafc53acee462aa 100644
|
||||||
--- a/third_party/blink/renderer/core/loader/document_loader.h
|
--- a/third_party/blink/renderer/core/loader/document_loader.h
|
||||||
+++ b/third_party/blink/renderer/core/loader/document_loader.h
|
+++ b/third_party/blink/renderer/core/loader/document_loader.h
|
||||||
@@ -328,7 +328,7 @@ class CORE_EXPORT DocumentLoader : public GarbageCollected<DocumentLoader>,
|
@@ -328,7 +328,7 @@ class CORE_EXPORT DocumentLoader : public GarbageCollected<DocumentLoader>,
|
||||||
|
|
|
@ -45,10 +45,10 @@ index 0dbbaddc1bef8b5a1b253297f47c33601dc6fe67..0c84f727b29c742ba4c2edd38dfa16d1
|
||||||
// origin of |common_params.url| and/or |common_params.initiator_origin|.
|
// origin of |common_params.url| and/or |common_params.initiator_origin|.
|
||||||
url::Origin resolved_origin = url::Origin::Resolve(
|
url::Origin resolved_origin = url::Origin::Resolve(
|
||||||
diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc
|
diff --git a/third_party/blink/renderer/core/loader/document_loader.cc b/third_party/blink/renderer/core/loader/document_loader.cc
|
||||||
index b2329dcaf3ef464fc4b7db477e2431017711d501..635029fa9680eeb6d01223c5cf683c7854763f40 100644
|
index abcc4436479e7c9bc0dbf77c70c628e48d6ea1b8..510c088fd06d5989e710ba6674e1798bd5d63954 100644
|
||||||
--- a/third_party/blink/renderer/core/loader/document_loader.cc
|
--- a/third_party/blink/renderer/core/loader/document_loader.cc
|
||||||
+++ b/third_party/blink/renderer/core/loader/document_loader.cc
|
+++ b/third_party/blink/renderer/core/loader/document_loader.cc
|
||||||
@@ -2334,6 +2334,10 @@ Frame* DocumentLoader::CalculateOwnerFrame() {
|
@@ -2333,6 +2333,10 @@ Frame* DocumentLoader::CalculateOwnerFrame() {
|
||||||
scoped_refptr<SecurityOrigin> DocumentLoader::CalculateOrigin(
|
scoped_refptr<SecurityOrigin> DocumentLoader::CalculateOrigin(
|
||||||
Document* owner_document) {
|
Document* owner_document) {
|
||||||
scoped_refptr<SecurityOrigin> origin;
|
scoped_refptr<SecurityOrigin> origin;
|
||||||
|
@ -59,7 +59,7 @@ index b2329dcaf3ef464fc4b7db477e2431017711d501..635029fa9680eeb6d01223c5cf683c78
|
||||||
StringBuilder debug_info_builder;
|
StringBuilder debug_info_builder;
|
||||||
// Whether the origin is newly created within this call, instead of copied
|
// Whether the origin is newly created within this call, instead of copied
|
||||||
// from an existing document's origin or from `origin_to_commit_`. If this is
|
// from an existing document's origin or from `origin_to_commit_`. If this is
|
||||||
@@ -2387,6 +2391,10 @@ scoped_refptr<SecurityOrigin> DocumentLoader::CalculateOrigin(
|
@@ -2386,6 +2390,10 @@ scoped_refptr<SecurityOrigin> DocumentLoader::CalculateOrigin(
|
||||||
// the end of this function.
|
// the end of this function.
|
||||||
origin = origin_to_commit_;
|
origin = origin_to_commit_;
|
||||||
debug_info_builder.Append("use_origin_to_commit");
|
debug_info_builder.Append("use_origin_to_commit");
|
||||||
|
|
|
@ -87,10 +87,10 @@ index 75df43e3cd2721a92c90c18154d53d5c203e2465..ce42c75c8face36d21f53f44c0201ac4
|
||||||
// The view with active text input state, i.e., a focused <input> element.
|
// The view with active text input state, i.e., a focused <input> element.
|
||||||
// It will be nullptr if no such view exists. Note that the active view
|
// It will be nullptr if no such view exists. Note that the active view
|
||||||
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
||||||
index 05a102a33f4c05fe6d34fa721d37fcae05a3a577..459fc0eff0bfe2ec005d6f34cf7e91c2d601fd06 100644
|
index e96a656473e0d18a8053dab92dbeb1afb174d27f..e3085847de7875afa655b3cfa4aa39892be626eb 100644
|
||||||
--- a/content/browser/web_contents/web_contents_impl.cc
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
||||||
+++ b/content/browser/web_contents/web_contents_impl.cc
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
||||||
@@ -9970,7 +9970,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame(
|
@@ -9997,7 +9997,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame(
|
||||||
"WebContentsImpl::OnFocusedElementChangedInFrame",
|
"WebContentsImpl::OnFocusedElementChangedInFrame",
|
||||||
"render_frame_host", frame);
|
"render_frame_host", frame);
|
||||||
RenderWidgetHostViewBase* root_view =
|
RenderWidgetHostViewBase* root_view =
|
||||||
|
|
|
@ -11,10 +11,10 @@ This patch should be upstreamed as a conditional revert of the logic in desktop
|
||||||
vs mobile runtimes. i.e. restore the old logic only on desktop platforms
|
vs mobile runtimes. i.e. restore the old logic only on desktop platforms
|
||||||
|
|
||||||
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
|
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
|
||||||
index 8c3ac60d029a76b004111cffd56e9b859594dd65..d398cb9f429f8304eeb6ed00c79e609a3b83bd3f 100644
|
index 2551b4a2b9dfca9767c39e2e9bd79ed19c439db4..81844d36b86d5590b59d3b87f3f2d5bef3a7b24d 100644
|
||||||
--- a/content/browser/renderer_host/render_widget_host_impl.cc
|
--- a/content/browser/renderer_host/render_widget_host_impl.cc
|
||||||
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
|
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
|
||||||
@@ -2121,9 +2121,8 @@ RenderWidgetHostImpl::GetWidgetInputHandler() {
|
@@ -2135,9 +2135,8 @@ RenderWidgetHostImpl::GetWidgetInputHandler() {
|
||||||
void RenderWidgetHostImpl::NotifyScreenInfoChanged() {
|
void RenderWidgetHostImpl::NotifyScreenInfoChanged() {
|
||||||
// The resize message (which may not happen immediately) will carry with it
|
// The resize message (which may not happen immediately) will carry with it
|
||||||
// the screen info as well as the new size (if the screen has changed scale
|
// the screen info as well as the new size (if the screen has changed scale
|
||||||
|
|
|
@ -59,10 +59,10 @@ index cba373664bec3a32abad6fe0396bd67b53b7e67f..a54f1b3351efd2d8f324436f7f35cd43
|
||||||
|
|
||||||
#endif // THIRD_PARTY_BLINK_PUBLIC_WEB_WEB_SCRIPT_EXECUTION_CALLBACK_H_
|
#endif // THIRD_PARTY_BLINK_PUBLIC_WEB_WEB_SCRIPT_EXECUTION_CALLBACK_H_
|
||||||
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
|
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
|
||||||
index dd148eb3cce762d20e9117b4f8030c881057b8bb..e626d63f295b2d0fa62b179c76c45df125bbaeeb 100644
|
index e5d629937aaa175d11731bc1048a1b459927e93a..5fa2f36b65a876edc8f2e5905b695b9e5d88afbd 100644
|
||||||
--- a/third_party/blink/renderer/core/frame/local_frame.cc
|
--- a/third_party/blink/renderer/core/frame/local_frame.cc
|
||||||
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
|
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
|
||||||
@@ -3113,6 +3113,7 @@ void LocalFrame::RequestExecuteScript(
|
@@ -3081,6 +3081,7 @@ void LocalFrame::RequestExecuteScript(
|
||||||
mojom::blink::EvaluationTiming evaluation_timing,
|
mojom::blink::EvaluationTiming evaluation_timing,
|
||||||
mojom::blink::LoadEventBlockingOption blocking_option,
|
mojom::blink::LoadEventBlockingOption blocking_option,
|
||||||
WebScriptExecutionCallback callback,
|
WebScriptExecutionCallback callback,
|
||||||
|
@ -70,7 +70,7 @@ index dd148eb3cce762d20e9117b4f8030c881057b8bb..e626d63f295b2d0fa62b179c76c45df1
|
||||||
BackForwardCacheAware back_forward_cache_aware,
|
BackForwardCacheAware back_forward_cache_aware,
|
||||||
mojom::blink::WantResultOption want_result_option,
|
mojom::blink::WantResultOption want_result_option,
|
||||||
mojom::blink::PromiseResultOption promise_behavior) {
|
mojom::blink::PromiseResultOption promise_behavior) {
|
||||||
@@ -3145,7 +3146,7 @@ void LocalFrame::RequestExecuteScript(
|
@@ -3113,7 +3114,7 @@ void LocalFrame::RequestExecuteScript(
|
||||||
PausableScriptExecutor::CreateAndRun(
|
PausableScriptExecutor::CreateAndRun(
|
||||||
script_state, std::move(script_sources), execute_script_policy,
|
script_state, std::move(script_sources), execute_script_policy,
|
||||||
user_gesture, evaluation_timing, blocking_option, want_result_option,
|
user_gesture, evaluation_timing, blocking_option, want_result_option,
|
||||||
|
@ -80,10 +80,10 @@ index dd148eb3cce762d20e9117b4f8030c881057b8bb..e626d63f295b2d0fa62b179c76c45df1
|
||||||
|
|
||||||
void LocalFrame::SetEvictCachedSessionStorageOnFreezeOrUnload() {
|
void LocalFrame::SetEvictCachedSessionStorageOnFreezeOrUnload() {
|
||||||
diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/blink/renderer/core/frame/local_frame.h
|
diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/blink/renderer/core/frame/local_frame.h
|
||||||
index 80c37508a9382a0aeb221c37d2a96f13c526e550..0d12cf49599f0a249ab97f371e5c27cfe654f463 100644
|
index 80c57253678d1aa6e655c84f4ccd9c0899eb5a5b..4d6b860409d35da509b7ef8c5d52fa9f92f1b542 100644
|
||||||
--- a/third_party/blink/renderer/core/frame/local_frame.h
|
--- a/third_party/blink/renderer/core/frame/local_frame.h
|
||||||
+++ b/third_party/blink/renderer/core/frame/local_frame.h
|
+++ b/third_party/blink/renderer/core/frame/local_frame.h
|
||||||
@@ -826,6 +826,7 @@ class CORE_EXPORT LocalFrame final
|
@@ -830,6 +830,7 @@ class CORE_EXPORT LocalFrame final
|
||||||
mojom::blink::EvaluationTiming,
|
mojom::blink::EvaluationTiming,
|
||||||
mojom::blink::LoadEventBlockingOption,
|
mojom::blink::LoadEventBlockingOption,
|
||||||
WebScriptExecutionCallback,
|
WebScriptExecutionCallback,
|
||||||
|
@ -92,10 +92,10 @@ index 80c37508a9382a0aeb221c37d2a96f13c526e550..0d12cf49599f0a249ab97f371e5c27cf
|
||||||
mojom::blink::WantResultOption,
|
mojom::blink::WantResultOption,
|
||||||
mojom::blink::PromiseResultOption);
|
mojom::blink::PromiseResultOption);
|
||||||
diff --git a/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc b/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc
|
diff --git a/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc b/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc
|
||||||
index 58b8f5b22c01d41cca3ec0088341d036917d5838..930d9fa36a616fe27d7b5b5a39436cbe375140bc 100644
|
index 48c2ef6fe7bb92dda5199849266228e2008b605b..f49577958bba8eb69e5be44efb0bb696934ba1f3 100644
|
||||||
--- a/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc
|
--- a/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc
|
||||||
+++ b/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc
|
+++ b/third_party/blink/renderer/core/frame/local_frame_mojo_handler.cc
|
||||||
@@ -969,6 +969,7 @@ void LocalFrameMojoHandler::JavaScriptExecuteRequestInIsolatedWorld(
|
@@ -973,6 +973,7 @@ void LocalFrameMojoHandler::JavaScriptExecuteRequestInIsolatedWorld(
|
||||||
std::move(callback).Run(value ? std::move(*value) : base::Value());
|
std::move(callback).Run(value ? std::move(*value) : base::Value());
|
||||||
},
|
},
|
||||||
std::move(callback)),
|
std::move(callback)),
|
||||||
|
|
|
@ -35,7 +35,7 @@ system font by checking if it's kCTFontPriorityAttribute is set to
|
||||||
system priority.
|
system priority.
|
||||||
|
|
||||||
diff --git a/base/BUILD.gn b/base/BUILD.gn
|
diff --git a/base/BUILD.gn b/base/BUILD.gn
|
||||||
index 5267ae3844f58d17e795c17184c85592157fda6f..21cab5e75e92570260df2e5fe4d2e404d2cb020a 100644
|
index 02ac517502a51603a689c74d8073b2e5862f1e45..f0d167bb6c3a53950c431170eaa45a69408f93d9 100644
|
||||||
--- a/base/BUILD.gn
|
--- a/base/BUILD.gn
|
||||||
+++ b/base/BUILD.gn
|
+++ b/base/BUILD.gn
|
||||||
@@ -1046,6 +1046,7 @@ component("base") {
|
@@ -1046,6 +1046,7 @@ component("base") {
|
||||||
|
|
|
@ -10,10 +10,10 @@ an about:blank check to this area.
|
||||||
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5403876
|
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5403876
|
||||||
|
|
||||||
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
index cd3ef19b973bcd0f9268684ae087b9197756715a..18a9ac180526faa053060f6d21abb2a90ebfc1cc 100644
|
index 71174dc9f0e15622c67a2d33dc119594de68fc69..d73dced1fa1ad073a75df83657380a78659a8a1e 100644
|
||||||
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
@@ -809,8 +809,8 @@ void VerifyThatBrowserAndRendererCalculatedOriginsToCommitMatch(
|
@@ -808,8 +808,8 @@ void VerifyThatBrowserAndRendererCalculatedOriginsToCommitMatch(
|
||||||
// TODO(crbug.com/40092527): Consider adding a separate boolean that
|
// TODO(crbug.com/40092527): Consider adding a separate boolean that
|
||||||
// tracks this instead of piggybacking `origin_calculation_debug_info`.
|
// tracks this instead of piggybacking `origin_calculation_debug_info`.
|
||||||
if (renderer_side_origin.opaque() &&
|
if (renderer_side_origin.opaque() &&
|
||||||
|
|
|
@ -666,7 +666,7 @@ index 6809c4576c71bc1e1a6ad4e0a37707272a9a10f4..3aad10424a6a31dab2ca393d00149ec6
|
||||||
PrintingFailed(int32 cookie, PrintFailureReason reason);
|
PrintingFailed(int32 cookie, PrintFailureReason reason);
|
||||||
|
|
||||||
diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
|
diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
|
||||||
index 09eec30627132cf715380518643cf245b10b4bf8..a1b0bd1e46c8608ad0e3a0be8b882049514788e9 100644
|
index 774392650ad07ee56cb931db7d1a46eaedb1eaa1..d42afb1a744113af660aadc832c71244b8918090 100644
|
||||||
--- a/components/printing/renderer/print_render_frame_helper.cc
|
--- a/components/printing/renderer/print_render_frame_helper.cc
|
||||||
+++ b/components/printing/renderer/print_render_frame_helper.cc
|
+++ b/components/printing/renderer/print_render_frame_helper.cc
|
||||||
@@ -52,6 +52,7 @@
|
@@ -52,6 +52,7 @@
|
||||||
|
@ -677,7 +677,7 @@ index 09eec30627132cf715380518643cf245b10b4bf8..a1b0bd1e46c8608ad0e3a0be8b882049
|
||||||
#include "printing/units.h"
|
#include "printing/units.h"
|
||||||
#include "services/metrics/public/cpp/ukm_source_id.h"
|
#include "services/metrics/public/cpp/ukm_source_id.h"
|
||||||
#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
|
#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
|
||||||
@@ -1236,14 +1237,14 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
|
@@ -1235,14 +1236,14 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
|
||||||
}
|
}
|
||||||
|
|
||||||
print_in_progress_ = true;
|
print_in_progress_ = true;
|
||||||
|
@ -694,7 +694,7 @@ index 09eec30627132cf715380518643cf245b10b4bf8..a1b0bd1e46c8608ad0e3a0be8b882049
|
||||||
if (!weak_this) {
|
if (!weak_this) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -1274,12 +1275,14 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
|
@@ -1273,12 +1274,14 @@ void PrintRenderFrameHelper::BindPrintRenderFrameReceiver(
|
||||||
receivers_.Add(this, std::move(receiver));
|
receivers_.Add(this, std::move(receiver));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -712,7 +712,7 @@ index 09eec30627132cf715380518643cf245b10b4bf8..a1b0bd1e46c8608ad0e3a0be8b882049
|
||||||
ScopedIPC scoped_ipc(weak_ptr_factory_.GetWeakPtr());
|
ScopedIPC scoped_ipc(weak_ptr_factory_.GetWeakPtr());
|
||||||
if (ipc_nesting_level_ > kAllowedIpcDepthForPrint) {
|
if (ipc_nesting_level_ > kAllowedIpcDepthForPrint) {
|
||||||
return;
|
return;
|
||||||
@@ -1296,9 +1299,10 @@ void PrintRenderFrameHelper::PrintRequestedPagesInternal(
|
@@ -1295,9 +1298,10 @@ void PrintRenderFrameHelper::PrintRequestedPagesInternal(
|
||||||
|
|
||||||
is_loading_ = frame->WillPrintSoon();
|
is_loading_ = frame->WillPrintSoon();
|
||||||
if (is_loading_) {
|
if (is_loading_) {
|
||||||
|
@ -726,7 +726,7 @@ index 09eec30627132cf715380518643cf245b10b4bf8..a1b0bd1e46c8608ad0e3a0be8b882049
|
||||||
SetupOnStopLoadingTimeout();
|
SetupOnStopLoadingTimeout();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -1308,7 +1312,7 @@ void PrintRenderFrameHelper::PrintRequestedPagesInternal(
|
@@ -1307,7 +1311,7 @@ void PrintRenderFrameHelper::PrintRequestedPagesInternal(
|
||||||
// plugin node and print that instead.
|
// plugin node and print that instead.
|
||||||
auto plugin = delegate_->GetPdfElement(frame);
|
auto plugin = delegate_->GetPdfElement(frame);
|
||||||
|
|
||||||
|
@ -735,7 +735,7 @@ index 09eec30627132cf715380518643cf245b10b4bf8..a1b0bd1e46c8608ad0e3a0be8b882049
|
||||||
|
|
||||||
if (render_frame_gone_) {
|
if (render_frame_gone_) {
|
||||||
return;
|
return;
|
||||||
@@ -1464,6 +1468,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value::Dict settings) {
|
@@ -1463,6 +1467,8 @@ void PrintRenderFrameHelper::PrintPreview(base::Value::Dict settings) {
|
||||||
if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
|
if (ipc_nesting_level_ > kAllowedIpcDepthForPrint)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -744,7 +744,7 @@ index 09eec30627132cf715380518643cf245b10b4bf8..a1b0bd1e46c8608ad0e3a0be8b882049
|
||||||
print_preview_context_.OnPrintPreview();
|
print_preview_context_.OnPrintPreview();
|
||||||
|
|
||||||
#if BUILDFLAG(IS_CHROMEOS)
|
#if BUILDFLAG(IS_CHROMEOS)
|
||||||
@@ -2076,17 +2082,19 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
|
@@ -2075,17 +2081,19 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
|
||||||
|
|
||||||
void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
|
void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
|
||||||
const blink::WebNode& node,
|
const blink::WebNode& node,
|
||||||
|
@ -767,7 +767,7 @@ index 09eec30627132cf715380518643cf245b10b4bf8..a1b0bd1e46c8608ad0e3a0be8b882049
|
||||||
DidFinishPrinting(PrintingResult::kFailPrintInit);
|
DidFinishPrinting(PrintingResult::kFailPrintInit);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -2107,8 +2115,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
|
@@ -2106,8 +2114,15 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
|
||||||
print_pages_params_->params->print_scaling_option;
|
print_pages_params_->params->print_scaling_option;
|
||||||
|
|
||||||
auto self = weak_ptr_factory_.GetWeakPtr();
|
auto self = weak_ptr_factory_.GetWeakPtr();
|
||||||
|
@ -784,7 +784,7 @@ index 09eec30627132cf715380518643cf245b10b4bf8..a1b0bd1e46c8608ad0e3a0be8b882049
|
||||||
// Check if `this` is still valid.
|
// Check if `this` is still valid.
|
||||||
if (!self)
|
if (!self)
|
||||||
return;
|
return;
|
||||||
@@ -2376,29 +2391,43 @@ void PrintRenderFrameHelper::IPCProcessed() {
|
@@ -2375,29 +2390,43 @@ void PrintRenderFrameHelper::IPCProcessed() {
|
||||||
}
|
}
|
||||||
|
|
||||||
bool PrintRenderFrameHelper::InitPrintSettings(blink::WebLocalFrame* frame,
|
bool PrintRenderFrameHelper::InitPrintSettings(blink::WebLocalFrame* frame,
|
||||||
|
|
|
@ -30,10 +30,10 @@ index a54a0dedf8ef1cfffa4e80a4707debed0e83d277..e66e71fdbabb40a5307b12cd8965e773
|
||||||
// RenderWidgetHost on the primary main frame, and false otherwise.
|
// RenderWidgetHost on the primary main frame, and false otherwise.
|
||||||
virtual bool IsWidgetForPrimaryMainFrame(RenderWidgetHostImpl*);
|
virtual bool IsWidgetForPrimaryMainFrame(RenderWidgetHostImpl*);
|
||||||
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
|
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
|
||||||
index bac913e30ce140d9b370186781cccf5817885076..8c3ac60d029a76b004111cffd56e9b859594dd65 100644
|
index 23d5baa267333e18551d449317f3e3a6520f34a6..2551b4a2b9dfca9767c39e2e9bd79ed19c439db4 100644
|
||||||
--- a/content/browser/renderer_host/render_widget_host_impl.cc
|
--- a/content/browser/renderer_host/render_widget_host_impl.cc
|
||||||
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
|
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
|
||||||
@@ -2055,6 +2055,9 @@ void RenderWidgetHostImpl::SetCursor(const ui::Cursor& cursor) {
|
@@ -2069,6 +2069,9 @@ void RenderWidgetHostImpl::SetCursor(const ui::Cursor& cursor) {
|
||||||
if (view_) {
|
if (view_) {
|
||||||
view_->UpdateCursor(cursor);
|
view_->UpdateCursor(cursor);
|
||||||
}
|
}
|
||||||
|
@ -44,10 +44,10 @@ index bac913e30ce140d9b370186781cccf5817885076..8c3ac60d029a76b004111cffd56e9b85
|
||||||
|
|
||||||
void RenderWidgetHostImpl::ShowContextMenuAtPoint(
|
void RenderWidgetHostImpl::ShowContextMenuAtPoint(
|
||||||
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
||||||
index aec96f969800e2a4d09e644df770d367e48b1b63..c1c3db2992038cad0c01ce65c57676f8fe281830 100644
|
index b6fc96993cdea489450978495ca4c1f3c58166af..94b4429fffb474304c1d43d1cf1337fde90d9e45 100644
|
||||||
--- a/content/browser/web_contents/web_contents_impl.cc
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
||||||
+++ b/content/browser/web_contents/web_contents_impl.cc
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
||||||
@@ -5884,6 +5884,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
|
@@ -5891,6 +5891,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
|
||||||
return text_input_manager_.get();
|
return text_input_manager_.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -60,7 +60,7 @@ index aec96f969800e2a4d09e644df770d367e48b1b63..c1c3db2992038cad0c01ce65c57676f8
|
||||||
RenderWidgetHostImpl* render_widget_host) {
|
RenderWidgetHostImpl* render_widget_host) {
|
||||||
return render_widget_host == GetPrimaryMainFrame()->GetRenderWidgetHost();
|
return render_widget_host == GetPrimaryMainFrame()->GetRenderWidgetHost();
|
||||||
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
|
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
|
||||||
index 91f52c79054c184142d15cfad6b24330a365c167..51cc85f9c998cc9234700ec47065d69eaac8d474 100644
|
index 54e9de12419c5e70775116b404d8ea4d370197bb..e1535116bbffeda9b6a881849c0a7d9de001c248 100644
|
||||||
--- a/content/browser/web_contents/web_contents_impl.h
|
--- a/content/browser/web_contents/web_contents_impl.h
|
||||||
+++ b/content/browser/web_contents/web_contents_impl.h
|
+++ b/content/browser/web_contents/web_contents_impl.h
|
||||||
@@ -1183,6 +1183,7 @@ class CONTENT_EXPORT WebContentsImpl
|
@@ -1183,6 +1183,7 @@ class CONTENT_EXPORT WebContentsImpl
|
||||||
|
|
|
@ -15,10 +15,10 @@ This CL removes these filters so the unresponsive event can still be
|
||||||
accessed from our JS event. The filtering is moved into Electron's code.
|
accessed from our JS event. The filtering is moved into Electron's code.
|
||||||
|
|
||||||
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
||||||
index 35de681eac3f65ce3e0435bd984159154ece2b7f..f2d5a85376109b6127ca4a7b3c26dbbb61990e20 100644
|
index 46fc6d6683c50fb8a340680de2eda340f5be4cca..2be25d84a831b0fa2baefeb95d413a5503d64b1b 100644
|
||||||
--- a/content/browser/web_contents/web_contents_impl.cc
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
||||||
+++ b/content/browser/web_contents/web_contents_impl.cc
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
||||||
@@ -10107,25 +10107,13 @@ void WebContentsImpl::RendererUnresponsive(
|
@@ -10134,25 +10134,13 @@ void WebContentsImpl::RendererUnresponsive(
|
||||||
base::RepeatingClosure hang_monitor_restarter) {
|
base::RepeatingClosure hang_monitor_restarter) {
|
||||||
OPTIONAL_TRACE_EVENT1("content", "WebContentsImpl::RendererUnresponsive",
|
OPTIONAL_TRACE_EVENT1("content", "WebContentsImpl::RendererUnresponsive",
|
||||||
"render_widget_host", render_widget_host);
|
"render_widget_host", render_widget_host);
|
||||||
|
|
|
@ -24,7 +24,7 @@ index bb7475f1f8be4038c77d2dc68b09a7ac2338b160..c35ef5290ef1f812c5e7ff31d71ae066
|
||||||
const blink::WebMouseEvent& event,
|
const blink::WebMouseEvent& event,
|
||||||
const ui::LatencyInfo& latency) {
|
const ui::LatencyInfo& latency) {
|
||||||
diff --git a/content/browser/renderer_host/render_widget_host_view_base.h b/content/browser/renderer_host/render_widget_host_view_base.h
|
diff --git a/content/browser/renderer_host/render_widget_host_view_base.h b/content/browser/renderer_host/render_widget_host_view_base.h
|
||||||
index faed571e3232545cdba8fc113c039d3432441448..e349711282d623c975501de5fc1a5c9c7309001f 100644
|
index 5627ee381a99c49760bbaa6e5e3476d8b4bc8cb1..230e059ee11ed64a1694232dad791fbb5644b578 100644
|
||||||
--- a/content/browser/renderer_host/render_widget_host_view_base.h
|
--- a/content/browser/renderer_host/render_widget_host_view_base.h
|
||||||
+++ b/content/browser/renderer_host/render_widget_host_view_base.h
|
+++ b/content/browser/renderer_host/render_widget_host_view_base.h
|
||||||
@@ -30,6 +30,8 @@
|
@@ -30,6 +30,8 @@
|
||||||
|
@ -61,8 +61,8 @@ index faed571e3232545cdba8fc113c039d3432441448..e349711282d623c975501de5fc1a5c9c
|
||||||
void OnAutoscrollStart() override;
|
void OnAutoscrollStart() override;
|
||||||
const viz::DisplayHitTestQueryMap& GetDisplayHitTestQuery() const override;
|
const viz::DisplayHitTestQueryMap& GetDisplayHitTestQuery() const override;
|
||||||
|
|
||||||
@@ -197,6 +205,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
|
@@ -198,6 +206,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
|
||||||
void NotifyContextMenuInsetsObservers(const gfx::Rect&) override {}
|
void ShowInterestInElement(int) override {}
|
||||||
bool IsHTMLFormPopup() const override;
|
bool IsHTMLFormPopup() const override;
|
||||||
|
|
||||||
+ virtual void InitAsGuest(RenderWidgetHostView* parent_host_view,
|
+ virtual void InitAsGuest(RenderWidgetHostView* parent_host_view,
|
||||||
|
|
|
@ -52,10 +52,10 @@ Some alternatives to this patch:
|
||||||
None of these options seems like a substantial maintainability win over this patch to me (@nornagon).
|
None of these options seems like a substantial maintainability win over this patch to me (@nornagon).
|
||||||
|
|
||||||
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
|
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
|
||||||
index f47270687b9a12fb74be2e90cc1e9f25e2e2d34e..84fab7fcdb1a7ded880c0ff4867e09c740e7a5d2 100644
|
index 97f843f8133c49d684b415f61ef4b4084c4d345c..4b3f01018a9dea91b46b5917e099f272582991b2 100644
|
||||||
--- a/chrome/BUILD.gn
|
--- a/chrome/BUILD.gn
|
||||||
+++ b/chrome/BUILD.gn
|
+++ b/chrome/BUILD.gn
|
||||||
@@ -1551,7 +1551,7 @@ if (is_chrome_branded && !is_android) {
|
@@ -1554,7 +1554,7 @@ if (is_chrome_branded && !is_android) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -64,7 +64,7 @@ index f47270687b9a12fb74be2e90cc1e9f25e2e2d34e..84fab7fcdb1a7ded880c0ff4867e09c7
|
||||||
chrome_paks("packed_resources") {
|
chrome_paks("packed_resources") {
|
||||||
if (is_mac) {
|
if (is_mac) {
|
||||||
output_dir = "$root_gen_dir/repack"
|
output_dir = "$root_gen_dir/repack"
|
||||||
@@ -1597,6 +1597,12 @@ repack("browser_tests_pak") {
|
@@ -1600,6 +1600,12 @@ repack("browser_tests_pak") {
|
||||||
deps = [ "//chrome/test/data/webui:resources" ]
|
deps = [ "//chrome/test/data/webui:resources" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -9,10 +9,10 @@ is needed for OSR.
|
||||||
Originally landed in https://github.com/electron/libchromiumcontent/pull/226.
|
Originally landed in https://github.com/electron/libchromiumcontent/pull/226.
|
||||||
|
|
||||||
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
||||||
index 2ad1479de622d956c701d8dc4adb75d0114f65b1..3d4510df709ed60a1da7163d3226541ed8ff201c 100644
|
index 2a683ac9a810d7bc7286e56ce50dd51adfc4f25f..8bf17cff8a1bea7cc73a91cec52887671f2c8aa4 100644
|
||||||
--- a/content/browser/web_contents/web_contents_impl.cc
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
||||||
+++ b/content/browser/web_contents/web_contents_impl.cc
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
||||||
@@ -3953,6 +3953,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
@@ -3960,6 +3960,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
||||||
params.main_frame_name, GetOpener(), primary_main_frame_policy,
|
params.main_frame_name, GetOpener(), primary_main_frame_policy,
|
||||||
base::UnguessableToken::Create());
|
base::UnguessableToken::Create());
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@ index 2ad1479de622d956c701d8dc4adb75d0114f65b1..3d4510df709ed60a1da7163d3226541e
|
||||||
std::unique_ptr<WebContentsViewDelegate> delegate =
|
std::unique_ptr<WebContentsViewDelegate> delegate =
|
||||||
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
|
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
|
||||||
|
|
||||||
@@ -3963,6 +3970,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
@@ -3970,6 +3977,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
||||||
view_ = CreateWebContentsView(this, std::move(delegate),
|
view_ = CreateWebContentsView(this, std::move(delegate),
|
||||||
&render_view_host_delegate_view_);
|
&render_view_host_delegate_view_);
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,10 +15,10 @@ Note that we also need to manually update embedder's
|
||||||
`api::WebContents::IsFullscreenForTabOrPending` value.
|
`api::WebContents::IsFullscreenForTabOrPending` value.
|
||||||
|
|
||||||
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
index 73f56d65160a114bea9dcefa6ba03a417b7a273b..cd3ef19b973bcd0f9268684ae087b9197756715a 100644
|
index ef8a80d2148c0ec0d8a3493ae58a4e723a9601e1..71174dc9f0e15622c67a2d33dc119594de68fc69 100644
|
||||||
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||||
@@ -8883,6 +8883,17 @@ void RenderFrameHostImpl::EnterFullscreen(
|
@@ -8882,6 +8882,17 @@ void RenderFrameHostImpl::EnterFullscreen(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -37,10 +37,10 @@ index 73f56d65160a114bea9dcefa6ba03a417b7a273b..cd3ef19b973bcd0f9268684ae087b919
|
||||||
if (had_fullscreen_token && !GetView()->HasFocus())
|
if (had_fullscreen_token && !GetView()->HasFocus())
|
||||||
GetView()->Focus();
|
GetView()->Focus();
|
||||||
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
||||||
index 3d4510df709ed60a1da7163d3226541ed8ff201c..05a102a33f4c05fe6d34fa721d37fcae05a3a577 100644
|
index 8bf17cff8a1bea7cc73a91cec52887671f2c8aa4..e96a656473e0d18a8053dab92dbeb1afb174d27f 100644
|
||||||
--- a/content/browser/web_contents/web_contents_impl.cc
|
--- a/content/browser/web_contents/web_contents_impl.cc
|
||||||
+++ b/content/browser/web_contents/web_contents_impl.cc
|
+++ b/content/browser/web_contents/web_contents_impl.cc
|
||||||
@@ -4228,21 +4228,25 @@ KeyboardEventProcessingResult WebContentsImpl::PreHandleKeyboardEvent(
|
@@ -4235,21 +4235,25 @@ KeyboardEventProcessingResult WebContentsImpl::PreHandleKeyboardEvent(
|
||||||
const input::NativeWebKeyboardEvent& event) {
|
const input::NativeWebKeyboardEvent& event) {
|
||||||
OPTIONAL_TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("content.verbose"),
|
OPTIONAL_TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("content.verbose"),
|
||||||
"WebContentsImpl::PreHandleKeyboardEvent");
|
"WebContentsImpl::PreHandleKeyboardEvent");
|
||||||
|
@ -78,7 +78,7 @@ index 3d4510df709ed60a1da7163d3226541ed8ff201c..05a102a33f4c05fe6d34fa721d37fcae
|
||||||
}
|
}
|
||||||
|
|
||||||
bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) {
|
bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) {
|
||||||
@@ -4401,7 +4405,7 @@ void WebContentsImpl::EnterFullscreenMode(
|
@@ -4408,7 +4412,7 @@ void WebContentsImpl::EnterFullscreenMode(
|
||||||
OPTIONAL_TRACE_EVENT0("content", "WebContentsImpl::EnterFullscreenMode");
|
OPTIONAL_TRACE_EVENT0("content", "WebContentsImpl::EnterFullscreenMode");
|
||||||
DCHECK(CanEnterFullscreenMode(requesting_frame));
|
DCHECK(CanEnterFullscreenMode(requesting_frame));
|
||||||
DCHECK(requesting_frame->IsActive());
|
DCHECK(requesting_frame->IsActive());
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue