diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index ace548dad..ca677afab 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,5 +7,5 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': 'refs/tags/69.0.3476.0', + 'chromium_checkout': 'refs/tags/69.0.3483.0', } diff --git a/libcef/browser/net/url_request_context_getter_impl.cc b/libcef/browser/net/url_request_context_getter_impl.cc index 22f941cae..e4762bf79 100644 --- a/libcef/browser/net/url_request_context_getter_impl.cc +++ b/libcef/browser/net/url_request_context_getter_impl.cc @@ -350,7 +350,7 @@ net::URLRequestContext* CefURLRequestContextGetterImpl::GetURLRequestContext() { std::move(system_proxy_service)); io_state_->storage_->set_ssl_config_service( - new net::SSLConfigServiceDefaults); + std::make_unique()); std::vector supported_schemes; supported_schemes.push_back("basic"); diff --git a/libcef/browser/osr/render_widget_host_view_osr_mac.mm b/libcef/browser/osr/render_widget_host_view_osr_mac.mm index a23a44744..a3c614d52 100644 --- a/libcef/browser/osr/render_widget_host_view_osr_mac.mm +++ b/libcef/browser/osr/render_widget_host_view_osr_mac.mm @@ -53,16 +53,6 @@ class MacHelper : public content::BrowserCompositorMacClient, view_->render_widget_host()->DidProcessFrame(frame_token); } - // AcceleratedWidgetMacNSView methods: - - NSView* AcceleratedWidgetGetNSView() const override { - // Intentionally return nil so that BrowserCompositorMac::GetViewProperties - // uses the layer size instead of the NSView size. - return nil; - } - - void AcceleratedWidgetCALayerParamsUpdated() override {} - void DidReceiveFirstFrameAfterNavigation() override { view_->render_widget_host()->DidReceiveFirstFrameAfterNavigation(); } @@ -73,6 +63,10 @@ class MacHelper : public content::BrowserCompositorMacClient, return view_->render_widget_host()->SynchronizeVisualProperties(); } + // AcceleratedWidgetMacNSView methods: + + void AcceleratedWidgetCALayerParamsUpdated() override {} + private: // Guaranteed to outlive this object. CefRenderWidgetHostViewOSR* view_; diff --git a/libcef/browser/osr/web_contents_view_osr.cc b/libcef/browser/osr/web_contents_view_osr.cc index 804ea3736..bcf2dab0f 100644 --- a/libcef/browser/osr/web_contents_view_osr.cc +++ b/libcef/browser/osr/web_contents_view_osr.cc @@ -135,8 +135,12 @@ void CefWebContentsViewOSR::RenderViewCreated(content::RenderViewHost* host) { view->InstallTransparency(); } -void CefWebContentsViewOSR::RenderViewSwappedIn(content::RenderViewHost* host) { -} +void CefWebContentsViewOSR::RenderViewReady() {} + +void CefWebContentsViewOSR::RenderFrameSwappedIn( + content::RenderFrameHost* old_host, + content::RenderFrameHost* new_host, + bool is_main_frame) {} void CefWebContentsViewOSR::SetOverscrollControllerEnabled(bool enabled) {} diff --git a/libcef/browser/osr/web_contents_view_osr.h b/libcef/browser/osr/web_contents_view_osr.h index d06f3e909..27403fd36 100644 --- a/libcef/browser/osr/web_contents_view_osr.h +++ b/libcef/browser/osr/web_contents_view_osr.h @@ -51,7 +51,10 @@ class CefWebContentsViewOSR : public content::WebContentsView, content::RenderWidgetHost* render_widget_host) override; void SetPageTitle(const base::string16& title) override; void RenderViewCreated(content::RenderViewHost* host) override; - void RenderViewSwappedIn(content::RenderViewHost* host) override; + void RenderViewReady() override; + void RenderFrameSwappedIn(content::RenderFrameHost* old_host, + content::RenderFrameHost* new_host, + bool is_main_frame) override; void SetOverscrollControllerEnabled(bool enabled) override; #if defined(OS_MACOSX) diff --git a/libcef/common/request_impl.cc b/libcef/common/request_impl.cc index c13f29eb2..3b276251e 100644 --- a/libcef/common/request_impl.cc +++ b/libcef/common/request_impl.cc @@ -36,6 +36,7 @@ #include "net/url_request/url_request.h" #include "services/network/public/cpp/network_switches.h" #include "third_party/blink/public/platform/modules/fetch/fetch_api_request.mojom-shared.h" +#include "third_party/blink/public/platform/web_security_origin.h" #include "third_party/blink/public/platform/web_string.h" #include "third_party/blink/public/platform/web_url.h" #include "third_party/blink/public/platform/web_url_error.h" diff --git a/libcef/renderer/render_urlrequest_impl.cc b/libcef/renderer/render_urlrequest_impl.cc index afe85d122..9562e2243 100644 --- a/libcef/renderer/render_urlrequest_impl.cc +++ b/libcef/renderer/render_urlrequest_impl.cc @@ -14,6 +14,7 @@ #include "base/logging.h" #include "base/message_loop/message_loop.h" +#include "third_party/blink/public/platform/web_security_origin.h" #include "third_party/blink/public/platform/web_string.h" #include "third_party/blink/public/platform/web_url.h" #include "third_party/blink/public/platform/web_url_error.h" diff --git a/patch/patch.cfg b/patch/patch.cfg index 8b4c249d8..814d20e1f 100644 --- a/patch/patch.cfg +++ b/patch/patch.cfg @@ -378,9 +378,4 @@ patches = [ # https://bitbucket.org/chromiumembedded/cef/issues/2466 'name': 'linux_poll_2466', }, - { - # Fix crash attempting to store session storage to disk in incognito mode. - # https://bugs.chromium.org/p/chromium/issues/detail?id=859010 - 'name': 'dom_storage_859010', - }, ] diff --git a/patch/patches/browser_compositor_mac.patch b/patch/patches/browser_compositor_mac.patch index d442cb526..59454b3c7 100644 --- a/patch/patches/browser_compositor_mac.patch +++ b/patch/patches/browser_compositor_mac.patch @@ -1,5 +1,5 @@ diff --git content/browser/renderer_host/browser_compositor_view_mac.h content/browser/renderer_host/browser_compositor_view_mac.h -index 921df418789e..7ef9285744a2 100644 +index 4be07e30cf30..103bf0917a40 100644 --- content/browser/renderer_host/browser_compositor_view_mac.h +++ content/browser/renderer_host/browser_compositor_view_mac.h @@ -58,6 +58,8 @@ class CONTENT_EXPORT BrowserCompositorMac : public DelegatedFrameHostClient, @@ -12,7 +12,7 @@ index 921df418789e..7ef9285744a2 100644 // Ensure that the currect compositor frame be cleared (even if it is // potentially visible). diff --git content/browser/renderer_host/browser_compositor_view_mac.mm content/browser/renderer_host/browser_compositor_view_mac.mm -index fce1e648b031..2b63551ed96e 100644 +index a641f135dc10..64d38c7c1be7 100644 --- content/browser/renderer_host/browser_compositor_view_mac.mm +++ content/browser/renderer_host/browser_compositor_view_mac.mm @@ -245,6 +245,12 @@ DelegatedFrameHost* BrowserCompositorMac::GetDelegatedFrameHost() { diff --git a/patch/patches/browser_plugin_guest_1565.patch b/patch/patches/browser_plugin_guest_1565.patch index 76b5849dd..a93aa128c 100644 --- a/patch/patches/browser_plugin_guest_1565.patch +++ b/patch/patches/browser_plugin_guest_1565.patch @@ -50,10 +50,10 @@ index ad9de41d1e3e..a87ec19a5f54 100644 render_view_host_->GetMainFrame()->AllowBindings( BINDINGS_POLICY_DOM_AUTOMATION); diff --git content/browser/web_contents/web_contents_view.h content/browser/web_contents/web_contents_view.h -index cf8c74f4c744..b8cefb4b154b 100644 +index 50047c045553..5e9424f62623 100644 --- content/browser/web_contents/web_contents_view.h +++ content/browser/web_contents/web_contents_view.h -@@ -24,7 +24,7 @@ struct ScreenInfo; +@@ -25,7 +25,7 @@ struct ScreenInfo; // The WebContentsView is an interface that is implemented by the platform- // dependent web contents views. The WebContents uses this interface to talk to // them. @@ -62,7 +62,7 @@ index cf8c74f4c744..b8cefb4b154b 100644 public: virtual ~WebContentsView() {} -@@ -88,13 +88,9 @@ class WebContentsView { +@@ -89,13 +89,9 @@ class WebContentsView { // Sets up the View that holds the rendered web page, receives messages for // it and contains page plugins. The host view should be sized to the current // size of the WebContents. @@ -79,7 +79,7 @@ index cf8c74f4c744..b8cefb4b154b 100644 // Creates a new View that holds a popup and receives messages for it. virtual RenderWidgetHostViewBase* CreateViewForPopupWidget( diff --git content/browser/web_contents/web_contents_view_aura.cc content/browser/web_contents/web_contents_view_aura.cc -index 617bfe3a5d24..b8c801e26b5e 100644 +index 4a373e27bea4..684457680888 100644 --- content/browser/web_contents/web_contents_view_aura.cc +++ content/browser/web_contents/web_contents_view_aura.cc @@ -781,7 +781,8 @@ void WebContentsViewAura::CreateView(const gfx::Size& initial_size, @@ -101,7 +101,7 @@ index 617bfe3a5d24..b8c801e26b5e 100644 g_create_render_widget_host_view ? g_create_render_widget_host_view(render_widget_host, diff --git content/browser/web_contents/web_contents_view_aura.h content/browser/web_contents/web_contents_view_aura.h -index 82807c7f77fd..60bd9ceaf9ee 100644 +index 96f23b81caf2..5fb786187b0c 100644 --- content/browser/web_contents/web_contents_view_aura.h +++ content/browser/web_contents/web_contents_view_aura.h @@ -114,7 +114,7 @@ class CONTENT_EXPORT WebContentsViewAura @@ -114,7 +114,7 @@ index 82807c7f77fd..60bd9ceaf9ee 100644 RenderWidgetHost* render_widget_host) override; void SetPageTitle(const base::string16& title) override; diff --git content/browser/web_contents/web_contents_view_child_frame.cc content/browser/web_contents/web_contents_view_child_frame.cc -index e95c31d677f5..2e14ca1fabcf 100644 +index 345059d92363..39c376940df7 100644 --- content/browser/web_contents/web_contents_view_child_frame.cc +++ content/browser/web_contents/web_contents_view_child_frame.cc @@ -84,7 +84,7 @@ void WebContentsViewChildFrame::CreateView(const gfx::Size& initial_size, @@ -127,7 +127,7 @@ index e95c31d677f5..2e14ca1fabcf 100644 } diff --git content/browser/web_contents/web_contents_view_child_frame.h content/browser/web_contents/web_contents_view_child_frame.h -index 17275be93025..6c73effc578b 100644 +index b5b3a22747ba..7a4e998d3e16 100644 --- content/browser/web_contents/web_contents_view_child_frame.h +++ content/browser/web_contents/web_contents_view_child_frame.h @@ -40,7 +40,7 @@ class WebContentsViewChildFrame : public WebContentsView, @@ -140,7 +140,7 @@ index 17275be93025..6c73effc578b 100644 RenderWidgetHost* render_widget_host) override; void SetPageTitle(const base::string16& title) override; diff --git content/browser/web_contents/web_contents_view_guest.cc content/browser/web_contents/web_contents_view_guest.cc -index f6a43ca61131..21b61264d99f 100644 +index 2b272b7ff3de..cecd81826f7d 100644 --- content/browser/web_contents/web_contents_view_guest.cc +++ content/browser/web_contents/web_contents_view_guest.cc @@ -67,6 +67,8 @@ gfx::NativeWindow WebContentsViewGuest::GetTopLevelNativeWindow() const { @@ -195,7 +195,7 @@ index f6a43ca61131..21b61264d99f 100644 RenderWidgetHostViewBase* WebContentsViewGuest::CreateViewForPopupWidget( diff --git content/browser/web_contents/web_contents_view_guest.h content/browser/web_contents/web_contents_view_guest.h -index 4a06fe5f6880..ecad941c2638 100644 +index 6f65cc816325..33a396e09671 100644 --- content/browser/web_contents/web_contents_view_guest.h +++ content/browser/web_contents/web_contents_view_guest.h @@ -58,7 +58,7 @@ class WebContentsViewGuest : public WebContentsView, @@ -208,7 +208,7 @@ index 4a06fe5f6880..ecad941c2638 100644 RenderWidgetHost* render_widget_host) override; void SetPageTitle(const base::string16& title) override; diff --git content/browser/web_contents/web_contents_view_mac.h content/browser/web_contents/web_contents_view_mac.h -index 4640550b8484..efa2496b6317 100644 +index 15f03bafc0aa..c9418cbfa707 100644 --- content/browser/web_contents/web_contents_view_mac.h +++ content/browser/web_contents/web_contents_view_mac.h @@ -93,7 +93,7 @@ class WebContentsViewMac : public WebContentsView, @@ -221,7 +221,7 @@ index 4640550b8484..efa2496b6317 100644 RenderWidgetHost* render_widget_host) override; void SetPageTitle(const base::string16& title) override; diff --git content/browser/web_contents/web_contents_view_mac.mm content/browser/web_contents/web_contents_view_mac.mm -index 00b2d2a729da..cb8a81ed8ee2 100644 +index 4da80f38595f..dfcf88e06b74 100644 --- content/browser/web_contents/web_contents_view_mac.mm +++ content/browser/web_contents/web_contents_view_mac.mm @@ -348,7 +348,8 @@ void WebContentsViewMac::CreateView( diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index f01df63b2..5029f8f79 100644 --- a/patch/patches/chrome_browser.patch +++ b/patch/patches/chrome_browser.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn -index 86fd23195194..3b694a7f3f39 100644 +index 6de801443eac..f0d38f681077 100644 --- chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn @@ -8,6 +8,7 @@ import("//build/config/features.gni") @@ -10,7 +10,7 @@ index 86fd23195194..3b694a7f3f39 100644 import("//chrome/common/features.gni") import("//components/feature_engagement/features.gni") import("//components/feed/features.gni") -@@ -1640,6 +1641,7 @@ jumbo_split_static_library("browser") { +@@ -1644,6 +1645,7 @@ jumbo_split_static_library("browser") { "//base:i18n", "//base/allocator:buildflags", "//cc", @@ -18,7 +18,7 @@ index 86fd23195194..3b694a7f3f39 100644 "//chrome:extra_resources", "//chrome:resources", "//chrome:strings", -@@ -1912,6 +1914,10 @@ jumbo_split_static_library("browser") { +@@ -1916,6 +1918,10 @@ jumbo_split_static_library("browser") { ] } diff --git a/patch/patches/chrome_browser_profiles.patch b/patch/patches/chrome_browser_profiles.patch index 3d6e76419..21721c329 100644 --- a/patch/patches/chrome_browser_profiles.patch +++ b/patch/patches/chrome_browser_profiles.patch @@ -70,7 +70,7 @@ index e8e76ce5b954..1dd338dd0142 100644 content::BrowserContext* GetBrowserContextRedirectedInIncognito( content::BrowserContext* context); diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc -index 75ebdaadd4b1..e5ee10d7c0cf 100644 +index e1bf8abb1644..1876b68e3cd1 100644 --- chrome/browser/profiles/profile_manager.cc +++ chrome/browser/profiles/profile_manager.cc @@ -383,7 +383,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir) diff --git a/patch/patches/component_build_1617.patch b/patch/patches/component_build_1617.patch index f325ee324..6a2c568b5 100644 --- a/patch/patches/component_build_1617.patch +++ b/patch/patches/component_build_1617.patch @@ -1,5 +1,5 @@ diff --git content/app/content_service_manager_main_delegate.h content/app/content_service_manager_main_delegate.h -index a6ab54a14bc9..93a38abe55d2 100644 +index 283e1daf6c33..548aa8e71b99 100644 --- content/app/content_service_manager_main_delegate.h +++ content/app/content_service_manager_main_delegate.h @@ -18,7 +18,8 @@ namespace content { diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index 9903b0ce8..ff33d6d12 100644 --- a/patch/patches/content_2015.patch +++ b/patch/patches/content_2015.patch @@ -38,7 +38,7 @@ index 133145db74bf..021ab307ee2a 100644 content::WebPluginInfo* plugin) override; diff --git chrome/browser/plugins/pdf_iframe_navigation_throttle.cc chrome/browser/plugins/pdf_iframe_navigation_throttle.cc -index 41a8b316e884..62077f2e8a4e 100644 +index 0a458b1e04e4..bb7f0b235e2f 100644 --- chrome/browser/plugins/pdf_iframe_navigation_throttle.cc +++ chrome/browser/plugins/pdf_iframe_navigation_throttle.cc @@ -54,7 +54,7 @@ PDFIFrameNavigationThrottle::MaybeCreateThrottleFor( @@ -64,7 +64,7 @@ index 569e6112d86b..41599944688a 100644 } diff --git chrome/browser/ui/views/frame/browser_root_view.cc chrome/browser/ui/views/frame/browser_root_view.cc -index d544c9ec13a3..b15c5b13d902 100644 +index 2a4d9d9b8819..c0e3a92c39eb 100644 --- chrome/browser/ui/views/frame/browser_root_view.cc +++ chrome/browser/ui/views/frame/browser_root_view.cc @@ -66,7 +66,7 @@ void OnFindURLMimeType(const GURL& url, @@ -94,10 +94,10 @@ index 201f23b9b422..4664c6b32c22 100644 "WillFailRequest state should come before WillProcessResponse"); return render_frame_host_; diff --git content/browser/frame_host/render_frame_host_impl.cc content/browser/frame_host/render_frame_host_impl.cc -index 9085029dce74..5db015da0c6c 100644 +index 41f2205a0158..e4568812a8e7 100644 --- content/browser/frame_host/render_frame_host_impl.cc +++ content/browser/frame_host/render_frame_host_impl.cc -@@ -1612,6 +1612,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError( +@@ -1614,6 +1614,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError( if (GetNavigationHandle()) { GetNavigationHandle()->set_net_error_code( static_cast(params.error_code)); @@ -105,7 +105,7 @@ index 9085029dce74..5db015da0c6c 100644 } frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params); -@@ -4381,8 +4382,8 @@ void RenderFrameHostImpl::CreateNetworkServiceDefaultFactoryAndObserve( +@@ -4402,8 +4403,8 @@ void RenderFrameHostImpl::CreateNetworkServiceDefaultFactoryAndObserve( RenderFrameDevToolsAgentHost::WillCreateURLLoaderFactory( this, false /* is_navigation */, false /* is_download */, &default_factory_request); @@ -116,7 +116,7 @@ index 9085029dce74..5db015da0c6c 100644 if (g_create_network_factory_callback_for_test.Get().is_null()) { storage_partition->GetNetworkContext()->CreateURLLoaderFactory( std::move(default_factory_request), std::move(params)); -@@ -4669,8 +4670,8 @@ void RenderFrameHostImpl::ConnectToPrefetchURLLoaderService( +@@ -4690,8 +4691,8 @@ void RenderFrameHostImpl::ConnectToPrefetchURLLoaderService( DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DCHECK(base::FeatureList::IsEnabled(network::features::kNetworkService)); auto* storage_partition = @@ -284,10 +284,10 @@ index 3009401dac6b..b4c5a9e2db50 100644 }; diff --git content/common/frame_messages.h content/common/frame_messages.h -index 0162c2dda0f8..a5e412d2ae9c 100644 +index 8284a4240b39..c883fa72292a 100644 --- content/common/frame_messages.h +++ content/common/frame_messages.h -@@ -1369,9 +1369,10 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback, +@@ -1382,9 +1382,10 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback, // type. If there is no matching plugin, |found| is false. // |actual_mime_type| is the actual mime type supported by the // found plugin. @@ -349,10 +349,10 @@ index a2dc7a811e75..416918123564 100644 // started. virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {} diff --git content/public/renderer/render_frame_observer.h content/public/renderer/render_frame_observer.h -index d52332ffb915..465ae32696e4 100644 +index 2f1f46075b27..94f300dfea5d 100644 --- content/public/renderer/render_frame_observer.h +++ content/public/renderer/render_frame_observer.h -@@ -146,6 +146,9 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener, +@@ -148,6 +148,9 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener, virtual void DidReceiveTransferSizeUpdate(int resource_id, int received_data_length) {} @@ -363,10 +363,10 @@ index d52332ffb915..465ae32696e4 100644 virtual void FocusedNodeChanged(const blink::WebNode& node) {} diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc -index 309f4739a93e..757c2daa169c 100644 +index 2deec131e505..a77b188ed948 100644 --- content/renderer/render_frame_impl.cc +++ content/renderer/render_frame_impl.cc -@@ -3369,7 +3369,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin( +@@ -3449,7 +3449,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin( std::string mime_type; bool found = false; Send(new FrameHostMsg_GetPluginInfo( @@ -376,7 +376,7 @@ index 309f4739a93e..757c2daa169c 100644 params.mime_type.Utf8(), &found, &info, &mime_type)); if (!found) return nullptr; -@@ -3734,6 +3735,8 @@ void RenderFrameImpl::FrameDetached(DetachType type) { +@@ -3814,6 +3815,8 @@ void RenderFrameImpl::FrameDetached(DetachType type) { void RenderFrameImpl::FrameFocused() { Send(new FrameHostMsg_FrameFocused(routing_id_)); @@ -386,10 +386,10 @@ index 309f4739a93e..757c2daa169c 100644 void RenderFrameImpl::WillCommitProvisionalLoad() { diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc -index 578c20c0775b..5ccee1e18384 100644 +index fc840f2bfbf8..53a7cd6962a8 100644 --- content/renderer/render_thread_impl.cc +++ content/renderer/render_thread_impl.cc -@@ -865,6 +865,8 @@ void RenderThreadImpl::Init( +@@ -866,6 +866,8 @@ void RenderThreadImpl::Init( StartServiceManagerConnection(); @@ -399,10 +399,10 @@ index 578c20c0775b..5ccee1e18384 100644 base::Bind(&RenderThreadImpl::OnRendererInterfaceRequest, base::Unretained(this))); diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc -index e3c8199020c6..662c9b7d02e8 100644 +index f06027e68086..4b720db48c3a 100644 --- content/renderer/renderer_blink_platform_impl.cc +++ content/renderer/renderer_blink_platform_impl.cc -@@ -1121,6 +1121,14 @@ void RendererBlinkPlatformImpl::RequestPurgeMemory() { +@@ -1108,6 +1108,14 @@ void RendererBlinkPlatformImpl::RequestPurgeMemory() { base::MemoryCoordinatorClientRegistry::GetInstance()->PurgeMemory(); } @@ -418,10 +418,10 @@ index e3c8199020c6..662c9b7d02e8 100644 if (!web_database_host_) { web_database_host_ = blink::mojom::ThreadSafeWebDatabaseHostPtr::Create( diff --git content/renderer/renderer_blink_platform_impl.h content/renderer/renderer_blink_platform_impl.h -index 7d3a3edeb724..2b3d8cc01a63 100644 +index 464f3bb996e8..d1e15becf2a8 100644 --- content/renderer/renderer_blink_platform_impl.h +++ content/renderer/renderer_blink_platform_impl.h -@@ -233,6 +233,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { +@@ -230,6 +230,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { mojo::ScopedDataPipeConsumerHandle handle) override; void RequestPurgeMemory() override; diff --git a/patch/patches/content_runprocess_2456.patch b/patch/patches/content_runprocess_2456.patch index dd374ce6e..8c1abf774 100644 --- a/patch/patches/content_runprocess_2456.patch +++ b/patch/patches/content_runprocess_2456.patch @@ -1,8 +1,8 @@ diff --git content/app/content_main_runner_impl.cc content/app/content_main_runner_impl.cc -index 4787f1495826..d81aaf51b6b0 100644 +index 1fec0c7876ca..0c8722204b0f 100644 --- content/app/content_main_runner_impl.cc +++ content/app/content_main_runner_impl.cc -@@ -592,7 +592,8 @@ int RunBrowserProcessMain( +@@ -589,7 +589,8 @@ int RunBrowserProcessMain( const MainFunctionParams& main_function_params, ContentMainDelegate* delegate, std::unique_ptr service_manager_thread) { diff --git a/patch/patches/crashpad_1995.patch b/patch/patches/crashpad_1995.patch index 201a6fa40..93b29d339 100644 --- a/patch/patches/crashpad_1995.patch +++ b/patch/patches/crashpad_1995.patch @@ -597,7 +597,7 @@ index 8b0edef1b594..22555bb9dc77 100644 if (crash_reporter_client->ShouldMonitorCrashHandlerExpensively()) { diff --git content/browser/frame_host/debug_urls.cc content/browser/frame_host/debug_urls.cc -index f66e16a2ebc2..23118ffbeb4b 100644 +index f66e16a2ebc2..fd2269768877 100644 --- content/browser/frame_host/debug_urls.cc +++ content/browser/frame_host/debug_urls.cc @@ -129,7 +129,9 @@ bool HandleDebugURL(const GURL& url, ui::PageTransition transition) { @@ -606,7 +606,7 @@ index f66e16a2ebc2..23118ffbeb4b 100644 - if (!(transition & ui::PAGE_TRANSITION_FROM_ADDRESS_BAR) && + // CEF does not use PAGE_TRANSITION_FROM_ADDRESS_BAR. -+ if (!(transition & (ui::PAGE_TRANSITION_TYPED || ++ if (!(transition & (ui::PAGE_TRANSITION_TYPED | + ui::PAGE_TRANSITION_FROM_ADDRESS_BAR)) && !is_telemetry_navigation) return false; diff --git a/patch/patches/dom_storage_859010.patch b/patch/patches/dom_storage_859010.patch deleted file mode 100644 index 750e43357..000000000 --- a/patch/patches/dom_storage_859010.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git content/browser/dom_storage/dom_storage_context_wrapper.cc content/browser/dom_storage/dom_storage_context_wrapper.cc -index 242deb55fb27..d7fe71e5e0a6 100644 ---- content/browser/dom_storage/dom_storage_context_wrapper.cc -+++ content/browser/dom_storage/dom_storage_context_wrapper.cc -@@ -153,7 +153,9 @@ DOMStorageContextWrapper::DOMStorageContextWrapper( - - if (base::FeatureList::IsEnabled(features::kMojoSessionStorage)) { - mojo_session_state_ = new SessionStorageContextMojo( -- mojo_task_runner_, connector, local_partition_path, -+ mojo_task_runner_, connector, -+ profile_path.empty() ? base::nullopt -+ : base::make_optional(local_partition_path), - std::string(kSessionStorageDirectory)); - } - diff --git a/patch/patches/extensions_1947.patch b/patch/patches/extensions_1947.patch index 3dcf55c66..5da18b991 100644 --- a/patch/patches/extensions_1947.patch +++ b/patch/patches/extensions_1947.patch @@ -27,7 +27,7 @@ index 53c7404ef1f9..ac33df7cfe0e 100644 auto* browser_context = web_contents->GetBrowserContext(); StreamsPrivateAPI* streams_private = GetStreamsPrivateAPI(browser_context); diff --git content/browser/frame_host/render_frame_host_manager.cc content/browser/frame_host/render_frame_host_manager.cc -index 79f407b8cb20..fe4c65b5d0a5 100644 +index c90c938f566a..a65453d62c47 100644 --- content/browser/frame_host/render_frame_host_manager.cc +++ content/browser/frame_host/render_frame_host_manager.cc @@ -927,10 +927,11 @@ bool RenderFrameHostManager::ShouldSwapBrowsingInstancesForNavigation( diff --git a/patch/patches/gn_config.patch b/patch/patches/gn_config.patch index 8299a4cb5..d99789ce9 100644 --- a/patch/patches/gn_config.patch +++ b/patch/patches/gn_config.patch @@ -12,7 +12,7 @@ index 87fb8815433e..f19fba48f06c 100644 # https://crbug.com/474506. "//clank/java/BUILD.gn", diff --git BUILD.gn BUILD.gn -index 62cf575ef492..f159433494c2 100644 +index f0c7533a016b..93bd97a88cf6 100644 --- BUILD.gn +++ BUILD.gn @@ -193,6 +193,7 @@ group("gn_all") { diff --git a/patch/patches/linux_build.patch b/patch/patches/linux_build.patch index 3003e3f8e..993902d89 100644 --- a/patch/patches/linux_build.patch +++ b/patch/patches/linux_build.patch @@ -1,5 +1,5 @@ diff --git build/config/compiler/BUILD.gn build/config/compiler/BUILD.gn -index 9bb0a52e61e0..a9b5f52b936c 100644 +index 295dabff4be3..e27ae2342235 100644 --- build/config/compiler/BUILD.gn +++ build/config/compiler/BUILD.gn @@ -152,7 +152,7 @@ declare_args() { diff --git a/patch/patches/message_loop_443_1992243003.patch b/patch/patches/message_loop_443_1992243003.patch index 845e47b11..e6d72bbb7 100644 --- a/patch/patches/message_loop_443_1992243003.patch +++ b/patch/patches/message_loop_443_1992243003.patch @@ -34,7 +34,7 @@ index 9e19a78aca10..47a54de56a74 100644 #if !defined(OS_NACL) diff --git base/message_loop/message_pump_win.cc base/message_loop/message_pump_win.cc -index 2860539af17d..98680dda14dd 100644 +index 76747a5086b3..7330d87a9d2d 100644 --- base/message_loop/message_pump_win.cc +++ base/message_loop/message_pump_win.cc @@ -11,6 +11,7 @@ diff --git a/patch/patches/net_filter_515.patch b/patch/patches/net_filter_515.patch index 5740984ef..bb9aa289d 100644 --- a/patch/patches/net_filter_515.patch +++ b/patch/patches/net_filter_515.patch @@ -22,10 +22,10 @@ index c28d0bb3b676..1acbb4c94495 100644 THREAD_CHECKER(thread_checker_); diff --git net/url_request/url_request_job.cc net/url_request/url_request_job.cc -index 6344fa04593d..ee26c1d88363 100644 +index 9bdff67e76e8..35f0e10bcac3 100644 --- net/url_request/url_request_job.cc +++ net/url_request/url_request_job.cc -@@ -466,6 +466,12 @@ void URLRequestJob::NotifyHeadersComplete() { +@@ -467,6 +467,12 @@ void URLRequestJob::NotifyHeadersComplete() { DCHECK(!source_stream_); source_stream_ = SetUpSourceStream(); diff --git a/patch/patches/pdfium_print_549365.patch b/patch/patches/pdfium_print_549365.patch index 354aa5be6..8899388b4 100644 --- a/patch/patches/pdfium_print_549365.patch +++ b/patch/patches/pdfium_print_549365.patch @@ -1,8 +1,8 @@ diff --git BUILD.gn BUILD.gn -index fb251fc9e..0e5ba046e 100644 +index d30640f30..56bc41940 100644 --- BUILD.gn +++ BUILD.gn -@@ -248,6 +248,10 @@ jumbo_static_library("pdfium") { +@@ -239,6 +239,10 @@ jumbo_static_library("pdfium") { complete_static_lib = true configs -= [ "//build/config/compiler:thin_archive" ] } diff --git a/patch/patches/prefs_content_1161.patch b/patch/patches/prefs_content_1161.patch index 986a7d8f8..16b7d9b80 100644 --- a/patch/patches/prefs_content_1161.patch +++ b/patch/patches/prefs_content_1161.patch @@ -11,7 +11,7 @@ index 57f03dc1ed38..061bf10c07aa 100644 IPC_STRUCT_TRAITS_MEMBER(navigate_on_drag_drop) IPC_STRUCT_TRAITS_MEMBER(spatial_navigation_enabled) diff --git content/public/common/web_preferences.cc content/public/common/web_preferences.cc -index 8ecb8383f9f6..fa6d9bef0ffb 100644 +index 8378aefaf81a..f831c4aa6d26 100644 --- content/public/common/web_preferences.cc +++ content/public/common/web_preferences.cc @@ -178,6 +178,7 @@ WebPreferences::WebPreferences() @@ -35,10 +35,10 @@ index 78cbf5f3db86..9a4906a32336 100644 bool record_whole_document; SavePreviousDocumentResources save_previous_document_resources; diff --git content/renderer/render_view_impl.cc content/renderer/render_view_impl.cc -index 950a68c86c38..3e95096693b6 100644 +index 18b915029764..6aa42b269d13 100644 --- content/renderer/render_view_impl.cc +++ content/renderer/render_view_impl.cc -@@ -1200,6 +1200,7 @@ void RenderViewImpl::ApplyWebPreferencesInternal( +@@ -1203,6 +1203,7 @@ void RenderViewImpl::ApplyWebPreferencesInternal( blink::WebView* web_view, CompositorDependencies* compositor_deps) { ApplyWebPreferences(prefs, web_view); diff --git a/patch/patches/print_header_footer_1478_1565.patch b/patch/patches/print_header_footer_1478_1565.patch index 9a82b0b15..d769d524c 100644 --- a/patch/patches/print_header_footer_1478_1565.patch +++ b/patch/patches/print_header_footer_1478_1565.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn -index 9a6bde79b2d9..3262d468f969 100644 +index 07de64d30686..39959f0dbadb 100644 --- chrome/browser/ui/BUILD.gn +++ chrome/browser/ui/BUILD.gn @@ -890,6 +890,7 @@ split_static_library("ui") { diff --git a/patch/patches/rwh_background_color_1984.patch b/patch/patches/rwh_background_color_1984.patch index c86fc1f52..d965eddfa 100644 --- a/patch/patches/rwh_background_color_1984.patch +++ b/patch/patches/rwh_background_color_1984.patch @@ -1,5 +1,5 @@ diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc -index 4755361efbed..1fb50696deaa 100644 +index 1864ef4217fe..97a522b751e2 100644 --- content/browser/renderer_host/render_widget_host_view_aura.cc +++ content/browser/renderer_host/render_widget_host_view_aura.cc @@ -718,10 +718,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() const { diff --git a/patch/patches/service_manager_654986.patch b/patch/patches/service_manager_654986.patch index 017ccd0c7..44a1fe14c 100644 --- a/patch/patches/service_manager_654986.patch +++ b/patch/patches/service_manager_654986.patch @@ -1,5 +1,5 @@ diff --git services/service_manager/embedder/main.cc services/service_manager/embedder/main.cc -index 80d366e269b2..9ba957a08e65 100644 +index b4728513c0a6..550384c766f2 100644 --- services/service_manager/embedder/main.cc +++ services/service_manager/embedder/main.cc @@ -300,13 +300,30 @@ int RunService(MainDelegate* delegate) { @@ -49,7 +49,7 @@ index 80d366e269b2..9ba957a08e65 100644 InitializeMac(); #endif - mojo::edk::Configuration mojo_config; + mojo::core::Configuration mojo_config; - ProcessType process_type = delegate->OverrideProcessType(); - if (process_type == ProcessType::kDefault) { - std::string type_switch = @@ -68,7 +68,7 @@ index 80d366e269b2..9ba957a08e65 100644 + mojo_config.is_broker_process = true; mojo_config.max_message_num_bytes = kMaximumMojoMessageSize; delegate->OverrideMojoConfiguration(&mojo_config); - mojo::edk::Init(mojo_config); + mojo::core::Init(mojo_config); @@ -432,6 +433,16 @@ int Main(const MainParams& params) { trace_config, base::trace_event::TraceLog::RECORDING_MODE); } @@ -81,8 +81,8 @@ index 80d366e269b2..9ba957a08e65 100644 + DCHECK(delegate); + + int exit_code = 0; -+ const ProcessType process_type = -+ GetProcessType(delegate, *base::CommandLine::ForCurrentProcess()); ++ const auto& command_line = *base::CommandLine::ForCurrentProcess(); ++ const ProcessType process_type = GetProcessType(delegate, command_line); switch (process_type) { case ProcessType::kDefault: NOTREACHED(); diff --git a/patch/patches/storage_partition_1973.patch b/patch/patches/storage_partition_1973.patch index 067dec977..e019c3a3f 100644 --- a/patch/patches/storage_partition_1973.patch +++ b/patch/patches/storage_partition_1973.patch @@ -125,10 +125,10 @@ index 905fe910bebb..abf75841dd86 100644 BrowserThread::IO, FROM_HERE, base::BindOnce( diff --git content/browser/devtools/protocol/service_worker_handler.cc content/browser/devtools/protocol/service_worker_handler.cc -index ed4a2e99d68b..a545f01d8efd 100644 +index 77d1cc9fda71..ca372bbf4723 100644 --- content/browser/devtools/protocol/service_worker_handler.cc +++ content/browser/devtools/protocol/service_worker_handler.cc -@@ -170,8 +170,7 @@ void ServiceWorkerHandler::SetRenderer(int process_host_id, +@@ -171,8 +171,7 @@ void ServiceWorkerHandler::SetRenderer(int process_host_id, return; } @@ -228,10 +228,10 @@ index ba4abf130285..9bca602b6ec5 100644 CreateDownloadURLLoaderFactoryGetter(storage_partition, rfh, true); } diff --git content/browser/loader/navigation_url_loader_impl.cc content/browser/loader/navigation_url_loader_impl.cc -index 41a7633f56ec..c40cc01512ef 100644 +index d8eeafefef71..6069cb51e358 100644 --- content/browser/loader/navigation_url_loader_impl.cc +++ content/browser/loader/navigation_url_loader_impl.cc -@@ -987,7 +987,7 @@ class NavigationURLLoaderImpl::URLLoaderRequestController +@@ -997,7 +997,7 @@ class NavigationURLLoaderImpl::URLLoaderRequestController // path does as well for navigations. bool has_plugin = PluginService::GetInstance()->GetPluginInfo( -1 /* render_process_id */, -1 /* render_frame_id */, resource_context_, @@ -240,7 +240,7 @@ index 41a7633f56ec..c40cc01512ef 100644 false /* allow_wildcard */, &stale, &plugin, nullptr); if (stale) { -@@ -1320,7 +1320,7 @@ NavigationURLLoaderImpl::NavigationURLLoaderImpl( +@@ -1330,7 +1330,7 @@ NavigationURLLoaderImpl::NavigationURLLoaderImpl( network::mojom::URLLoaderFactoryPtrInfo proxied_factory_info; network::mojom::URLLoaderFactoryRequest proxied_factory_request; @@ -249,7 +249,7 @@ index 41a7633f56ec..c40cc01512ef 100644 if (frame_tree_node) { // |frame_tree_node| may be null in some unit test environments. GetContentClient() -@@ -1368,7 +1368,8 @@ NavigationURLLoaderImpl::NavigationURLLoaderImpl( +@@ -1378,7 +1378,8 @@ NavigationURLLoaderImpl::NavigationURLLoaderImpl( DCHECK(!request_controller_); request_controller_ = std::make_unique( std::move(initial_interceptors), std::move(new_request), resource_context, @@ -276,7 +276,7 @@ index 6a6e31bdb070..dce0433e1775 100644 partition->GetPaymentAppContext(); diff --git content/browser/payments/payment_app_provider_impl.cc content/browser/payments/payment_app_provider_impl.cc -index 245c0b764f90..8daa7e238fe1 100644 +index 6d28562bd1b9..544566b60192 100644 --- content/browser/payments/payment_app_provider_impl.cc +++ content/browser/payments/payment_app_provider_impl.cc @@ -369,10 +369,11 @@ void StartServiceWorkerForDispatch(BrowserContext* browser_context, @@ -306,7 +306,7 @@ index 245c0b764f90..8daa7e238fe1 100644 partition->GetPaymentAppContext(); diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc -index af9db4de12d0..f2552a8199e9 100644 +index bc6050f27296..879d1dc2c113 100644 --- content/browser/renderer_host/render_process_host_impl.cc +++ content/browser/renderer_host/render_process_host_impl.cc @@ -740,11 +740,10 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data, @@ -471,7 +471,7 @@ index af9db4de12d0..f2552a8199e9 100644 &PluginRegistryImpl::Bind, base::Unretained(plugin_registry_.get()))); #endif diff --git content/browser/renderer_host/render_process_host_impl.h content/browser/renderer_host/render_process_host_impl.h -index 982ae3e1d73e..cb33109b8e83 100644 +index 582d8037c2bf..473b5b5c1daa 100644 --- content/browser/renderer_host/render_process_host_impl.h +++ content/browser/renderer_host/render_process_host_impl.h @@ -91,7 +91,6 @@ class ServiceWorkerDispatcherHost; @@ -491,7 +491,7 @@ index 982ae3e1d73e..cb33109b8e83 100644 SiteInstance* site_instance, bool is_for_guests_only); -@@ -446,7 +445,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -443,7 +442,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // Use CreateRenderProcessHost() instead of calling this constructor // directly. RenderProcessHostImpl(BrowserContext* browser_context, @@ -500,7 +500,7 @@ index 982ae3e1d73e..cb33109b8e83 100644 bool is_for_guests_only); // Initializes a new IPC::ChannelProxy in |channel_|, which will be connected -@@ -712,10 +711,10 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -709,10 +708,10 @@ class CONTENT_EXPORT RenderProcessHostImpl // called. int instance_id_ = 1; diff --git a/patch/patches/views_widget_180_1481_1565_1677_1749.patch b/patch/patches/views_widget_180_1481_1565_1677_1749.patch index 98d29b569..48f5b3018 100644 --- a/patch/patches/views_widget_180_1481_1565_1677_1749.patch +++ b/patch/patches/views_widget_180_1481_1565_1677_1749.patch @@ -194,10 +194,10 @@ index 1eb03f110884..c3319648f00a 100644 // a reference. corewm::TooltipWin* tooltip_; diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc -index 347384b9063f..aaeb62918b11 100644 +index 438e5968ed24..97bb9ccef709 100644 --- ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc +++ ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc -@@ -146,6 +146,7 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11( +@@ -145,6 +145,7 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11( use_native_frame_(false), should_maximize_after_map_(false), use_argb_visual_(false), @@ -205,7 +205,7 @@ index 347384b9063f..aaeb62918b11 100644 drag_drop_client_(NULL), native_widget_delegate_(native_widget_delegate), desktop_native_widget_aura_(desktop_native_widget_aura), -@@ -158,6 +159,7 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11( +@@ -157,6 +158,7 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11( has_window_focus_(false), has_pointer_focus_(false), modal_dialog_counter_(0), @@ -213,7 +213,7 @@ index 347384b9063f..aaeb62918b11 100644 close_widget_factory_(this), weak_factory_(this) {} -@@ -193,6 +195,8 @@ std::vector DesktopWindowTreeHostX11::GetAllOpenWindows() { +@@ -192,6 +194,8 @@ std::vector DesktopWindowTreeHostX11::GetAllOpenWindows() { } gfx::Rect DesktopWindowTreeHostX11::GetX11RootWindowBounds() const { @@ -222,7 +222,7 @@ index 347384b9063f..aaeb62918b11 100644 return bounds_in_pixels_; } -@@ -503,7 +507,8 @@ void DesktopWindowTreeHostX11::CloseNow() { +@@ -502,7 +506,8 @@ void DesktopWindowTreeHostX11::CloseNow() { // Actually free our native resources. if (ui::PlatformEventSource::GetInstance()) ui::PlatformEventSource::GetInstance()->RemovePlatformEventDispatcher(this); @@ -232,7 +232,7 @@ index 347384b9063f..aaeb62918b11 100644 xwindow_ = x11::None; desktop_native_widget_aura_->OnHostClosed(); -@@ -644,6 +649,8 @@ void DesktopWindowTreeHostX11::GetWindowPlacement( +@@ -643,6 +648,8 @@ void DesktopWindowTreeHostX11::GetWindowPlacement( } gfx::Rect DesktopWindowTreeHostX11::GetWindowBoundsInScreen() const { @@ -241,7 +241,7 @@ index 347384b9063f..aaeb62918b11 100644 return ToDIPRect(bounds_in_pixels_); } -@@ -1273,6 +1280,8 @@ void DesktopWindowTreeHostX11::SetBoundsInPixels( +@@ -1268,6 +1275,8 @@ void DesktopWindowTreeHostX11::SetBoundsInPixels( } gfx::Point DesktopWindowTreeHostX11::GetLocationOnScreenInPixels() const { @@ -250,7 +250,7 @@ index 347384b9063f..aaeb62918b11 100644 return bounds_in_pixels_.origin(); } -@@ -1417,7 +1426,6 @@ void DesktopWindowTreeHostX11::InitX11Window( +@@ -1412,7 +1421,6 @@ void DesktopWindowTreeHostX11::InitX11Window( ::Atom window_type; switch (params.type) { case Widget::InitParams::TYPE_MENU: @@ -258,7 +258,7 @@ index 347384b9063f..aaeb62918b11 100644 window_type = gfx::GetAtom("_NET_WM_WINDOW_TYPE_MENU"); break; case Widget::InitParams::TYPE_TOOLTIP: -@@ -1473,9 +1481,15 @@ void DesktopWindowTreeHostX11::InitX11Window( +@@ -1468,9 +1476,15 @@ void DesktopWindowTreeHostX11::InitX11Window( attribute_mask |= CWBorderPixel; swa.border_pixel = 0; @@ -275,7 +275,7 @@ index 347384b9063f..aaeb62918b11 100644 bounds_in_pixels_.y(), bounds_in_pixels_.width(), bounds_in_pixels_.height(), 0, // border width -@@ -2073,6 +2087,10 @@ uint32_t DesktopWindowTreeHostX11::DispatchEvent( +@@ -2086,6 +2100,10 @@ uint32_t DesktopWindowTreeHostX11::DispatchEvent( } break; } @@ -287,7 +287,7 @@ index 347384b9063f..aaeb62918b11 100644 case x11::FocusOut: OnFocusEvent(xev->type == x11::FocusIn, event->xfocus.mode, diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h -index 5b115b64065c..27e2d090a2b0 100644 +index 492c896749f8..8e609c5c7d76 100644 --- ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h +++ ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h @@ -91,6 +91,12 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11 @@ -303,7 +303,7 @@ index 5b115b64065c..27e2d090a2b0 100644 protected: // Overridden from DesktopWindowTreeHost: void Init(const Widget::InitParams& params) override; -@@ -315,6 +321,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11 +@@ -321,6 +327,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11 // The bounds of |xwindow_|. gfx::Rect bounds_in_pixels_; @@ -313,7 +313,7 @@ index 5b115b64065c..27e2d090a2b0 100644 // Whenever the bounds are set, we keep the previous set of bounds around so // we can have a better chance of getting the real // |restored_bounds_in_pixels_|. Window managers tend to send a Configure -@@ -355,6 +364,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11 +@@ -365,6 +374,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11 // Whether we used an ARGB visual for our window. bool use_argb_visual_; @@ -324,7 +324,7 @@ index 5b115b64065c..27e2d090a2b0 100644 DesktopDragDropClientAuraX11* drag_drop_client_; std::unique_ptr x11_non_client_event_filter_; -@@ -443,6 +456,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11 +@@ -453,6 +466,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11 uint32_t modal_dialog_counter_; @@ -427,7 +427,7 @@ index c7296fed234d..244d0034a1c4 100644 if (native_widget_delegate->IsDialogBox()) { *style |= DS_MODALFRAME; diff --git ui/views/win/hwnd_message_handler.cc ui/views/win/hwnd_message_handler.cc -index 8038ca7fcece..2277290bb117 100644 +index 19f7ed4252dc..6acb123adc30 100644 --- ui/views/win/hwnd_message_handler.cc +++ ui/views/win/hwnd_message_handler.cc @@ -2809,10 +2809,13 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message, diff --git a/patch/patches/web_contents_1257_1565.patch b/patch/patches/web_contents_1257_1565.patch index 5b3d3ae36..662bb40d1 100644 --- a/patch/patches/web_contents_1257_1565.patch +++ b/patch/patches/web_contents_1257_1565.patch @@ -1,5 +1,5 @@ diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc -index cf6b608b2918..e4bbfca9c1a3 100644 +index 34096176fc16..58eabafbd9b6 100644 --- content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc @@ -2006,21 +2006,30 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { @@ -70,7 +70,7 @@ index cf6b608b2918..e4bbfca9c1a3 100644 } // Save the created window associated with the route so we can show it // later. -@@ -6063,7 +6081,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() { +@@ -6066,7 +6084,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() { void WebContentsImpl::CreateRenderWidgetHostViewForRenderManager( RenderViewHost* render_view_host) { RenderWidgetHostViewBase* rwh_view = diff --git a/patch/patches/webkit_plugin_info_2015.patch b/patch/patches/webkit_plugin_info_2015.patch index 503601932..0a5f2b04b 100644 --- a/patch/patches/webkit_plugin_info_2015.patch +++ b/patch/patches/webkit_plugin_info_2015.patch @@ -10,10 +10,10 @@ index 92e9cb865204..4628c56882b4 100644 + GetPlugins(bool refresh, bool is_main_frame, url.mojom.Origin main_frame_origin) => (array plugins); }; diff --git third_party/blink/public/platform/platform.h third_party/blink/public/platform/platform.h -index 26025241357b..c6709eb782f4 100644 +index ea54e3d6ce90..a36f0e222119 100644 --- third_party/blink/public/platform/platform.h +++ third_party/blink/public/platform/platform.h -@@ -702,6 +702,11 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -706,6 +706,11 @@ class BLINK_PLATFORM_EXPORT Platform { // runs during Chromium's build step). virtual bool IsTakingV8ContextSnapshot() { return false; } @@ -44,7 +44,7 @@ index a2fbf84747aa..8ab120155ccd 100644 .Top() .GetSecurityContext() diff --git third_party/blink/renderer/core/exported/web_dev_tools_agent_impl.cc third_party/blink/renderer/core/exported/web_dev_tools_agent_impl.cc -index c3d5777b9fab..a1388f5afe0d 100644 +index 6a9b05fd9c3b..fe63dffe5f92 100644 --- third_party/blink/renderer/core/exported/web_dev_tools_agent_impl.cc +++ third_party/blink/renderer/core/exported/web_dev_tools_agent_impl.cc @@ -325,6 +325,8 @@ WebDevToolsAgentImpl::Session::Session( @@ -65,10 +65,10 @@ index c3d5777b9fab..a1388f5afe0d 100644 void WebDevToolsAgentImpl::Session::SendProtocolResponse(int session_id, diff --git third_party/blink/renderer/core/frame/local_frame.cc third_party/blink/renderer/core/frame/local_frame.cc -index 718e6e16c913..4eb63f8bc124 100644 +index 11508d7b0d15..2f43b4dca085 100644 --- third_party/blink/renderer/core/frame/local_frame.cc +++ third_party/blink/renderer/core/frame/local_frame.cc -@@ -1242,7 +1242,7 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() { +@@ -1256,7 +1256,7 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() { PluginData* LocalFrame::GetPluginData() const { if (!Loader().AllowPlugins(kNotAboutToInstantiatePlugin)) return nullptr; @@ -78,12 +78,12 @@ index 718e6e16c913..4eb63f8bc124 100644 } diff --git third_party/blink/renderer/core/page/page.cc third_party/blink/renderer/core/page/page.cc -index d8d4e93ed565..b418f3bc9362 100644 +index b7fef98a016e..b658d51f80a0 100644 --- third_party/blink/renderer/core/page/page.cc +++ third_party/blink/renderer/core/page/page.cc -@@ -160,7 +160,8 @@ Page::Page(PageClients& page_clients) - overscroll_controller_( +@@ -163,7 +163,8 @@ Page::Page(PageClients& page_clients) OverscrollController::Create(GetVisualViewport(), GetChromeClient())), + link_highlights_(LinkHighlights::Create(*this)), main_frame_(nullptr), - plugin_data_(nullptr), + plugin_data_main_frame_(nullptr), @@ -91,7 +91,7 @@ index d8d4e93ed565..b418f3bc9362 100644 use_counter_(page_clients.chrome_client && page_clients.chrome_client->IsSVGImageChromeClient() ? UseCounter::kSVGImageContext -@@ -325,21 +326,40 @@ void Page::InitialStyleChanged() { +@@ -332,21 +333,40 @@ void Page::InitialStyleChanged() { } } @@ -141,9 +141,9 @@ index d8d4e93ed565..b418f3bc9362 100644 page->NotifyPluginsChanged(); } } -@@ -713,7 +733,8 @@ void Page::Trace(blink::Visitor* visitor) { - visitor->Trace(visual_viewport_); +@@ -733,7 +753,8 @@ void Page::Trace(blink::Visitor* visitor) { visitor->Trace(overscroll_controller_); + visitor->Trace(link_highlights_); visitor->Trace(main_frame_); - visitor->Trace(plugin_data_); + visitor->Trace(plugin_data_main_frame_); @@ -152,10 +152,10 @@ index d8d4e93ed565..b418f3bc9362 100644 visitor->Trace(use_counter_); visitor->Trace(plugins_changed_observers_); diff --git third_party/blink/renderer/core/page/page.h third_party/blink/renderer/core/page/page.h -index 5adaf6dd7a51..fb698931f154 100644 +index 06804a1dd062..0d7e84c5530b 100644 --- third_party/blink/renderer/core/page/page.h +++ third_party/blink/renderer/core/page/page.h -@@ -138,7 +138,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized, +@@ -139,7 +139,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized, ViewportDescription GetViewportDescription() const; // Returns the plugin data associated with |main_frame_origin|. @@ -165,7 +165,7 @@ index 5adaf6dd7a51..fb698931f154 100644 // Resets the plugin data for all pages in the renderer process and notifies // PluginsChangedObservers. -@@ -366,7 +367,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized, +@@ -370,7 +371,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized, // longer needed. Member main_frame_; diff --git a/patch/patches/webkit_pointer_event_781966.patch b/patch/patches/webkit_pointer_event_781966.patch index c6b54ec71..d4c09dd47 100644 --- a/patch/patches/webkit_pointer_event_781966.patch +++ b/patch/patches/webkit_pointer_event_781966.patch @@ -1,5 +1,5 @@ diff --git third_party/blink/renderer/core/input/pointer_event_manager.cc third_party/blink/renderer/core/input/pointer_event_manager.cc -index e48a89c9b8d8..512cf3aff54b 100644 +index 1a981850154f..47ceeb806e95 100644 --- third_party/blink/renderer/core/input/pointer_event_manager.cc +++ third_party/blink/renderer/core/input/pointer_event_manager.cc @@ -284,7 +284,7 @@ void PointerEventManager::HandlePointerInterruption( diff --git a/patch/patches/webkit_popups.patch b/patch/patches/webkit_popups.patch index cbfbe2a9c..a93931d6e 100644 --- a/patch/patches/webkit_popups.patch +++ b/patch/patches/webkit_popups.patch @@ -20,10 +20,10 @@ index f4cbe0e0e245..eaabea055764 100644 // Call these methods before and after running a nested, modal event loop diff --git third_party/blink/renderer/core/exported/web_view_impl.cc third_party/blink/renderer/core/exported/web_view_impl.cc -index 60a3df6ea8c1..f513909e9993 100644 +index 789ba3b847d5..612b1a23ebe4 100644 --- third_party/blink/renderer/core/exported/web_view_impl.cc +++ third_party/blink/renderer/core/exported/web_view_impl.cc -@@ -244,8 +244,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) { +@@ -242,8 +242,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) { g_should_use_external_popup_menus = use_external_popup_menus; } @@ -39,7 +39,7 @@ index 60a3df6ea8c1..f513909e9993 100644 } namespace { -@@ -336,6 +341,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client, +@@ -334,6 +339,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client, enable_fake_page_scale_animation_for_testing_(false), fake_page_scale_animation_page_scale_factor_(0), fake_page_scale_animation_use_anchor_(false), @@ -48,10 +48,10 @@ index 60a3df6ea8c1..f513909e9993 100644 suppress_next_keypress_event_(false), ime_accept_events_(true), diff --git third_party/blink/renderer/core/exported/web_view_impl.h third_party/blink/renderer/core/exported/web_view_impl.h -index b2cd387e5d32..406a9d2119b6 100644 +index a47150a8df45..3c5ee6d2e723 100644 --- third_party/blink/renderer/core/exported/web_view_impl.h +++ third_party/blink/renderer/core/exported/web_view_impl.h -@@ -105,7 +105,8 @@ class CORE_EXPORT WebViewImpl final : public WebView, +@@ -103,7 +103,8 @@ class CORE_EXPORT WebViewImpl final : public WebView, static HashSet& AllInstances(); // Returns true if popup menus should be rendered by the browser, false if // they should be rendered by WebKit (which is the default). @@ -61,7 +61,7 @@ index b2cd387e5d32..406a9d2119b6 100644 // WebWidget methods: void Close() override; -@@ -248,7 +249,7 @@ class CORE_EXPORT WebViewImpl final : public WebView, +@@ -246,7 +247,7 @@ class CORE_EXPORT WebViewImpl final : public WebView, HitTestResult CoreHitTestResultAt(const WebPoint&); void InvalidateRect(const IntRect&); @@ -70,7 +70,7 @@ index b2cd387e5d32..406a9d2119b6 100644 void SetBaseBackgroundColorOverride(SkColor); void ClearBaseBackgroundColorOverride(); void SetBackgroundColorOverride(SkColor); -@@ -617,6 +618,8 @@ class CORE_EXPORT WebViewImpl final : public WebView, +@@ -602,6 +603,8 @@ class CORE_EXPORT WebViewImpl final : public WebView, float fake_page_scale_animation_page_scale_factor_; bool fake_page_scale_animation_use_anchor_; diff --git a/patch/patches/webview_plugin_2020.patch b/patch/patches/webview_plugin_2020.patch index 4a29d78ee..0a5f9918a 100644 --- a/patch/patches/webview_plugin_2020.patch +++ b/patch/patches/webview_plugin_2020.patch @@ -1,5 +1,5 @@ diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd -index 9f5a70d0c553..2b4e583c30ca 100644 +index e56441af0106..832eb5a99c28 100644 --- chrome/app/generated_resources.grd +++ chrome/app/generated_resources.grd @@ -4474,7 +4474,7 @@ Keep your key file in a safe place. You will need it to create new versions of y