chore: bump chromium to 132.0.6834.15 (34-x-y) (#44783)
* chore: bump chromium in DEPS to 132.0.6834.15 * chore: update patches --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
This commit is contained in:
parent
b6f97b7952
commit
b72b661f3c
20 changed files with 65 additions and 65 deletions
2
DEPS
2
DEPS
|
@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
|
||||||
|
|
||||||
vars = {
|
vars = {
|
||||||
'chromium_version':
|
'chromium_version':
|
||||||
'132.0.6834.6',
|
'132.0.6834.15',
|
||||||
'node_version':
|
'node_version':
|
||||||
'v20.18.0',
|
'v20.18.0',
|
||||||
'nan_version':
|
'nan_version':
|
||||||
|
|
|
@ -116,10 +116,10 @@ index 083af135d890c2837e72c314e170e81931bd2a20..5245ea88441ef84c15b8052a9011ce70
|
||||||
// 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 f5fe2e061448673c788315a167efff1fb70c3ef0..ed0c77c14e8dcf3e6d7328c8a9c640388b7be92d 100644
|
index ad134361e0b9c9a9db4cec06c429102d5dbe0c4e..82aef58c0a3c00c818e0d60df9a5296162c57cc3 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
|
||||||
@@ -2452,6 +2452,10 @@ void WebViewImpl::SetPageLifecycleStateInternal(
|
@@ -2456,6 +2456,10 @@ void WebViewImpl::SetPageLifecycleStateInternal(
|
||||||
TRACE_EVENT2("navigation", "WebViewImpl::SetPageLifecycleStateInternal",
|
TRACE_EVENT2("navigation", "WebViewImpl::SetPageLifecycleStateInternal",
|
||||||
"old_state", old_state, "new_state", new_state);
|
"old_state", old_state, "new_state", new_state);
|
||||||
|
|
||||||
|
@ -130,7 +130,7 @@ index f5fe2e061448673c788315a167efff1fb70c3ef0..ed0c77c14e8dcf3e6d7328c8a9c64038
|
||||||
bool storing_in_bfcache = new_state->is_in_back_forward_cache &&
|
bool storing_in_bfcache = new_state->is_in_back_forward_cache &&
|
||||||
!old_state->is_in_back_forward_cache;
|
!old_state->is_in_back_forward_cache;
|
||||||
bool restoring_from_bfcache = !new_state->is_in_back_forward_cache &&
|
bool restoring_from_bfcache = !new_state->is_in_back_forward_cache &&
|
||||||
@@ -3984,10 +3988,23 @@ PageScheduler* WebViewImpl::Scheduler() const {
|
@@ -3988,10 +3992,23 @@ PageScheduler* WebViewImpl::Scheduler() const {
|
||||||
return GetPage()->GetPageScheduler();
|
return GetPage()->GetPageScheduler();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -155,7 +155,7 @@ index f5fe2e061448673c788315a167efff1fb70c3ef0..ed0c77c14e8dcf3e6d7328c8a9c64038
|
||||||
// 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 d5397c53559ba239e46c9485fb30daea89bd392b..4989d9f6a28d519098b16e832c2a36c61ab04c15 100644
|
index e4784453b357e2a9c18ccf5acfde43f5afd583ae..2c5a9f08ac34ae4106f25c42dca04f78ae703618 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,
|
@@ -448,6 +448,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
|
||||||
|
@ -166,7 +166,7 @@ index d5397c53559ba239e46c9485fb30daea89bd392b..4989d9f6a28d519098b16e832c2a36c6
|
||||||
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;
|
||||||
@@ -933,6 +934,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
|
@@ -936,6 +937,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,7 +49,7 @@ index 2f33ec660a975522c473ecd50e633b5edaca707f..65221a51927d9f44bd6adbad88fa1144
|
||||||
// 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 5c8c50fc2025a160bfb0587cd46ba45f8d58a175..d918e9d165acefa8ba3a225aec261ebf028c40f7 100644
|
index 6a071e614bfd44fce79bf6db80d026f24eefdd7f..1daf1d65e2e6ac494790aa9201609c9ca9af6828 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
|
||||||
@@ -746,10 +746,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
|
@@ -746,10 +746,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
|
||||||
|
|
|
@ -33,7 +33,7 @@ index 9580623c57cb02f7e924742c6cb1638676881115..ad80d8e63dfebbbdb8eaa63bfe38a6f8
|
||||||
"//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 1a136cdeb8aea796a8b3f81e4f791c29ae02cf02..9033419bb880830076835e8400276e738b71f428 100644
|
index 3914cb63eed91e0e8a6eb8b64092c5dbe5348781..a6a24986f33fb79d3226840ffaa62448026f7383 100644
|
||||||
--- a/chrome/browser/BUILD.gn
|
--- a/chrome/browser/BUILD.gn
|
||||||
+++ b/chrome/browser/BUILD.gn
|
+++ b/chrome/browser/BUILD.gn
|
||||||
@@ -4525,7 +4525,7 @@ static_library("browser") {
|
@@ -4525,7 +4525,7 @@ static_library("browser") {
|
||||||
|
|
|
@ -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 d29dac893805535bbbd9aefe096a0ca2825a01aa..4f31803e492d0d05b29659f8bf75b6fee7aff25e 100644
|
index 95b2ad64c83361c452f9256cf96873f2cd82b446..53f96ccd4954972bc78ebccf4bf479ac8564a8d3 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
|
||||||
@@ -9170,6 +9170,7 @@ void RenderFrameHostImpl::CreateNewWindow(
|
@@ -9179,6 +9179,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 d29dac893805535bbbd9aefe096a0ca2825a01aa..4f31803e492d0d05b29659f8bf75b6fe
|
||||||
&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 c93722f2fc5340edeeace5a1690d0fa7d84dffb2..e7e47a9aa5a22aea2aa0eeab7bd661b47c9cbdae 100644
|
index ea5a63ce49a1eb99792be2eafc64c44ad6da0a60..a722f77502e8b896fb5d55df7cb44d45d13df04f 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
|
||||||
@@ -4887,6 +4887,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
@@ -4891,6 +4891,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
||||||
SetPartitionedPopinOpenerOnNewWindowIfNeeded(new_contents_impl, params,
|
SetPartitionedPopinOpenerOnNewWindowIfNeeded(new_contents_impl, params,
|
||||||
opener);
|
opener);
|
||||||
|
|
||||||
|
@ -37,7 +37,7 @@ index c93722f2fc5340edeeace5a1690d0fa7d84dffb2..e7e47a9aa5a22aea2aa0eeab7bd661b4
|
||||||
// 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
|
||||||
@@ -4928,12 +4934,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
@@ -4932,12 +4938,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
||||||
AddWebContentsDestructionObserver(new_contents_impl);
|
AddWebContentsDestructionObserver(new_contents_impl);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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 1b748a2e0d803217985847014855b095b53c58e5..0e742f196367bbbe8c4e147ef4db4f8dbbe4cbbe 100644
|
index 5469931a7c4dc7ad8b98f5ac54c5538a7ba23a78..9bd28a4029de17833d5147986736747075ff35bc 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
|
||||||
@@ -4813,9 +4813,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
@@ -4817,9 +4817,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
||||||
bool renderer_started_hidden =
|
bool renderer_started_hidden =
|
||||||
params.disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB;
|
params.disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB;
|
||||||
|
|
||||||
|
|
|
@ -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 de6b544df67c9702b6771b08b003805b4f5fb5a4..4de45e398ec013714302c8cbaafa3bb6aa01ef8e 100644
|
index 1f0b9a602a9e6cf565818ad584688b783fe3430b..1d1d761f8c7ff09cbd2c6a567e070ac41d3a1759 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
|
||||||
@@ -4782,8 +4782,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
@@ -4786,8 +4786,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
||||||
|
|
||||||
if (delegate_ && delegate_->IsWebContentsCreationOverridden(
|
if (delegate_ && delegate_->IsWebContentsCreationOverridden(
|
||||||
source_site_instance, params.window_container_type,
|
source_site_instance, params.window_container_type,
|
||||||
|
|
|
@ -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 ed0c77c14e8dcf3e6d7328c8a9c640388b7be92d..7bf2296e1a3b48cc3aa7f031d5b835fab8488267 100644
|
index 82aef58c0a3c00c818e0d60df9a5296162c57cc3..930e6160134897a91d4ed8f1517bc90d708cfd04 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
|
||||||
@@ -169,6 +169,7 @@
|
@@ -169,6 +169,7 @@
|
||||||
|
@ -23,7 +23,7 @@ index ed0c77c14e8dcf3e6d7328c8a9c640388b7be92d..7bf2296e1a3b48cc3aa7f031d5b835fa
|
||||||
#include "third_party/blink/renderer/platform/graphics/image.h"
|
#include "third_party/blink/renderer/platform/graphics/image.h"
|
||||||
#include "third_party/blink/renderer/platform/graphics/paint/cull_rect.h"
|
#include "third_party/blink/renderer/platform/graphics/paint/cull_rect.h"
|
||||||
#include "third_party/blink/renderer/platform/graphics/paint/paint_record_builder.h"
|
#include "third_party/blink/renderer/platform/graphics/paint/paint_record_builder.h"
|
||||||
@@ -1850,6 +1851,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
|
@@ -1854,6 +1855,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
|
||||||
#if BUILDFLAG(IS_MAC)
|
#if BUILDFLAG(IS_MAC)
|
||||||
web_view_impl->SetMaximumLegibleScale(
|
web_view_impl->SetMaximumLegibleScale(
|
||||||
prefs.default_maximum_page_scale_factor);
|
prefs.default_maximum_page_scale_factor);
|
||||||
|
|
|
@ -16,13 +16,13 @@ Linux or Windows to un-fullscreen in some circumstances without this
|
||||||
change.
|
change.
|
||||||
|
|
||||||
diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
|
diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
|
||||||
index 176f02f0abb4220564caa1d794faabc5b22bd8bc..4b08918cef83a84076e452b41302588efdfb0619 100644
|
index 47d494f0c3c02bc65ca18521cc1049e766e050cb..40262c3b77980be3208387d64a685beef2035619 100644
|
||||||
--- a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
|
--- a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
|
||||||
+++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
|
+++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
|
||||||
@@ -21,12 +21,16 @@
|
@@ -20,12 +20,16 @@
|
||||||
|
#include "chrome/browser/browser_process.h"
|
||||||
#include "chrome/browser/history/history_service_factory.h"
|
#include "chrome/browser/history/history_service_factory.h"
|
||||||
#include "chrome/browser/profiles/profile.h"
|
#include "chrome/browser/profiles/profile.h"
|
||||||
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
|
|
||||||
+#if 0
|
+#if 0
|
||||||
#include "chrome/browser/ui/blocked_content/popunder_preventer.h"
|
#include "chrome/browser/ui/blocked_content/popunder_preventer.h"
|
||||||
+#endif
|
+#endif
|
||||||
|
@ -36,7 +36,7 @@ index 176f02f0abb4220564caa1d794faabc5b22bd8bc..4b08918cef83a84076e452b41302588e
|
||||||
#include "chrome/common/chrome_switches.h"
|
#include "chrome/common/chrome_switches.h"
|
||||||
#include "components/history/core/browser/history_service.h"
|
#include "components/history/core/browser/history_service.h"
|
||||||
#include "components/history/core/browser/history_types.h"
|
#include "components/history/core/browser/history_types.h"
|
||||||
@@ -259,10 +263,12 @@ void FullscreenController::EnterFullscreenModeForTab(
|
@@ -260,10 +264,12 @@ void FullscreenController::EnterFullscreenModeForTab(
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -49,7 +49,7 @@ index 176f02f0abb4220564caa1d794faabc5b22bd8bc..4b08918cef83a84076e452b41302588e
|
||||||
|
|
||||||
// Keep the current state. |SetTabWithExclusiveAccess| may change the return
|
// Keep the current state. |SetTabWithExclusiveAccess| may change the return
|
||||||
// value of |IsWindowFullscreenForTabOrPending|.
|
// value of |IsWindowFullscreenForTabOrPending|.
|
||||||
@@ -374,12 +380,14 @@ void FullscreenController::ExitFullscreenModeForTab(WebContents* web_contents) {
|
@@ -375,12 +381,14 @@ void FullscreenController::ExitFullscreenModeForTab(WebContents* web_contents) {
|
||||||
void FullscreenController::FullscreenTabOpeningPopup(
|
void FullscreenController::FullscreenTabOpeningPopup(
|
||||||
content::WebContents* opener,
|
content::WebContents* opener,
|
||||||
content::WebContents* popup) {
|
content::WebContents* popup) {
|
||||||
|
@ -64,7 +64,7 @@ index 176f02f0abb4220564caa1d794faabc5b22bd8bc..4b08918cef83a84076e452b41302588e
|
||||||
}
|
}
|
||||||
|
|
||||||
void FullscreenController::OnTabDeactivated(
|
void FullscreenController::OnTabDeactivated(
|
||||||
@@ -465,10 +473,12 @@ void FullscreenController::FullscreenTransitionCompleted() {
|
@@ -466,10 +474,12 @@ void FullscreenController::FullscreenTransitionCompleted() {
|
||||||
#endif // DCHECK_IS_ON()
|
#endif // DCHECK_IS_ON()
|
||||||
tab_fullscreen_target_display_id_ = display::kInvalidDisplayId;
|
tab_fullscreen_target_display_id_ = display::kInvalidDisplayId;
|
||||||
started_fullscreen_transition_ = false;
|
started_fullscreen_transition_ = false;
|
||||||
|
@ -77,7 +77,7 @@ index 176f02f0abb4220564caa1d794faabc5b22bd8bc..4b08918cef83a84076e452b41302588e
|
||||||
}
|
}
|
||||||
|
|
||||||
void FullscreenController::RunOrDeferUntilTransitionIsComplete(
|
void FullscreenController::RunOrDeferUntilTransitionIsComplete(
|
||||||
@@ -576,18 +586,17 @@ void FullscreenController::EnterFullscreenModeInternal(
|
@@ -577,18 +587,17 @@ void FullscreenController::EnterFullscreenModeInternal(
|
||||||
// Do not enter fullscreen mode if disallowed by pref. This prevents the user
|
// Do not enter fullscreen mode if disallowed by pref. This prevents the user
|
||||||
// from manually entering fullscreen mode and also disables kiosk mode on
|
// from manually entering fullscreen mode and also disables kiosk mode on
|
||||||
// desktop platforms.
|
// desktop platforms.
|
||||||
|
@ -101,7 +101,7 @@ index 176f02f0abb4220564caa1d794faabc5b22bd8bc..4b08918cef83a84076e452b41302588e
|
||||||
if (option == TAB) {
|
if (option == TAB) {
|
||||||
url = GetRequestingOrigin();
|
url = GetRequestingOrigin();
|
||||||
tab_fullscreen_ = true;
|
tab_fullscreen_ = true;
|
||||||
@@ -620,6 +629,7 @@ void FullscreenController::EnterFullscreenModeInternal(
|
@@ -621,6 +630,7 @@ void FullscreenController::EnterFullscreenModeInternal(
|
||||||
if (!extension_caused_fullscreen_.is_empty())
|
if (!extension_caused_fullscreen_.is_empty())
|
||||||
url = extension_caused_fullscreen_;
|
url = extension_caused_fullscreen_;
|
||||||
}
|
}
|
||||||
|
@ -109,7 +109,7 @@ index 176f02f0abb4220564caa1d794faabc5b22bd8bc..4b08918cef83a84076e452b41302588e
|
||||||
|
|
||||||
fullscreen_start_time_ = base::TimeTicks::Now();
|
fullscreen_start_time_ = base::TimeTicks::Now();
|
||||||
if (option == BROWSER)
|
if (option == BROWSER)
|
||||||
@@ -640,6 +650,7 @@ void FullscreenController::ExitFullscreenModeInternal() {
|
@@ -641,6 +651,7 @@ void FullscreenController::ExitFullscreenModeInternal() {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -117,7 +117,7 @@ index 176f02f0abb4220564caa1d794faabc5b22bd8bc..4b08918cef83a84076e452b41302588e
|
||||||
// `fullscreen_start_time_` is null if a fullscreen tab moves to a new window.
|
// `fullscreen_start_time_` is null if a fullscreen tab moves to a new window.
|
||||||
if (fullscreen_start_time_ && exclusive_access_tab()) {
|
if (fullscreen_start_time_ && exclusive_access_tab()) {
|
||||||
ukm::SourceId source_id =
|
ukm::SourceId source_id =
|
||||||
@@ -651,15 +662,16 @@ void FullscreenController::ExitFullscreenModeInternal() {
|
@@ -652,15 +663,16 @@ void FullscreenController::ExitFullscreenModeInternal() {
|
||||||
.Record(ukm::UkmRecorder::Get());
|
.Record(ukm::UkmRecorder::Get());
|
||||||
fullscreen_start_time_.reset();
|
fullscreen_start_time_.reset();
|
||||||
}
|
}
|
||||||
|
@ -137,7 +137,7 @@ index 176f02f0abb4220564caa1d794faabc5b22bd8bc..4b08918cef83a84076e452b41302588e
|
||||||
exclusive_access_manager()->context()->ExitFullscreen();
|
exclusive_access_manager()->context()->ExitFullscreen();
|
||||||
extension_caused_fullscreen_ = GURL();
|
extension_caused_fullscreen_ = GURL();
|
||||||
exclusive_access_manager()->UpdateBubble(base::NullCallback());
|
exclusive_access_manager()->UpdateBubble(base::NullCallback());
|
||||||
@@ -721,8 +733,12 @@ GURL FullscreenController::GetEmbeddingOrigin() const {
|
@@ -722,8 +734,12 @@ GURL FullscreenController::GetEmbeddingOrigin() const {
|
||||||
void FullscreenController::RecordMetricsOnFullscreenApiRequested(
|
void FullscreenController::RecordMetricsOnFullscreenApiRequested(
|
||||||
content::RenderFrameHost* requesting_frame) {
|
content::RenderFrameHost* requesting_frame) {
|
||||||
history::HistoryService* service =
|
history::HistoryService* service =
|
||||||
|
|
|
@ -23,10 +23,10 @@ Upstream bug https://bugs.chromium.org/p/chromium/issues/detail?id=1081397.
|
||||||
Upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/3856266.
|
Upstreamed at https://chromium-review.googlesource.com/c/chromium/src/+/3856266.
|
||||||
|
|
||||||
diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
|
diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
|
||||||
index f8e18b15a19517b28057dd007adccc0fd222e2e1..6e1656f3bd62b597952528bfee884666111277fc 100644
|
index 4f76cfa33ea68a49e1c7cec096cd34a1587042a2..0ee902a2ff5f82b75f4b6cb2eb0f96209e260183 100644
|
||||||
--- a/content/browser/renderer_host/navigation_request.cc
|
--- a/content/browser/renderer_host/navigation_request.cc
|
||||||
+++ b/content/browser/renderer_host/navigation_request.cc
|
+++ b/content/browser/renderer_host/navigation_request.cc
|
||||||
@@ -10802,6 +10802,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryUncheckedWithDebugInfo() {
|
@@ -10806,6 +10806,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryUncheckedWithDebugInfo() {
|
||||||
"blob");
|
"blob");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -13,10 +13,10 @@ This patch can be removed should we choose to support chrome.fileSystem
|
||||||
or support it enough to fix the crash.
|
or support it enough to fix the crash.
|
||||||
|
|
||||||
diff --git a/chrome/browser/resources/pdf/pdf_viewer.ts b/chrome/browser/resources/pdf/pdf_viewer.ts
|
diff --git a/chrome/browser/resources/pdf/pdf_viewer.ts b/chrome/browser/resources/pdf/pdf_viewer.ts
|
||||||
index f7e98f2c94ac9802062880f9341214f88c85a669..86b0b3b7596e7da68c536c0dea3d95b22bdd9481 100644
|
index a861c34084b90561beab221ac13929bef295ac6d..94ea00dba8a6bb314421e6bd0ccef32e3ac02829 100644
|
||||||
--- a/chrome/browser/resources/pdf/pdf_viewer.ts
|
--- a/chrome/browser/resources/pdf/pdf_viewer.ts
|
||||||
+++ b/chrome/browser/resources/pdf/pdf_viewer.ts
|
+++ b/chrome/browser/resources/pdf/pdf_viewer.ts
|
||||||
@@ -1076,28 +1076,27 @@ export class PdfViewerElement extends PdfViewerBaseElement {
|
@@ -1086,28 +1086,27 @@ export class PdfViewerElement extends PdfViewerBaseElement {
|
||||||
dataArray = [result.dataToSave];
|
dataArray = [result.dataToSave];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -65,7 +65,7 @@ index f7e98f2c94ac9802062880f9341214f88c85a669..86b0b3b7596e7da68c536c0dea3d95b2
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -1288,36 +1287,33 @@ export class PdfViewerElement extends PdfViewerBaseElement {
|
@@ -1298,36 +1297,33 @@ export class PdfViewerElement extends PdfViewerBaseElement {
|
||||||
fileName = fileName + '.pdf';
|
fileName = fileName + '.pdf';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -128,7 +128,7 @@ index f7e98f2c94ac9802062880f9341214f88c85a669..86b0b3b7596e7da68c536c0dea3d95b2
|
||||||
|
|
||||||
// <if expr="enable_pdf_ink2">
|
// <if expr="enable_pdf_ink2">
|
||||||
// Ink2 doesn't need to exit annotation mode after save.
|
// Ink2 doesn't need to exit annotation mode after save.
|
||||||
@@ -1464,6 +1460,9 @@ declare global {
|
@@ -1474,6 +1470,9 @@ declare global {
|
||||||
interface HTMLElementTagNameMap {
|
interface HTMLElementTagNameMap {
|
||||||
'pdf-viewer': PdfViewerElement;
|
'pdf-viewer': PdfViewerElement;
|
||||||
}
|
}
|
||||||
|
|
|
@ -87,10 +87,10 @@ index 51522e60d6dc14f1113cc438558b6b393c3fe73a..153ed02f493a83ef9ca354cc18736f93
|
||||||
// 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 9b84cc06795a5bef730cd81908254cf9ad11c836..1b748a2e0d803217985847014855b095b53c58e5 100644
|
index f8872945d67dacbdb9c3d610ff3719039eca7c94..5469931a7c4dc7ad8b98f5ac54c5538a7ba23a78 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
|
||||||
@@ -9384,7 +9384,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame(
|
@@ -9393,7 +9393,7 @@ void WebContentsImpl::OnFocusedElementChangedInFrame(
|
||||||
"WebContentsImpl::OnFocusedElementChangedInFrame",
|
"WebContentsImpl::OnFocusedElementChangedInFrame",
|
||||||
"render_frame_host", frame);
|
"render_frame_host", frame);
|
||||||
RenderWidgetHostViewBase* root_view =
|
RenderWidgetHostViewBase* root_view =
|
||||||
|
|
|
@ -64,10 +64,10 @@ index cba373664bec3a32abad6fe0396bd67b53b7e67f..7a985067b1371604644d48159f2f5aa7
|
||||||
|
|
||||||
#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 d918e9d165acefa8ba3a225aec261ebf028c40f7..d6cbf553961137429c40fe768f28b104bda0f89b 100644
|
index 1daf1d65e2e6ac494790aa9201609c9ca9af6828..a4e649e4c63160e6152d3ff0d6a414ccd4f8b4cc 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
|
||||||
@@ -3130,6 +3130,7 @@ void LocalFrame::RequestExecuteScript(
|
@@ -3136,6 +3136,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,
|
||||||
|
@ -75,7 +75,7 @@ index d918e9d165acefa8ba3a225aec261ebf028c40f7..d6cbf553961137429c40fe768f28b104
|
||||||
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) {
|
||||||
@@ -3162,7 +3163,7 @@ void LocalFrame::RequestExecuteScript(
|
@@ -3168,7 +3169,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,
|
||||||
|
@ -85,7 +85,7 @@ index d918e9d165acefa8ba3a225aec261ebf028c40f7..d6cbf553961137429c40fe768f28b104
|
||||||
|
|
||||||
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 13d1bea90341efbf51c476d3eacae49c8b960537..f508e3e9df98c167740b0574ef554bd17f41447f 100644
|
index 7e65f92dbeb987836be447dee2c660cdde8295ed..b5484a84fea067938a9e3d15f49f4c12c3739c20 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
|
||||||
@@ -824,6 +824,7 @@ class CORE_EXPORT LocalFrame final
|
@@ -824,6 +824,7 @@ class CORE_EXPORT LocalFrame final
|
||||||
|
@ -204,7 +204,7 @@ index fa65331f40b90d812b71a489fd560e9359152d2b..390714d631dc88ef92d59ef9618a5706
|
||||||
const mojom::blink::UserActivationOption user_activation_option_;
|
const mojom::blink::UserActivationOption user_activation_option_;
|
||||||
const mojom::blink::LoadEventBlockingOption blocking_option_;
|
const mojom::blink::LoadEventBlockingOption blocking_option_;
|
||||||
diff --git a/third_party/blink/renderer/core/frame/web_frame_test.cc b/third_party/blink/renderer/core/frame/web_frame_test.cc
|
diff --git a/third_party/blink/renderer/core/frame/web_frame_test.cc b/third_party/blink/renderer/core/frame/web_frame_test.cc
|
||||||
index 3979c3987da3dd49218407c41977d9ce7d114edb..7e00f6bdd1d398f22d39823088caf5cde3a34dd9 100644
|
index 0802173ce891bcaca8b6bba2762ad2b80d4d5c75..6d31ccae7e6a9e204999d8475808afc11a0665c8 100644
|
||||||
--- a/third_party/blink/renderer/core/frame/web_frame_test.cc
|
--- a/third_party/blink/renderer/core/frame/web_frame_test.cc
|
||||||
+++ b/third_party/blink/renderer/core/frame/web_frame_test.cc
|
+++ b/third_party/blink/renderer/core/frame/web_frame_test.cc
|
||||||
@@ -291,6 +291,7 @@ void ExecuteScriptsInMainWorld(
|
@@ -291,6 +291,7 @@ void ExecuteScriptsInMainWorld(
|
||||||
|
|
|
@ -133,10 +133,10 @@ index 05d3a12dd84c7005d46cc73b312f97ef418d96f5..4765de982802541b3efc7211d106acc7
|
||||||
const GURL& document_url,
|
const GURL& document_url,
|
||||||
const WeakDocumentPtr& weak_document_ptr,
|
const WeakDocumentPtr& weak_document_ptr,
|
||||||
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
|
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
|
||||||
index 07907372f37d3ef5c9eaef7011ebcd4ed6a2fed6..ec5e553d93caf8a24de97465a870567d95944000 100644
|
index 09b7137cd3e26a1aef2c93ff7f08641df56704c0..732978b9650cac5102007c27b9226ff053c92d4f 100644
|
||||||
--- a/content/browser/renderer_host/render_process_host_impl.cc
|
--- a/content/browser/renderer_host/render_process_host_impl.cc
|
||||||
+++ b/content/browser/renderer_host/render_process_host_impl.cc
|
+++ b/content/browser/renderer_host/render_process_host_impl.cc
|
||||||
@@ -2105,7 +2105,7 @@ void RenderProcessHostImpl::CreateNotificationService(
|
@@ -2106,7 +2106,7 @@ void RenderProcessHostImpl::CreateNotificationService(
|
||||||
case RenderProcessHost::NotificationServiceCreatorType::kSharedWorker:
|
case RenderProcessHost::NotificationServiceCreatorType::kSharedWorker:
|
||||||
case RenderProcessHost::NotificationServiceCreatorType::kDedicatedWorker: {
|
case RenderProcessHost::NotificationServiceCreatorType::kDedicatedWorker: {
|
||||||
storage_partition_impl_->GetPlatformNotificationContext()->CreateService(
|
storage_partition_impl_->GetPlatformNotificationContext()->CreateService(
|
||||||
|
@ -145,7 +145,7 @@ index 07907372f37d3ef5c9eaef7011ebcd4ed6a2fed6..ec5e553d93caf8a24de97465a870567d
|
||||||
creator_type, std::move(receiver));
|
creator_type, std::move(receiver));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -2113,7 +2113,7 @@ void RenderProcessHostImpl::CreateNotificationService(
|
@@ -2114,7 +2114,7 @@ void RenderProcessHostImpl::CreateNotificationService(
|
||||||
CHECK(rfh);
|
CHECK(rfh);
|
||||||
|
|
||||||
storage_partition_impl_->GetPlatformNotificationContext()->CreateService(
|
storage_partition_impl_->GetPlatformNotificationContext()->CreateService(
|
||||||
|
|
|
@ -10,7 +10,7 @@ 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 174b6cb9531237528664bcaff06a6e8dc1677349..144490c1ad76dce306e7e4a25270456d60bbb7f5 100644
|
index 7b7e21c5b4b2e6657965c4433c6f9bc064a4ef9f..5abddf5b5cf2ab5e8e03066143b1824908257e87 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
|
||||||
@@ -784,8 +784,8 @@ void VerifyThatBrowserAndRendererCalculatedOriginsToCommitMatch(
|
@@ -784,8 +784,8 @@ void VerifyThatBrowserAndRendererCalculatedOriginsToCommitMatch(
|
||||||
|
|
|
@ -44,10 +44,10 @@ index 886d70636aedfa714b29625f58420ad11ede9ffd..7906b94983733a9deb2365fb2a134619
|
||||||
|
|
||||||
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 e7e47a9aa5a22aea2aa0eeab7bd661b47c9cbdae..de6b544df67c9702b6771b08b003805b4f5fb5a4 100644
|
index a722f77502e8b896fb5d55df7cb44d45d13df04f..1f0b9a602a9e6cf565818ad584688b783fe3430b 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
|
||||||
@@ -5612,6 +5612,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
|
@@ -5616,6 +5616,11 @@ TextInputManager* WebContentsImpl::GetTextInputManager() {
|
||||||
return text_input_manager_.get();
|
return text_input_manager_.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -60,10 +60,10 @@ index e7e47a9aa5a22aea2aa0eeab7bd661b47c9cbdae..de6b544df67c9702b6771b08b003805b
|
||||||
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 88282f2880d2443aca30ec1754bf5e43ed67acfc..60c94fd4508e166e0dd1be9c6eb97dd45e418853 100644
|
index 2a098761bc3b67af3ada46596613152c136583b0..1d0df8595a89642a0eb33cdf76fd9cafc1e4b4b0 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
|
||||||
@@ -1128,6 +1128,7 @@ class CONTENT_EXPORT WebContentsImpl
|
@@ -1130,6 +1130,7 @@ class CONTENT_EXPORT WebContentsImpl
|
||||||
void SendScreenRects() override;
|
void SendScreenRects() override;
|
||||||
void SendActiveState(bool active) override;
|
void SendActiveState(bool active) override;
|
||||||
TextInputManager* GetTextInputManager() override;
|
TextInputManager* GetTextInputManager() override;
|
||||||
|
@ -72,7 +72,7 @@ index 88282f2880d2443aca30ec1754bf5e43ed67acfc..60c94fd4508e166e0dd1be9c6eb97dd4
|
||||||
RenderWidgetHostImpl* render_widget_host) override;
|
RenderWidgetHostImpl* render_widget_host) override;
|
||||||
bool IsShowingContextMenuOnPage() const override;
|
bool IsShowingContextMenuOnPage() const override;
|
||||||
diff --git a/content/public/browser/web_contents_observer.h b/content/public/browser/web_contents_observer.h
|
diff --git a/content/public/browser/web_contents_observer.h b/content/public/browser/web_contents_observer.h
|
||||||
index 0379a5ca835e3e9d1b90543bbbe5971148d6c73e..03ed25d04ff0f54d412e1a3044b7770f75384a96 100644
|
index f3284b11c2a9d020e85af2fea2057926de4cdd0b..9d58a654ddbabeecef2d9f17e0229c72c0afe6fd 100644
|
||||||
--- a/content/public/browser/web_contents_observer.h
|
--- a/content/public/browser/web_contents_observer.h
|
||||||
+++ b/content/public/browser/web_contents_observer.h
|
+++ b/content/public/browser/web_contents_observer.h
|
||||||
@@ -37,6 +37,7 @@
|
@@ -37,6 +37,7 @@
|
||||||
|
|
|
@ -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 0e742f196367bbbe8c4e147ef4db4f8dbbe4cbbe..7026b28c4f228971f74a706b6ad99777e4ca0773 100644
|
index 9bd28a4029de17833d5147986736747075ff35bc..140e94cd6dfba03260ff9e2cf4b38459cdaaf9ba 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
|
||||||
@@ -9518,25 +9518,13 @@ void WebContentsImpl::RendererUnresponsive(
|
@@ -9527,25 +9527,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);
|
||||||
|
|
|
@ -22,10 +22,10 @@ However, the patch would need to be reviewed by the security team, as it
|
||||||
does touch a security-sensitive class.
|
does touch a security-sensitive class.
|
||||||
|
|
||||||
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
|
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
|
||||||
index ec5e553d93caf8a24de97465a870567d95944000..369b4c70bba9363ed8fac184fd843bf1aa49e59e 100644
|
index 732978b9650cac5102007c27b9226ff053c92d4f..851eff886b5827e362b260f6a954a9081417b067 100644
|
||||||
--- a/content/browser/renderer_host/render_process_host_impl.cc
|
--- a/content/browser/renderer_host/render_process_host_impl.cc
|
||||||
+++ b/content/browser/renderer_host/render_process_host_impl.cc
|
+++ b/content/browser/renderer_host/render_process_host_impl.cc
|
||||||
@@ -1753,6 +1753,10 @@ bool RenderProcessHostImpl::Init() {
|
@@ -1754,6 +1754,10 @@ bool RenderProcessHostImpl::Init() {
|
||||||
std::unique_ptr<SandboxedProcessLauncherDelegate> sandbox_delegate =
|
std::unique_ptr<SandboxedProcessLauncherDelegate> sandbox_delegate =
|
||||||
std::make_unique<RendererSandboxedProcessLauncherDelegateWin>(
|
std::make_unique<RendererSandboxedProcessLauncherDelegateWin>(
|
||||||
*cmd_line, IsPdf(), IsJitDisabled());
|
*cmd_line, IsPdf(), IsJitDisabled());
|
||||||
|
|
|
@ -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 4de45e398ec013714302c8cbaafa3bb6aa01ef8e..6d0b5e9a3350108f183e958871928623283cbe23 100644
|
index 1d1d761f8c7ff09cbd2c6a567e070ac41d3a1759..50dd1fe97063a3d763461fe3ff7af340e7c4ad05 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
|
||||||
@@ -3754,6 +3754,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
@@ -3758,6 +3758,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 4de45e398ec013714302c8cbaafa3bb6aa01ef8e..6d0b5e9a3350108f183e958871928623
|
||||||
std::unique_ptr<WebContentsViewDelegate> delegate =
|
std::unique_ptr<WebContentsViewDelegate> delegate =
|
||||||
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
|
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
|
||||||
|
|
||||||
@@ -3764,6 +3771,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
@@ -3768,6 +3775,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_);
|
||||||
}
|
}
|
||||||
|
@ -35,7 +35,7 @@ index 4de45e398ec013714302c8cbaafa3bb6aa01ef8e..6d0b5e9a3350108f183e958871928623
|
||||||
CHECK(view_.get());
|
CHECK(view_.get());
|
||||||
|
|
||||||
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
|
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
|
||||||
index 825e0d9d641bfa8fc5907a6d479d94206d432fb6..0f2ce0476e9b067ea2f678e5683040e29f10fe81 100644
|
index 191a98adec4cc5eb1378be40456a11ff5c093a2e..7a3eb2028af908907bd5e72df90534c90884b34e 100644
|
||||||
--- a/content/public/browser/web_contents.h
|
--- a/content/public/browser/web_contents.h
|
||||||
+++ b/content/public/browser/web_contents.h
|
+++ b/content/public/browser/web_contents.h
|
||||||
@@ -111,10 +111,13 @@ class BrowserPluginGuestDelegate;
|
@@ -111,10 +111,13 @@ class BrowserPluginGuestDelegate;
|
||||||
|
|
|
@ -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 4f31803e492d0d05b29659f8bf75b6fee7aff25e..174b6cb9531237528664bcaff06a6e8dc1677349 100644
|
index 53f96ccd4954972bc78ebccf4bf479ac8564a8d3..7b7e21c5b4b2e6657965c4433c6f9bc064a4ef9f 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
|
||||||
@@ -8277,6 +8277,17 @@ void RenderFrameHostImpl::EnterFullscreen(
|
@@ -8286,6 +8286,17 @@ void RenderFrameHostImpl::EnterFullscreen(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -37,10 +37,10 @@ index 4f31803e492d0d05b29659f8bf75b6fee7aff25e..174b6cb9531237528664bcaff06a6e8d
|
||||||
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 6d0b5e9a3350108f183e958871928623283cbe23..9b84cc06795a5bef730cd81908254cf9ad11c836 100644
|
index 50dd1fe97063a3d763461fe3ff7af340e7c4ad05..f8872945d67dacbdb9c3d610ff3719039eca7c94 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
|
||||||
@@ -4011,21 +4011,25 @@ KeyboardEventProcessingResult WebContentsImpl::PreHandleKeyboardEvent(
|
@@ -4015,21 +4015,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 6d0b5e9a3350108f183e958871928623283cbe23..9b84cc06795a5bef730cd81908254cf9
|
||||||
}
|
}
|
||||||
|
|
||||||
bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) {
|
bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) {
|
||||||
@@ -4184,7 +4188,7 @@ void WebContentsImpl::EnterFullscreenMode(
|
@@ -4188,7 +4192,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…
Reference in a new issue