diff --git a/BUILD.gn b/BUILD.gn index cd8419afe..bade64a19 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -635,9 +635,7 @@ static_library("libcef_static") { ] deps = [ - # Generate pack files and associated CEF header files. - ":make_pack_header_resources", - ":make_pack_header_strings", + ":cef_make_headers", # Generate API bindings for extensions. # TODO(cef): Enable if/when CEF exposes its own Mojo APIs. See @@ -799,7 +797,6 @@ static_library("libcef_static") { deps += [ "//build/config/freetype", - "//services/ui:lib", "//third_party/fontconfig", ] } @@ -920,7 +917,6 @@ static_library("libcef_static") { ] deps += [ - "//services/ui", "//ui/aura", "//ui/events", "//ui/strings", @@ -1326,6 +1322,14 @@ make_pack_header("strings") { ] } +# Generate pack files and associated CEF header files. +group("cef_make_headers") { + deps = [ + ":make_pack_header_resources", + ":make_pack_header_strings", + ] +} + # # libcef dll/framework target. @@ -1577,6 +1581,7 @@ if (is_mac) { sources = invoker.helper_sources deps = [ + ":cef_make_headers", ":cef_sandbox", ":libcef_dll_wrapper", ] @@ -1632,6 +1637,7 @@ if (is_mac) { sources = invoker.sources deps = [ + ":libcef_dll_wrapper", ":${app_name}_framework_bundle_data", ] if (defined(invoker.deps)) { @@ -1702,9 +1708,6 @@ if (is_mac) { gypi_paths2.shared_sources_mac_helper + gypi_paths2.cefclient_sources_common + gypi_paths2.cefclient_sources_renderer - helper_deps = [ - ":libcef_dll_wrapper", - ] helper_defines = [ "CEF_USE_SANDBOX", ] @@ -1725,7 +1728,6 @@ if (is_mac) { ":cefclient_resources_bundle_data_extensions_set_page_color", ":cefclient_resources_bundle_data_english", ":cefclient_xibs", - ":libcef_dll_wrapper", ] libs = [ "AppKit.framework", @@ -1776,9 +1778,6 @@ if (is_mac) { gypi_paths2.includes_wrapper + gypi_paths2.includes_wrapper_mac + gypi_paths2.cefsimple_sources_mac_helper - helper_deps = [ - ":libcef_dll_wrapper", - ] helper_defines = [ "CEF_USE_SANDBOX", ] @@ -1794,7 +1793,6 @@ if (is_mac) { ":cefsimple_resources_bundle_data", ":cefsimple_resources_bundle_data_english", ":cefsimple_xibs", - ":libcef_dll_wrapper", ] defines = [ "CEF_USE_SANDBOX", @@ -1843,7 +1841,6 @@ if (is_mac) { gypi_paths2.shared_sources_mac_helper + gypi_paths2.ceftests_sources_mac_helper helper_deps = [ - ":libcef_dll_wrapper", "//testing/gtest", ] helper_defines = [ @@ -1864,7 +1861,6 @@ if (is_mac) { ":ceftests_resources_bundle_data", ":ceftests_resources_bundle_data_english", ":ceftests_xibs", - ":libcef_dll_wrapper", "//testing/gtest", ] libs = [ diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 85a20cf90..4b7a9f3b7 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.3497.0', + 'chromium_checkout': 'refs/tags/70.0.3507.0', } diff --git a/libcef/browser/browser_context.cc b/libcef/browser/browser_context.cc index 2234cca4b..32998fefe 100644 --- a/libcef/browser/browser_context.cc +++ b/libcef/browser/browser_context.cc @@ -105,6 +105,10 @@ void CefBrowserContext::Shutdown() { } } +base::FilePath CefBrowserContext::GetCachePath() const { + return GetPath(); +} + content::ResourceContext* CefBrowserContext::GetResourceContext() { return resource_context_.get(); } diff --git a/libcef/browser/browser_context.h b/libcef/browser/browser_context.h index 0678ef31c..d41f599d8 100644 --- a/libcef/browser/browser_context.h +++ b/libcef/browser/browser_context.h @@ -137,6 +137,7 @@ class CefBrowserContext : public ChromeProfileStub { virtual void Initialize(); // BrowserContext methods. + base::FilePath GetCachePath() const override; content::ResourceContext* GetResourceContext() override; net::URLRequestContextGetter* GetRequestContext() override; net::URLRequestContextGetter* CreateMediaRequestContext() override; diff --git a/libcef/browser/browser_main.cc b/libcef/browser/browser_main.cc index 3872e69dc..655170c60 100644 --- a/libcef/browser/browser_main.cc +++ b/libcef/browser/browser_main.cc @@ -178,7 +178,7 @@ void CefBrowserMainParts::PreMainMessageLoopRun() { printing::CefPrintingMessageFilter::EnsureShutdownNotifierFactoryBuilt(); background_task_runner_ = base::CreateSingleThreadTaskRunnerWithTraits( - {base::TaskPriority::BACKGROUND, + {base::TaskPriority::BEST_EFFORT, base::TaskShutdownBehavior::BLOCK_SHUTDOWN, base::MayBlock()}); user_visible_task_runner_ = base::CreateSingleThreadTaskRunnerWithTraits( {base::TaskPriority::USER_VISIBLE, diff --git a/libcef/browser/extensions/extension_web_contents_observer.cc b/libcef/browser/extensions/extension_web_contents_observer.cc index 290039790..5ccd3a6e9 100644 --- a/libcef/browser/extensions/extension_web_contents_observer.cc +++ b/libcef/browser/extensions/extension_web_contents_observer.cc @@ -9,8 +9,6 @@ #include "content/public/browser/render_process_host.h" #include "content/public/common/url_constants.h" -DEFINE_WEB_CONTENTS_USER_DATA_KEY(extensions::CefExtensionWebContentsObserver); - namespace extensions { CefExtensionWebContentsObserver::CefExtensionWebContentsObserver( diff --git a/libcef/browser/net/chrome_scheme_handler.cc b/libcef/browser/net/chrome_scheme_handler.cc index 834390284..bc79b9bd1 100644 --- a/libcef/browser/net/chrome_scheme_handler.cc +++ b/libcef/browser/net/chrome_scheme_handler.cc @@ -62,7 +62,7 @@ const char kChromeUIWebUIHostsHost[] = "webui-hosts"; // testing all related functionality in CEF. const char* kAllowedWebUIHosts[] = { content::kChromeUIAppCacheInternalsHost, - content::kChromeUIAccessibilityHost, + chrome::kChromeUIAccessibilityHost, content::kChromeUIBlobInternalsHost, chrome::kChromeUICreditsHost, content::kChromeUIGpuHost, diff --git a/libcef/browser/osr/browser_platform_delegate_osr.cc b/libcef/browser/osr/browser_platform_delegate_osr.cc index beb4ab1a0..d8a154f40 100644 --- a/libcef/browser/osr/browser_platform_delegate_osr.cc +++ b/libcef/browser/osr/browser_platform_delegate_osr.cc @@ -192,15 +192,7 @@ bool CefBrowserPlatformDelegateOsr::IsViewsHosted() const { } void CefBrowserPlatformDelegateOsr::WasHidden(bool hidden) { - CefRenderWidgetHostViewOSR* view = GetOSRHostView(); - if (view) { - if (hidden) - view->Hide(); - else - view->Show(); - } - - // Also notify the WebContentsImpl for consistency. + // The WebContentsImpl will notify the OSR view. content::WebContentsImpl* web_contents = static_cast(browser_->web_contents()); if (web_contents) { diff --git a/libcef/browser/osr/render_widget_host_view_osr.cc b/libcef/browser/osr/render_widget_host_view_osr.cc index 1edc172fc..40bb085d6 100644 --- a/libcef/browser/osr/render_widget_host_view_osr.cc +++ b/libcef/browser/osr/render_widget_host_view_osr.cc @@ -952,7 +952,8 @@ ui::Layer* CefRenderWidgetHostViewOSR::DelegatedFrameHostGetLayer() const { } bool CefRenderWidgetHostViewOSR::DelegatedFrameHostIsVisible() const { - return !render_widget_host_->is_hidden(); + // Called indirectly from DelegatedFrameHost::WasShown. + return is_showing_; } SkColor CefRenderWidgetHostViewOSR::DelegatedFrameHostGetGutterColor() const { 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 8a97387c1..c5f7ec28a 100644 --- a/libcef/browser/osr/render_widget_host_view_osr_mac.mm +++ b/libcef/browser/osr/render_widget_host_view_osr_mac.mm @@ -171,8 +171,8 @@ void CefRenderWidgetHostViewOSR::PlatformCreateCompositorWidget( mac_helper_ = new MacHelper(this); browser_compositor_.reset(new content::BrowserCompositorMac( - mac_helper_, mac_helper_, render_widget_host_->is_hidden(), true, - GetDisplay(), AllocateFrameSinkId(is_guest_view_hack))); + mac_helper_, mac_helper_, render_widget_host_->is_hidden(), GetDisplay(), + AllocateFrameSinkId(is_guest_view_hack))); } void CefRenderWidgetHostViewOSR::PlatformDestroyCompositorWidget() { diff --git a/libcef/browser/prefs/browser_prefs.cc b/libcef/browser/prefs/browser_prefs.cc index e27298beb..d7821fa82 100644 --- a/libcef/browser/prefs/browser_prefs.cc +++ b/libcef/browser/prefs/browser_prefs.cc @@ -15,6 +15,7 @@ #include "base/strings/string_number_conversions.h" #include "base/task_scheduler/post_task.h" #include "base/values.h" +#include "chrome/browser/accessibility/accessibility_ui.h" #include "chrome/browser/net/prediction_options.h" #include "chrome/browser/plugins/plugin_info_host_impl.h" #include "chrome/browser/prefs/chrome_command_line_pref_store.h" @@ -142,6 +143,7 @@ std::unique_ptr CreatePrefService(Profile* profile, ->RegisterProfilePrefsForServices(profile, registry.get()); // Default preferences. + AccessibilityUIMessageHandler::RegisterProfilePrefs(registry.get()); CefMediaCaptureDevicesDispatcher::RegisterPrefs(registry.get()); CefURLRequestContextGetterImpl::RegisterPrefs(registry.get()); chrome_browser_net::RegisterPredictionOptionsProfilePrefs(registry.get()); diff --git a/libcef/browser/printing/print_view_manager.cc b/libcef/browser/printing/print_view_manager.cc index 5cef7563a..29c731b77 100644 --- a/libcef/browser/printing/print_view_manager.cc +++ b/libcef/browser/printing/print_view_manager.cc @@ -26,8 +26,6 @@ using content::BrowserThread; -DEFINE_WEB_CONTENTS_USER_DATA_KEY(printing::CefPrintViewManager); - namespace printing { namespace { diff --git a/libcef/browser/printing/print_view_manager_base.cc b/libcef/browser/printing/print_view_manager_base.cc index 2377875b5..d8efc1f0b 100644 --- a/libcef/browser/printing/print_view_manager_base.cc +++ b/libcef/browser/printing/print_view_manager_base.cc @@ -27,7 +27,6 @@ #include "chrome/browser/printing/printer_query.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" -#include "chrome/common/webui_url_constants.h" #include "chrome/grit/generated_resources.h" #include "components/prefs/pref_service.h" #include "components/printing/browser/print_composite_client.h" @@ -43,14 +42,12 @@ #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" -#include "extensions/common/constants.h" #include "mojo/public/cpp/system/buffer.h" #include "printing/buildflags/buildflags.h" #include "printing/pdf_metafile_skia.h" #include "printing/print_settings.h" #include "printing/printed_document.h" #include "ui/base/l10n/l10n_util.h" -#include "url/gurl.h" #if defined(OS_WIN) #include "base/command_line.h" @@ -62,18 +59,6 @@ using content::BrowserThread; namespace printing { -namespace { - -bool PrintingPdfContent(content::RenderFrameHost* rfh) { - GURL url = rfh->GetLastCommittedURL(); - // Whether it is inside print preview or pdf plugin extension. - return url.GetOrigin() == chrome::kChromeUIPrintURL || - (url.SchemeIs(extensions::kExtensionScheme) && - url.host_piece() == extension_misc::kPdfExtensionId); -} - -} // namespace - CefPrintViewManagerBase::CefPrintViewManagerBase( content::WebContents* web_contents) : PrintManager(web_contents), @@ -196,7 +181,7 @@ void CefPrintViewManagerBase::OnDidPrintDocument( } auto* client = PrintCompositeClient::FromWebContents(web_contents()); - if (IsOopifEnabled() && !PrintingPdfContent(render_frame_host)) { + if (IsOopifEnabled() && print_job_->document()->settings().is_modifiable()) { client->DoCompositeDocumentToPdf( params.document_cookie, render_frame_host, content.metafile_data_handle, content.data_size, content.subframe_content_info, diff --git a/libcef/browser/storage_partition_proxy.cc b/libcef/browser/storage_partition_proxy.cc index 92b0ae76c..845ea28f8 100644 --- a/libcef/browser/storage_partition_proxy.cc +++ b/libcef/browser/storage_partition_proxy.cc @@ -88,6 +88,11 @@ CefStoragePartitionProxy::GetCacheStorageContext() { return parent_->GetCacheStorageContext(); } +content::GeneratedCodeCacheContext* +CefStoragePartitionProxy::GetGeneratedCodeCacheContext() { + return parent_->GetGeneratedCodeCacheContext(); +} + content::HostZoomMap* CefStoragePartitionProxy::GetHostZoomMap() { return parent_->GetHostZoomMap(); } @@ -156,6 +161,10 @@ void CefStoragePartitionProxy::Flush() { parent_->Flush(); } +void CefStoragePartitionProxy::ResetURLLoaderFactories() { + parent_->ResetURLLoaderFactories(); +} + void CefStoragePartitionProxy::ClearBluetoothAllowedDevicesMapForTesting() { parent_->ClearBluetoothAllowedDevicesMapForTesting(); } diff --git a/libcef/browser/storage_partition_proxy.h b/libcef/browser/storage_partition_proxy.h index e7d6200ae..702f73280 100644 --- a/libcef/browser/storage_partition_proxy.h +++ b/libcef/browser/storage_partition_proxy.h @@ -40,6 +40,7 @@ class CefStoragePartitionProxy : public content::StoragePartition { content::ServiceWorkerContext* GetServiceWorkerContext() override; content::SharedWorkerService* GetSharedWorkerService() override; content::CacheStorageContext* GetCacheStorageContext() override; + content::GeneratedCodeCacheContext* GetGeneratedCodeCacheContext() override; content::HostZoomMap* GetHostZoomMap() override; content::HostZoomLevelContext* GetHostZoomLevelContext() override; content::ZoomLevelDelegate* GetZoomLevelDelegate() override; @@ -69,6 +70,7 @@ class CefStoragePartitionProxy : public content::StoragePartition { const base::Callback& url_matcher, base::OnceClosure callback) override; void Flush() override; + void ResetURLLoaderFactories() override; void ClearBluetoothAllowedDevicesMapForTesting() override; void FlushNetworkInterfaceForTesting() override; void WaitForDeletionTasksForTesting() override; diff --git a/libcef/browser/thread_util.h b/libcef/browser/thread_util.h index ec3e7f09d..4780d1d1d 100644 --- a/libcef/browser/thread_util.h +++ b/libcef/browser/thread_util.h @@ -70,7 +70,7 @@ // Post a blocking task where the user won't notice if it takes an arbitrarily // long time to complete. #define CEF_POST_BACKGROUND_TASK(task) \ - CEF_POST_BLOCKING_TASK(base::TaskPriority::BACKGROUND, task) + CEF_POST_BLOCKING_TASK(base::TaskPriority::BEST_EFFORT, task) // Assert that blocking is allowed on the current thread. #define CEF_REQUIRE_BLOCKING() base::AssertBlockingAllowed() diff --git a/libcef/common/values_impl.cc b/libcef/common/values_impl.cc index 2bf4ffa26..fd036bb4c 100644 --- a/libcef/common/values_impl.cc +++ b/libcef/common/values_impl.cc @@ -553,7 +553,7 @@ size_t CefBinaryValueImpl::GetData(void* buffer, return 0; size = std::min(buffer_size, size - data_offset); - const char* data = const_value().GetBlob().data(); + auto* data = const_value().GetBlob().data(); memcpy(buffer, data + data_offset, size); return size; } diff --git a/libcef/renderer/blink_glue.cc b/libcef/renderer/blink_glue.cc index b84d3b5f3..b3149ada4 100644 --- a/libcef/renderer/blink_glue.cc +++ b/libcef/renderer/blink_glue.cc @@ -5,9 +5,6 @@ #include "libcef/renderer/blink_glue.h" -#include "base/compiler_specific.h" - -MSVC_PUSH_WARNING_LEVEL(0); #include "third_party/blink/public/platform/web_string.h" #include "third_party/blink/public/platform/web_url_response.h" #include "third_party/blink/public/web/web_document.h" @@ -32,7 +29,6 @@ MSVC_PUSH_WARNING_LEVEL(0); #include "third_party/blink/renderer/platform/bindings/v8_binding.h" #include "third_party/blink/renderer/platform/loader/fetch/resource_response.h" #include "third_party/blink/renderer/platform/weborigin/scheme_registry.h" -MSVC_POP_WARNING(); #undef LOG #include "base/logging.h" diff --git a/libcef/renderer/render_urlrequest_impl.cc b/libcef/renderer/render_urlrequest_impl.cc index 9562e2243..4d8688a31 100644 --- a/libcef/renderer/render_urlrequest_impl.cc +++ b/libcef/renderer/render_urlrequest_impl.cc @@ -117,7 +117,8 @@ class CefRenderURLRequest::Context loader_ = CefContentRendererClient::Get()->url_loader_factory()->CreateURLLoader( - urlRequest, task_runner_.get()); + urlRequest, blink::scheduler::WebResourceLoadingTaskRunnerHandle:: + CreateUnprioritized(task_runner_.get())); loader_->LoadAsynchronously(urlRequest, url_client_.get()); return true; } diff --git a/patch/patches/browser_compositor_mac.patch b/patch/patches/browser_compositor_mac.patch index e026110a2..9761417a7 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 513e70d2b738..f821043e0a4e 100644 +index 0d13a9a16d65..3eeca6a01e6f 100644 --- content/browser/renderer_host/browser_compositor_view_mac.h +++ content/browser/renderer_host/browser_compositor_view_mac.h @@ -59,6 +59,8 @@ class CONTENT_EXPORT BrowserCompositorMac : public DelegatedFrameHostClient, @@ -12,10 +12,10 @@ index 513e70d2b738..f821043e0a4e 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 72ad272b4d1a..0b4cd87019bf 100644 +index f9e9ad67c887..e0d0264299d7 100644 --- content/browser/renderer_host/browser_compositor_view_mac.mm +++ content/browser/renderer_host/browser_compositor_view_mac.mm -@@ -87,6 +87,12 @@ DelegatedFrameHost* BrowserCompositorMac::GetDelegatedFrameHost() { +@@ -244,6 +244,12 @@ DelegatedFrameHost* BrowserCompositorMac::GetDelegatedFrameHost() { return delegated_frame_host_.get(); } diff --git a/patch/patches/browser_plugin_guest_1565.patch b/patch/patches/browser_plugin_guest_1565.patch index e880acd61..29ddacffb 100644 --- a/patch/patches/browser_plugin_guest_1565.patch +++ b/patch/patches/browser_plugin_guest_1565.patch @@ -1,5 +1,5 @@ diff --git content/browser/browser_plugin/browser_plugin_guest.cc content/browser/browser_plugin/browser_plugin_guest.cc -index f56ce93c3d5b..716cf8846378 100644 +index ca19df7c7fa2..99f7f9c950db 100644 --- content/browser/browser_plugin/browser_plugin_guest.cc +++ content/browser/browser_plugin/browser_plugin_guest.cc @@ -312,8 +312,11 @@ void BrowserPluginGuest::InitInternal( @@ -37,7 +37,7 @@ index f56ce93c3d5b..716cf8846378 100644 attached_ = true; diff --git content/browser/frame_host/interstitial_page_impl.cc content/browser/frame_host/interstitial_page_impl.cc -index f839f62061bb..2150ceb6c780 100644 +index 04922e2a61bf..c4fd3f9a050e 100644 --- content/browser/frame_host/interstitial_page_impl.cc +++ content/browser/frame_host/interstitial_page_impl.cc @@ -619,7 +619,7 @@ WebContentsView* InterstitialPageImpl::CreateWebContentsView() { @@ -208,10 +208,10 @@ index 9e3511a9dabc..83dfee968d59 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 2e3f4f8a56d4..75ef26b5381a 100644 +index 7f80c1b1d829..bcbd04bc4e6c 100644 --- content/browser/web_contents/web_contents_view_mac.h +++ content/browser/web_contents/web_contents_view_mac.h -@@ -96,7 +96,7 @@ class WebContentsViewMac : public WebContentsView, +@@ -97,7 +97,7 @@ class WebContentsViewMac : public WebContentsView, gfx::NativeView context) override; RenderWidgetHostViewBase* CreateViewForWidget( RenderWidgetHost* render_widget_host, @@ -221,7 +221,7 @@ index 2e3f4f8a56d4..75ef26b5381a 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 03d7c9c7dcce..e84c1787a84d 100644 +index 94848b568363..4dea19adb512 100644 --- content/browser/web_contents/web_contents_view_mac.mm +++ content/browser/web_contents/web_contents_view_mac.mm @@ -345,7 +345,8 @@ void WebContentsViewMac::CreateView( @@ -266,7 +266,7 @@ index d05dd5421458..fa13775f0512 100644 // a BrowserPlugin even when we are using cross process frames for guests. It // should be removed after resolving https://crbug.com/642826). diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc -index 1930af130f24..77695f7844d7 100644 +index 68d48f12192d..fb713dbda108 100644 --- extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc +++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc @@ -198,6 +198,8 @@ void MimeHandlerViewGuest::CreateWebContents( diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index e2a0c46ce..2bb7d6773 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 343c8a0fbfeb..68c73fa1c5f0 100644 +index 390f8303d2ab..bf60472655dc 100644 --- chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn @@ -8,6 +8,7 @@ import("//build/config/features.gni") @@ -10,7 +10,7 @@ index 343c8a0fbfeb..68c73fa1c5f0 100644 import("//chrome/common/features.gni") import("//components/feature_engagement/features.gni") import("//components/feed/features.gni") -@@ -1659,6 +1660,7 @@ jumbo_split_static_library("browser") { +@@ -1667,6 +1668,7 @@ jumbo_split_static_library("browser") { "//base:i18n", "//base/allocator:buildflags", "//cc", @@ -18,7 +18,7 @@ index 343c8a0fbfeb..68c73fa1c5f0 100644 "//chrome:extra_resources", "//chrome:resources", "//chrome:strings", -@@ -1931,6 +1933,10 @@ jumbo_split_static_library("browser") { +@@ -1938,6 +1940,10 @@ jumbo_split_static_library("browser") { ] } diff --git a/patch/patches/chrome_browser_profiles.patch b/patch/patches/chrome_browser_profiles.patch index e2caf6a8d..66f1af9ce 100644 --- a/patch/patches/chrome_browser_profiles.patch +++ b/patch/patches/chrome_browser_profiles.patch @@ -70,10 +70,10 @@ 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 be5d79034fea..617ab398fff8 100644 +index 5d780144d11d..b73a88e083ec 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) +@@ -382,7 +382,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir) chrome::NOTIFICATION_BROWSER_CLOSE_CANCELLED, content::NotificationService::AllSources()); diff --git a/patch/patches/chrome_plugins.patch b/patch/patches/chrome_plugins.patch index 7796b5770..e9fa6e8ed 100644 --- a/patch/patches/chrome_plugins.patch +++ b/patch/patches/chrome_plugins.patch @@ -157,10 +157,10 @@ index 484e07af5a98..0e62e20095c7 100644 // If we broke out of the loop, we have found an enabled plugin. bool enabled = i < matching_plugins.size(); diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc -index 2951ee282f4c..f692717d5712 100644 +index 6107cff08901..6f3d3233b613 100644 --- chrome/renderer/chrome_content_renderer_client.cc +++ chrome/renderer/chrome_content_renderer_client.cc -@@ -762,6 +762,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( +@@ -761,6 +761,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( if ((status == chrome::mojom::PluginStatus::kUnauthorized || status == chrome::mojom::PluginStatus::kBlocked) && @@ -168,7 +168,7 @@ index 2951ee282f4c..f692717d5712 100644 observer->IsPluginTemporarilyAllowed(identifier)) { status = chrome::mojom::PluginStatus::kAllowed; } -@@ -949,7 +950,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( +@@ -948,7 +949,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( render_frame->GetRemoteAssociatedInterfaces()->GetInterface( &plugin_auth_host); plugin_auth_host->BlockedUnauthorizedPlugin(group_name, identifier); @@ -178,7 +178,7 @@ index 2951ee282f4c..f692717d5712 100644 break; } case chrome::mojom::PluginStatus::kBlocked: { -@@ -958,7 +960,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( +@@ -957,7 +959,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name)); placeholder->AllowLoading(); RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Blocked")); @@ -188,7 +188,7 @@ index 2951ee282f4c..f692717d5712 100644 break; } case chrome::mojom::PluginStatus::kBlockedByPolicy: { -@@ -968,7 +971,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( +@@ -967,7 +970,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( group_name)); RenderThread::Get()->RecordAction( UserMetricsAction("Plugin_BlockedByPolicy")); @@ -198,7 +198,7 @@ index 2951ee282f4c..f692717d5712 100644 break; } case chrome::mojom::PluginStatus::kBlockedNoLoading: { -@@ -976,7 +980,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( +@@ -975,7 +979,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( IDR_BLOCKED_PLUGIN_HTML, l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_NO_LOADING, group_name)); diff --git a/patch/patches/compositor_1368.patch b/patch/patches/compositor_1368.patch index b2ea8a3af..bc6b51476 100644 --- a/patch/patches/compositor_1368.patch +++ b/patch/patches/compositor_1368.patch @@ -1,5 +1,5 @@ diff --git content/browser/compositor/gpu_process_transport_factory.cc content/browser/compositor/gpu_process_transport_factory.cc -index 20fa23379c4b..87d8ba911d53 100644 +index 511d805187b1..5fb01fee0378 100644 --- content/browser/compositor/gpu_process_transport_factory.cc +++ content/browser/compositor/gpu_process_transport_factory.cc @@ -494,10 +494,20 @@ void GpuProcessTransportFactory::EstablishedGpuChannel( @@ -26,10 +26,10 @@ index 20fa23379c4b..87d8ba911d53 100644 } else { DCHECK(context_provider); diff --git ui/compositor/compositor.h ui/compositor/compositor.h -index fccba71bf856..85e305a783b9 100644 +index a84fdb5a29fc..7845c07d7c96 100644 --- ui/compositor/compositor.h +++ ui/compositor/compositor.h -@@ -24,6 +24,7 @@ +@@ -25,6 +25,7 @@ #include "components/viz/common/surfaces/frame_sink_id.h" #include "components/viz/common/surfaces/local_surface_id.h" #include "components/viz/host/host_frame_sink_client.h" @@ -37,7 +37,7 @@ index fccba71bf856..85e305a783b9 100644 #include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkMatrix44.h" #include "ui/compositor/compositor_animation_observer.h" -@@ -193,6 +194,17 @@ class COMPOSITOR_EXPORT ContextFactory { +@@ -200,6 +201,17 @@ class COMPOSITOR_EXPORT ContextFactory { virtual bool SyncTokensRequiredForDisplayCompositor() = 0; }; @@ -55,7 +55,7 @@ index fccba71bf856..85e305a783b9 100644 // Compositor object to take care of GPU painting. // A Browser compositor object is responsible for generating the final // displayable form of pixels comprising a single widget's contents. It draws an -@@ -233,6 +245,9 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient, +@@ -240,6 +252,9 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient, // Schedules a redraw of the layer tree associated with this compositor. void ScheduleDraw(); @@ -65,7 +65,7 @@ index fccba71bf856..85e305a783b9 100644 // Sets the root of the layer tree drawn by this Compositor. The root layer // must have no parent. The compositor's root layer is reset if the root layer // is destroyed. NULL can be passed to reset the root layer, in which case the -@@ -455,6 +470,8 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient, +@@ -463,6 +478,8 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient, ui::ContextFactory* context_factory_; ui::ContextFactoryPrivate* context_factory_private_; diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index c0aafe8e6..45b2e18fd 100644 --- a/patch/patches/content_2015.patch +++ b/patch/patches/content_2015.patch @@ -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 2a4d9d9b8819..c0e3a92c39eb 100644 +index f3b67e2746f4..9eb3e839cb55 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 36b5e3bf6853..9303e53b9094 100644 +index a15c21ad7cb1..f85e40276900 100644 --- content/browser/frame_host/render_frame_host_impl.cc +++ content/browser/frame_host/render_frame_host_impl.cc -@@ -842,8 +842,8 @@ void RenderFrameHostImpl::CreateNetworkServiceDefaultFactory( +@@ -843,8 +843,8 @@ void RenderFrameHostImpl::CreateNetworkServiceDefaultFactory( RenderFrameDevToolsAgentHost::WillCreateURLLoaderFactory( this, false /* is_navigation */, false /* is_download */, &default_factory_request); @@ -108,7 +108,7 @@ index 36b5e3bf6853..9303e53b9094 100644 if (g_create_network_factory_callback_for_test.Get().is_null()) { storage_partition->GetNetworkContext()->CreateURLLoaderFactory( std::move(default_factory_request), std::move(params)); -@@ -1672,6 +1672,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError( +@@ -1673,6 +1673,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError( if (GetNavigationHandle()) { GetNavigationHandle()->set_net_error_code( static_cast(params.error_code)); @@ -116,7 +116,7 @@ index 36b5e3bf6853..9303e53b9094 100644 } frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params); -@@ -4050,9 +4051,9 @@ void RenderFrameHostImpl::CommitNavigation( +@@ -4072,9 +4073,9 @@ void RenderFrameHostImpl::CommitNavigation( // is used. Currently we have this here to make sure we have non-racy // situation (https://crbug.com/849929). DCHECK(base::FeatureList::IsEnabled(network::features::kNetworkService)); @@ -325,7 +325,7 @@ index 3b610b1f554e..7c439e060779 100644 WebPluginInfo* plugin) = 0; diff --git content/public/renderer/content_renderer_client.h content/public/renderer/content_renderer_client.h -index a2dc7a811e75..416918123564 100644 +index 0cc6c47ac897..c9aefc3593b2 100644 --- content/public/renderer/content_renderer_client.h +++ content/public/renderer/content_renderer_client.h @@ -74,6 +74,9 @@ class CONTENT_EXPORT ContentRendererClient { @@ -338,7 +338,7 @@ index a2dc7a811e75..416918123564 100644 // Notifies that a new RenderFrame has been created. virtual void RenderFrameCreated(RenderFrame* render_frame) {} -@@ -348,6 +351,10 @@ class CONTENT_EXPORT ContentRendererClient { +@@ -341,6 +344,10 @@ class CONTENT_EXPORT ContentRendererClient { // This method may invalidate the frame. virtual void RunScriptsAtDocumentIdle(RenderFrame* render_frame) {} @@ -364,10 +364,10 @@ index 2f1f46075b27..94f300dfea5d 100644 virtual void FocusedNodeChanged(const blink::WebNode& node) {} diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc -index 61ee2a0d203a..f03a4ff9ee98 100644 +index 1d1d155ca2da..d8c1241d47da 100644 --- content/renderer/render_frame_impl.cc +++ content/renderer/render_frame_impl.cc -@@ -3471,7 +3471,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin( +@@ -3506,7 +3506,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin( std::string mime_type; bool found = false; Send(new FrameHostMsg_GetPluginInfo( @@ -377,7 +377,7 @@ index 61ee2a0d203a..f03a4ff9ee98 100644 params.mime_type.Utf8(), &found, &info, &mime_type)); if (!found) return nullptr; -@@ -3836,6 +3837,8 @@ void RenderFrameImpl::FrameDetached(DetachType type) { +@@ -3871,6 +3872,8 @@ void RenderFrameImpl::FrameDetached(DetachType type) { void RenderFrameImpl::FrameFocused() { Send(new FrameHostMsg_FrameFocused(routing_id_)); @@ -387,7 +387,7 @@ index 61ee2a0d203a..f03a4ff9ee98 100644 void RenderFrameImpl::WillCommitProvisionalLoad() { diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc -index ca6a21b03082..a090b13d65e5 100644 +index ace2680587e3..d021d88eeb96 100644 --- content/renderer/render_thread_impl.cc +++ content/renderer/render_thread_impl.cc @@ -866,6 +866,8 @@ void RenderThreadImpl::Init( @@ -400,10 +400,10 @@ index ca6a21b03082..a090b13d65e5 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 a9b86c68fe50..41dc5202b0e4 100644 +index 2e5d8a2fe4b1..10f1e09acfe8 100644 --- content/renderer/renderer_blink_platform_impl.cc +++ content/renderer/renderer_blink_platform_impl.cc -@@ -1121,6 +1121,14 @@ void RendererBlinkPlatformImpl::RequestPurgeMemory() { +@@ -1111,6 +1111,14 @@ void RendererBlinkPlatformImpl::RequestPurgeMemory() { base::MemoryCoordinatorClientRegistry::GetInstance()->PurgeMemory(); } @@ -419,10 +419,10 @@ index a9b86c68fe50..41dc5202b0e4 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 bebcd933b8ce..d2deaab2d114 100644 +index 3fb1af2bdb57..fb71d1b8f61c 100644 --- content/renderer/renderer_blink_platform_impl.h +++ content/renderer/renderer_blink_platform_impl.h -@@ -225,6 +225,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { +@@ -218,6 +218,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { mojo::ScopedDataPipeConsumerHandle handle) override; void RequestPurgeMemory() override; diff --git a/patch/patches/crashpad_1995.patch b/patch/patches/crashpad_1995.patch index 6a0b480b1..677ab5dc1 100644 --- a/patch/patches/crashpad_1995.patch +++ b/patch/patches/crashpad_1995.patch @@ -597,10 +597,10 @@ 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..fd2269768877 100644 +index 78868e2664bb..ec7c60c62efa 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) { +@@ -133,7 +133,9 @@ bool HandleDebugURL(const GURL& url, ui::PageTransition transition) { cc::switches::kEnableGpuBenchmarking) && (PageTransitionCoreTypeIs(transition, ui::PAGE_TRANSITION_TYPED)); diff --git a/patch/patches/crashpad_tp_1995.patch b/patch/patches/crashpad_tp_1995.patch index db18ed75c..9df4bc20e 100644 --- a/patch/patches/crashpad_tp_1995.patch +++ b/patch/patches/crashpad_tp_1995.patch @@ -146,7 +146,7 @@ index a2b0c74636f4..01370fdc20d9 100644 struct Data; diff --git third_party/crashpad/crashpad/handler/BUILD.gn third_party/crashpad/crashpad/handler/BUILD.gn -index 24251b0a9398..5eff85d4dbb5 100644 +index 3bb5de5dd1f0..ee61b85823f9 100644 --- third_party/crashpad/crashpad/handler/BUILD.gn +++ third_party/crashpad/crashpad/handler/BUILD.gn @@ -12,6 +12,7 @@ @@ -179,10 +179,10 @@ index 24251b0a9398..5eff85d4dbb5 100644 cflags = [ "/wd4201" ] # nonstandard extension used : nameless struct/union } diff --git third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc -index 4783ecb252b1..d94295cfa9fb 100644 +index 205d860f9139..e077a835a19e 100644 --- third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc +++ third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc -@@ -264,6 +264,8 @@ CrashReportUploadThread::UploadResult CrashReportUploadThread::UploadReport( +@@ -268,6 +268,8 @@ CrashReportUploadThread::UploadResult CrashReportUploadThread::UploadReport( if (minidump_process_snapshot.Initialize(reader)) { parameters = BreakpadHTTPFormParametersFromMinidump(&minidump_process_snapshot); diff --git a/patch/patches/devtools_product_2300.patch b/patch/patches/devtools_product_2300.patch index ec84d541d..974bd6934 100644 --- a/patch/patches/devtools_product_2300.patch +++ b/patch/patches/devtools_product_2300.patch @@ -1,5 +1,5 @@ diff --git content/browser/devtools/devtools_http_handler.cc content/browser/devtools/devtools_http_handler.cc -index eaf44246e9ec..8b1af37e2fd1 100644 +index 3ed1929ba192..ef0d34b4b73c 100644 --- content/browser/devtools/devtools_http_handler.cc +++ content/browser/devtools/devtools_http_handler.cc @@ -567,7 +567,7 @@ void DevToolsHttpHandler::OnJsonRequest( diff --git a/patch/patches/extensions_1947.patch b/patch/patches/extensions_1947.patch index 3d2288ee4..5202bc26c 100644 --- a/patch/patches/extensions_1947.patch +++ b/patch/patches/extensions_1947.patch @@ -57,7 +57,7 @@ index 29386263f0db..11fa39c54d43 100644 // If |new_instance| is a new SiteInstance for a subframe that requires a // dedicated process, set its process reuse policy so that such subframes are diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h -index fd5d62fee117..b86f2d84457e 100644 +index 2cd82bfafcf8..b8eb09579ec7 100644 --- content/public/browser/content_browser_client.h +++ content/public/browser/content_browser_client.h @@ -394,6 +394,13 @@ class CONTENT_EXPORT ContentBrowserClient { diff --git a/patch/patches/gn_config.patch b/patch/patches/gn_config.patch index 29aee6a25..bf0f02859 100644 --- a/patch/patches/gn_config.patch +++ b/patch/patches/gn_config.patch @@ -12,7 +12,7 @@ index ec3d38717a85..fbf80cae5500 100644 # https://crbug.com/474506. "//clank/java/BUILD.gn", diff --git BUILD.gn BUILD.gn -index 9d067467e5d2..b40fb00c35a9 100644 +index 4e777abccf7b..6e18897c4f22 100644 --- BUILD.gn +++ BUILD.gn @@ -186,6 +186,7 @@ group("gn_all") { diff --git a/patch/patches/linux_build.patch b/patch/patches/linux_build.patch index 8cb2f11ec..9de48c5fb 100644 --- a/patch/patches/linux_build.patch +++ b/patch/patches/linux_build.patch @@ -1,8 +1,8 @@ diff --git build/config/compiler/BUILD.gn build/config/compiler/BUILD.gn -index 959a59231746..67335e852219 100644 +index 7bba7dfe3db7..dd8610b5d7f0 100644 --- build/config/compiler/BUILD.gn +++ build/config/compiler/BUILD.gn -@@ -152,7 +152,7 @@ declare_args() { +@@ -153,7 +153,7 @@ declare_args() { !use_clang_coverage && !(is_android && use_order_profiling) && (use_lld || (use_gold && diff --git a/patch/patches/message_loop.patch b/patch/patches/message_loop.patch index 983993d55..de7f91e08 100644 --- a/patch/patches/message_loop.patch +++ b/patch/patches/message_loop.patch @@ -1,8 +1,8 @@ diff --git base/message_loop/message_loop.cc base/message_loop/message_loop.cc -index 4571c726ec4a..ad1479647400 100644 +index 3793fa284744..b2dfc6efd1f7 100644 --- base/message_loop/message_loop.cc +++ base/message_loop/message_loop.cc -@@ -573,6 +573,9 @@ MessageLoopForUI::MessageLoopForUI(Type type) : MessageLoop(type) { +@@ -606,6 +606,9 @@ MessageLoopForUI::MessageLoopForUI(Type type) : MessageLoop(type) { #endif } @@ -13,10 +13,10 @@ index 4571c726ec4a..ad1479647400 100644 MessageLoopCurrentForUI MessageLoopForUI::current() { return MessageLoopCurrentForUI::Get(); diff --git base/message_loop/message_loop.h base/message_loop/message_loop.h -index 6010333616eb..f9479daaa4b8 100644 +index 1418c133bf81..7fb7d1e703ff 100644 --- base/message_loop/message_loop.h +++ base/message_loop/message_loop.h -@@ -343,6 +343,7 @@ class BASE_EXPORT MessageLoop : public MessagePump::Delegate, +@@ -358,6 +358,7 @@ class BASE_EXPORT MessageLoop : public MessagePump::Delegate, class BASE_EXPORT MessageLoopForUI : public MessageLoop { public: explicit MessageLoopForUI(Type type = TYPE_UI); diff --git a/patch/patches/pdfium_print_549365.patch b/patch/patches/pdfium_print_549365.patch index 5e49f973c..406cdd707 100644 --- a/patch/patches/pdfium_print_549365.patch +++ b/patch/patches/pdfium_print_549365.patch @@ -1,5 +1,5 @@ diff --git BUILD.gn BUILD.gn -index 135d392e0..a14fec518 100644 +index 24dfd1df5..da1616c50 100644 --- BUILD.gn +++ BUILD.gn @@ -239,6 +239,10 @@ jumbo_static_library("pdfium") { @@ -14,7 +14,7 @@ index 135d392e0..a14fec518 100644 jumbo_static_library("test_support") { diff --git fpdfsdk/fpdf_view.cpp fpdfsdk/fpdf_view.cpp -index 5fdc82af7..47a3cdaab 100644 +index c44d582fd..6debf1e38 100644 --- fpdfsdk/fpdf_view.cpp +++ fpdfsdk/fpdf_view.cpp @@ -38,6 +38,7 @@ diff --git a/patch/patches/prefs_content_1161.patch b/patch/patches/prefs_content_1161.patch index e5e8d4d2d..d2efd4be1 100644 --- a/patch/patches/prefs_content_1161.patch +++ b/patch/patches/prefs_content_1161.patch @@ -35,14 +35,14 @@ 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 03d9cda9f95d..b5e24523bb1c 100644 +index f268c8301136..e9e182734eb5 100644 --- content/renderer/render_view_impl.cc +++ content/renderer/render_view_impl.cc -@@ -1222,6 +1222,7 @@ void RenderViewImpl::SendFrameStateUpdates() { +@@ -1270,6 +1270,7 @@ void RenderViewImpl::SendFrameStateUpdates() { void RenderViewImpl::ApplyWebPreferencesInternal(const WebPreferences& prefs, blink::WebView* web_view) { ApplyWebPreferences(prefs, web_view); + web_view->SetBaseBackgroundColor(prefs.base_background_color); } - // blink::WebViewClient ------------------------------------------------------ + // IPC::Listener ------------------------------------------------------------- diff --git a/patch/patches/print_header_footer_1478_1565.patch b/patch/patches/print_header_footer_1478_1565.patch index 757a5da0c..9eb09109f 100644 --- a/patch/patches/print_header_footer_1478_1565.patch +++ b/patch/patches/print_header_footer_1478_1565.patch @@ -1,8 +1,8 @@ diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn -index c6d7d9d076a9..79fe6745a829 100644 +index b80097e3a61e..c93f1ade1676 100644 --- chrome/browser/ui/BUILD.gn +++ chrome/browser/ui/BUILD.gn -@@ -901,6 +901,7 @@ split_static_library("ui") { +@@ -894,6 +894,7 @@ jumbo_split_static_library("ui") { "//base:i18n", "//base/allocator:buildflags", "//cc/paint", @@ -253,7 +253,7 @@ index d29bb6aedecd..db7110ce80be 100644 #endif // COMPONENTS_PRINTING_COMMON_PRINT_MESSAGES_H_ diff --git components/printing/renderer/print_render_frame_helper.cc components/printing/renderer/print_render_frame_helper.cc -index c7ea5cf76aa6..ce0d1d10cd07 100644 +index 028de5baff30..9f218232052c 100644 --- components/printing/renderer/print_render_frame_helper.cc +++ components/printing/renderer/print_render_frame_helper.cc @@ -341,7 +341,6 @@ bool PrintingNodeOrPdfFrame(const blink::WebLocalFrame* frame, @@ -288,15 +288,7 @@ index c7ea5cf76aa6..ce0d1d10cd07 100644 // Helper function to scale and round an integer value with a double valued // scaling. -@@ -975,6 +971,7 @@ PrintRenderFrameHelper::PrintRenderFrameHelper( - notify_browser_of_print_failure_(true), - delegate_(std::move(delegate)), - print_node_in_progress_(false), -+ force_print_preview_(false), - is_loading_(false), - is_scripted_preview_delayed_(false), - ipc_nesting_level_(0), -@@ -1036,10 +1033,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) { +@@ -1023,10 +1019,8 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) { return; if (g_is_preview_enabled) { @@ -307,7 +299,7 @@ index c7ea5cf76aa6..ce0d1d10cd07 100644 } else { auto weak_this = weak_ptr_factory_.GetWeakPtr(); web_frame->DispatchBeforePrintEvent(); -@@ -1067,10 +1062,10 @@ bool PrintRenderFrameHelper::OnMessageReceived(const IPC::Message& message) { +@@ -1054,10 +1048,10 @@ bool PrintRenderFrameHelper::OnMessageReceived(const IPC::Message& message) { IPC_BEGIN_MESSAGE_MAP(PrintRenderFrameHelper, message) IPC_MESSAGE_HANDLER(PrintMsg_PrintPages, OnPrintPages) IPC_MESSAGE_HANDLER(PrintMsg_PrintForSystemDialog, OnPrintForSystemDialog) @@ -319,7 +311,7 @@ index c7ea5cf76aa6..ce0d1d10cd07 100644 IPC_MESSAGE_HANDLER(PrintMsg_ClosePrintPreviewDialog, OnClosePrintPreviewDialog) #endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) -@@ -1152,7 +1147,6 @@ void PrintRenderFrameHelper::UpdateFrameMarginsCssInfo( +@@ -1139,7 +1133,6 @@ void PrintRenderFrameHelper::UpdateFrameMarginsCssInfo( ignore_css_margins_ = (margins_type != DEFAULT_MARGINS); } @@ -327,7 +319,7 @@ index c7ea5cf76aa6..ce0d1d10cd07 100644 void PrintRenderFrameHelper::OnPrintPreview( const base::DictionaryValue& settings) { if (ipc_nesting_level_ > 1) -@@ -1407,7 +1401,6 @@ int PrintRenderFrameHelper::GetFitToPageScaleFactor( +@@ -1394,7 +1387,6 @@ int PrintRenderFrameHelper::GetFitToPageScaleFactor( printable_height / static_cast(uniform_page_size.height); return static_cast(100.0f * std::min(scale_width, scale_height)); } @@ -335,7 +327,7 @@ index c7ea5cf76aa6..ce0d1d10cd07 100644 void PrintRenderFrameHelper::OnPrintingDone(bool success) { if (ipc_nesting_level_ > 1) -@@ -1422,7 +1415,6 @@ void PrintRenderFrameHelper::OnSetPrintingEnabled(bool enabled) { +@@ -1409,7 +1401,6 @@ void PrintRenderFrameHelper::OnSetPrintingEnabled(bool enabled) { is_printing_enabled_ = enabled; } @@ -343,7 +335,7 @@ index c7ea5cf76aa6..ce0d1d10cd07 100644 void PrintRenderFrameHelper::OnInitiatePrintPreview(bool has_selection) { if (ipc_nesting_level_ > 1) return; -@@ -1433,7 +1425,9 @@ void PrintRenderFrameHelper::OnInitiatePrintPreview(bool has_selection) { +@@ -1420,7 +1411,9 @@ void PrintRenderFrameHelper::OnInitiatePrintPreview(bool has_selection) { // that instead. auto plugin = delegate_->GetPdfElement(frame); if (!plugin.IsNull()) { @@ -353,7 +345,7 @@ index c7ea5cf76aa6..ce0d1d10cd07 100644 return; } print_preview_context_.InitWithFrame(frame); -@@ -1442,6 +1436,7 @@ void PrintRenderFrameHelper::OnInitiatePrintPreview(bool has_selection) { +@@ -1429,6 +1422,7 @@ void PrintRenderFrameHelper::OnInitiatePrintPreview(bool has_selection) { : PRINT_PREVIEW_USER_INITIATED_ENTIRE_FRAME); } @@ -361,7 +353,7 @@ index c7ea5cf76aa6..ce0d1d10cd07 100644 void PrintRenderFrameHelper::OnClosePrintPreviewDialog() { print_preview_context_.source_frame()->DispatchAfterPrintEvent(); } -@@ -1529,11 +1524,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) { +@@ -1516,11 +1510,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) { print_node_in_progress_ = true; @@ -374,7 +366,7 @@ index c7ea5cf76aa6..ce0d1d10cd07 100644 } else { // Make a copy of the node, in case RenderView::OnContextMenuClosed() resets // its |context_menu_node_|. -@@ -1609,13 +1602,11 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, +@@ -1596,13 +1588,11 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, void PrintRenderFrameHelper::DidFinishPrinting(PrintingResult result) { int cookie = print_pages_params_ ? print_pages_params_->params.document_cookie : 0; @@ -388,7 +380,7 @@ index c7ea5cf76aa6..ce0d1d10cd07 100644 switch (result) { case OK: break; -@@ -1630,7 +1621,6 @@ void PrintRenderFrameHelper::DidFinishPrinting(PrintingResult result) { +@@ -1617,7 +1607,6 @@ void PrintRenderFrameHelper::DidFinishPrinting(PrintingResult result) { } break; @@ -396,7 +388,7 @@ index c7ea5cf76aa6..ce0d1d10cd07 100644 case FAIL_PREVIEW: if (!is_print_ready_metafile_sent_) { if (notify_browser_of_print_failure_) { -@@ -1648,7 +1638,6 @@ void PrintRenderFrameHelper::DidFinishPrinting(PrintingResult result) { +@@ -1635,7 +1624,6 @@ void PrintRenderFrameHelper::DidFinishPrinting(PrintingResult result) { cookie, ids)); print_preview_context_.Failed(false); break; @@ -404,7 +396,7 @@ index c7ea5cf76aa6..ce0d1d10cd07 100644 } prep_frame_view_.reset(); print_pages_params_.reset(); -@@ -1820,7 +1809,6 @@ bool PrintRenderFrameHelper::CalculateNumberOfPages(blink::WebLocalFrame* frame, +@@ -1807,7 +1795,6 @@ bool PrintRenderFrameHelper::CalculateNumberOfPages(blink::WebLocalFrame* frame, return true; } @@ -412,7 +404,7 @@ index c7ea5cf76aa6..ce0d1d10cd07 100644 bool PrintRenderFrameHelper::SetOptionsFromPdfDocument( PrintHostMsg_SetOptionsFromDocument_Params* options) { blink::WebLocalFrame* source_frame = print_preview_context_.source_frame(); -@@ -1914,7 +1902,6 @@ bool PrintRenderFrameHelper::UpdatePrintSettings( +@@ -1901,7 +1888,6 @@ bool PrintRenderFrameHelper::UpdatePrintSettings( print_preview_context_.set_error(PREVIEW_ERROR_INVALID_PRINTER_SETTINGS); return false; } @@ -420,7 +412,7 @@ index c7ea5cf76aa6..ce0d1d10cd07 100644 void PrintRenderFrameHelper::GetPrintSettingsFromUser( blink::WebLocalFrame* frame, -@@ -2071,7 +2058,6 @@ bool PrintRenderFrameHelper::CopyMetafileDataToReadOnlySharedMem( +@@ -2058,7 +2044,6 @@ bool PrintRenderFrameHelper::CopyMetafileDataToReadOnlySharedMem( return true; } @@ -428,16 +420,16 @@ index c7ea5cf76aa6..ce0d1d10cd07 100644 void PrintRenderFrameHelper::ShowScriptedPrintPreview() { if (is_scripted_preview_delayed_) { is_scripted_preview_delayed_ = false; -@@ -2197,7 +2183,6 @@ bool PrintRenderFrameHelper::PreviewPageRendered( +@@ -2184,7 +2169,6 @@ bool PrintRenderFrameHelper::PreviewPageRendered( Send(new PrintHostMsg_DidPreviewPage(routing_id(), preview_page_params, ids)); return true; } -#endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) - PrintRenderFrameHelper::PrintPreviewContext::PrintPreviewContext() - : total_page_count_(0), + PrintRenderFrameHelper::PrintPreviewContext::PrintPreviewContext() = default; + diff --git components/printing/renderer/print_render_frame_helper.h components/printing/renderer/print_render_frame_helper.h -index 6e2d7e1467b7..50b22292d021 100644 +index 947ab972c1ef..e3bb2c2efab4 100644 --- components/printing/renderer/print_render_frame_helper.h +++ components/printing/renderer/print_render_frame_helper.h @@ -149,10 +149,8 @@ class PrintRenderFrameHelper @@ -513,11 +505,11 @@ index 6e2d7e1467b7..50b22292d021 100644 @@ -523,6 +515,7 @@ class PrintRenderFrameHelper ScriptingThrottler scripting_throttler_; - bool print_node_in_progress_; -+ bool force_print_preview_; + bool print_node_in_progress_ = false; ++ bool force_print_preview_ = false; PrintPreviewContext print_preview_context_; - bool is_loading_; - bool is_scripted_preview_delayed_; + bool is_loading_ = false; + bool is_scripted_preview_delayed_ = false; diff --git components/printing_component_strings.grdp components/printing_component_strings.grdp index f157cbaec42e..5e3c3caa2aa2 100644 --- components/printing_component_strings.grdp diff --git a/patch/patches/rwh_background_color_1984.patch b/patch/patches/rwh_background_color_1984.patch index a3c2d1014..a532fbf5b 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 09168578786f..aa889848f83c 100644 +index 0eec5c7a6861..298e7b281ce3 100644 --- content/browser/renderer_host/render_widget_host_view_aura.cc +++ content/browser/renderer_host/render_widget_host_view_aura.cc @@ -719,10 +719,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() const { diff --git a/patch/patches/service_factory_1680.patch b/patch/patches/service_factory_1680.patch index 675ace414..04f25154d 100644 --- a/patch/patches/service_factory_1680.patch +++ b/patch/patches/service_factory_1680.patch @@ -97,7 +97,7 @@ index 2907619549ba..f941fba363b5 100644 SupervisedUserSettingsServiceFactory(); diff --git chrome/browser/ui/prefs/prefs_tab_helper.cc chrome/browser/ui/prefs/prefs_tab_helper.cc -index b9b2f059f694..a7b11cb75f22 100644 +index 7e3591ae2f28..55f0d4ce1e28 100644 --- chrome/browser/ui/prefs/prefs_tab_helper.cc +++ chrome/browser/ui/prefs/prefs_tab_helper.cc @@ -11,8 +11,8 @@ @@ -110,7 +110,7 @@ index b9b2f059f694..a7b11cb75f22 100644 #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" -@@ -389,12 +389,10 @@ class PrefWatcherFactory : public BrowserContextKeyedServiceFactory { +@@ -387,12 +387,10 @@ class PrefWatcherFactory : public BrowserContextKeyedServiceFactory { GetInstance()->GetServiceForBrowserContext(profile, true)); } @@ -125,7 +125,7 @@ index b9b2f059f694..a7b11cb75f22 100644 PrefWatcherFactory() : BrowserContextKeyedServiceFactory( "PrefWatcher", -@@ -415,6 +413,18 @@ class PrefWatcherFactory : public BrowserContextKeyedServiceFactory { +@@ -413,6 +411,18 @@ class PrefWatcherFactory : public BrowserContextKeyedServiceFactory { } }; diff --git a/patch/patches/storage_partition_1973.patch b/patch/patches/storage_partition_1973.patch index 7846ecee1..8805991bf 100644 --- a/patch/patches/storage_partition_1973.patch +++ b/patch/patches/storage_partition_1973.patch @@ -14,7 +14,7 @@ index f33713440f4f..f5cb6cd28a08 100644 } diff --git content/browser/background_fetch/background_fetch_service_impl.cc content/browser/background_fetch/background_fetch_service_impl.cc -index 596cfaa01092..f341bca174d5 100644 +index 6aa5ad29416a..77f7edfa51fe 100644 --- content/browser/background_fetch/background_fetch_service_impl.cc +++ content/browser/background_fetch/background_fetch_service_impl.cc @@ -39,8 +39,7 @@ void BackgroundFetchServiceImpl::Create( @@ -28,7 +28,7 @@ index 596cfaa01092..f341bca174d5 100644 origin, std::move(request))); } diff --git content/browser/blob_storage/chrome_blob_storage_context.cc content/browser/blob_storage/chrome_blob_storage_context.cc -index 0900dbb68986..57b991577178 100644 +index 842cb767674a..7cbe7b42d9e7 100644 --- content/browser/blob_storage/chrome_blob_storage_context.cc +++ content/browser/blob_storage/chrome_blob_storage_context.cc @@ -87,6 +87,11 @@ class BlobHandleImpl : public BlobHandle { @@ -73,10 +73,10 @@ index f061eca7c86b..0fc07c9c4eb8 100644 partition->GetBluetoothAllowedDevicesMap(); return allowed_devices_map->GetOrCreateAllowedDevices(GetOrigin()); diff --git content/browser/browser_context.cc content/browser/browser_context.cc -index 199a676de558..9d49cde507ac 100644 +index 0e30f88493de..3d0c6486447e 100644 --- content/browser/browser_context.cc +++ content/browser/browser_context.cc -@@ -152,11 +152,18 @@ StoragePartition* GetStoragePartitionFromConfig( +@@ -151,11 +151,18 @@ StoragePartition* GetStoragePartitionFromConfig( StoragePartitionImplMap* partition_map = GetStoragePartitionMap(browser_context); @@ -98,7 +98,7 @@ index 199a676de558..9d49cde507ac 100644 } void SaveSessionStateOnIOThread( -@@ -637,6 +644,11 @@ ServiceManagerConnection* BrowserContext::GetServiceManagerConnectionFor( +@@ -629,6 +636,11 @@ ServiceManagerConnection* BrowserContext::GetServiceManagerConnectionFor( BrowserContext::BrowserContext() : unique_id_(base::UnguessableToken::Create().ToString()) {} @@ -161,10 +161,10 @@ index ec9ab86d0ca6..0fe5219f1e84 100644 base::WeakPtrFactory weak_factory_; diff --git content/browser/download/download_manager_impl.cc content/browser/download/download_manager_impl.cc -index f8c137fe6d7a..235f9b93295e 100644 +index 813b1b5e15c9..8fc88073e723 100644 --- content/browser/download/download_manager_impl.cc +++ content/browser/download/download_manager_impl.cc -@@ -86,9 +86,9 @@ +@@ -87,9 +87,9 @@ namespace content { namespace { @@ -177,7 +177,7 @@ index f8c137fe6d7a..235f9b93295e 100644 DCHECK_CURRENTLY_ON(BrowserThread::UI); SiteInstance* site_instance = nullptr; -@@ -98,8 +98,7 @@ StoragePartitionImpl* GetStoragePartition(BrowserContext* context, +@@ -99,8 +99,7 @@ StoragePartitionImpl* GetStoragePartition(BrowserContext* context, if (render_frame_host_) site_instance = render_frame_host_->GetSiteInstance(); } @@ -187,7 +187,7 @@ index f8c137fe6d7a..235f9b93295e 100644 } bool CanRequestURLFromRenderer(int render_process_id, GURL url) { -@@ -265,7 +264,7 @@ base::FilePath GetTemporaryDownloadDirectory() { +@@ -266,7 +265,7 @@ base::FilePath GetTemporaryDownloadDirectory() { #endif scoped_refptr @@ -196,7 +196,7 @@ index f8c137fe6d7a..235f9b93295e 100644 RenderFrameHost* rfh, bool is_download) { network::mojom::URLLoaderFactoryPtrInfo proxy_factory_ptr_info; -@@ -282,7 +281,7 @@ CreateDownloadURLLoaderFactoryGetter(StoragePartitionImpl* storage_partition, +@@ -283,7 +282,7 @@ CreateDownloadURLLoaderFactoryGetter(StoragePartitionImpl* storage_partition, } } return base::MakeRefCounted( @@ -205,7 +205,7 @@ index f8c137fe6d7a..235f9b93295e 100644 std::move(proxy_factory_ptr_info), std::move(proxy_factory_request)); } -@@ -1079,7 +1078,7 @@ void DownloadManagerImpl::InterceptNavigationOnChecksComplete( +@@ -1092,7 +1091,7 @@ void DownloadManagerImpl::InterceptNavigationOnChecksComplete( tab_referrer_url = entry->GetReferrer().url; } } @@ -214,9 +214,22 @@ index f8c137fe6d7a..235f9b93295e 100644 GetStoragePartition(browser_context_, render_process_id, render_frame_id); in_progress_manager_->InterceptDownloadFromNavigation( std::move(resource_request), render_process_id, render_frame_id, site_url, -@@ -1129,10 +1128,8 @@ void DownloadManagerImpl::BeginResourceDownloadOnChecksComplete( +@@ -1142,10 +1141,8 @@ void DownloadManagerImpl::BeginResourceDownloadOnChecksComplete( base::MakeRefCounted( rfh, params->url()); + } else if (rfh && params->url().SchemeIsFileSystem()) { +- StoragePartitionImpl* storage_partition = +- static_cast( +- BrowserContext::GetStoragePartitionForSite(browser_context_, +- site_url)); ++ StoragePartition* storage_partition = ++ BrowserContext::GetStoragePartitionForSite(browser_context_, site_url); + std::string storage_domain; + auto* site_instance = rfh->GetSiteInstance(); + if (site_instance) { +@@ -1160,10 +1157,8 @@ void DownloadManagerImpl::BeginResourceDownloadOnChecksComplete( + params->url(), rfh, /*is_navigation=*/false, + storage_partition->GetFileSystemContext(), storage_domain); } else { - StoragePartitionImpl* storage_partition = - static_cast( @@ -228,10 +241,10 @@ index f8c137fe6d7a..235f9b93295e 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 0fb15c7c1bec..6fef758dc5a6 100644 +index 4676ec499cf5..4b464e0f5c23 100644 --- content/browser/loader/navigation_url_loader_impl.cc +++ content/browser/loader/navigation_url_loader_impl.cc -@@ -1012,7 +1012,7 @@ class NavigationURLLoaderImpl::URLLoaderRequestController +@@ -1014,7 +1014,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 +253,7 @@ index 0fb15c7c1bec..6fef758dc5a6 100644 false /* allow_wildcard */, &stale, &plugin, nullptr); if (stale) { -@@ -1344,7 +1344,7 @@ NavigationURLLoaderImpl::NavigationURLLoaderImpl( +@@ -1348,7 +1348,7 @@ NavigationURLLoaderImpl::NavigationURLLoaderImpl( network::mojom::URLLoaderFactoryPtrInfo proxied_factory_info; network::mojom::URLLoaderFactoryRequest proxied_factory_request; @@ -296,10 +309,10 @@ index 3cfa0bde2bca..96da49496944 100644 partition->GetPaymentAppContext(); diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc -index 3887d68c6d22..629c16724145 100644 +index 4d0e7c65f2ad..151cd09e63bc 100644 --- content/browser/renderer_host/render_process_host_impl.cc +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -739,11 +739,10 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data, +@@ -740,11 +740,10 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data, // Gets the correct render process to use for this SiteInstance. RenderProcessHost* GetProcessHost(SiteInstance* site_instance, bool is_for_guests_only) { @@ -315,7 +328,7 @@ index 3887d68c6d22..629c16724145 100644 // Is this the default storage partition? If it isn't, then just give it its // own non-shared process. -@@ -1341,7 +1340,7 @@ int RenderProcessHost::GetCurrentRenderProcessCountForTesting() { +@@ -1348,7 +1347,7 @@ int RenderProcessHost::GetCurrentRenderProcessCountForTesting() { // static RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost( BrowserContext* browser_context, @@ -324,7 +337,7 @@ index 3887d68c6d22..629c16724145 100644 SiteInstance* site_instance, bool is_for_guests_only) { if (g_render_process_host_factory_) { -@@ -1350,8 +1349,8 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost( +@@ -1357,8 +1356,8 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost( } if (!storage_partition_impl) { @@ -335,7 +348,7 @@ index 3887d68c6d22..629c16724145 100644 } // If we've made a StoragePartition for guests (e.g., for the tag), // stash the Site URL on it. This way, when we start a service worker inside -@@ -1376,7 +1375,7 @@ const unsigned int RenderProcessHostImpl::kMaxFrameDepthForPriority = +@@ -1383,7 +1382,7 @@ const unsigned int RenderProcessHostImpl::kMaxFrameDepthForPriority = RenderProcessHostImpl::RenderProcessHostImpl( BrowserContext* browser_context, @@ -344,7 +357,7 @@ index 3887d68c6d22..629c16724145 100644 bool is_for_guests_only) : fast_shutdown_started_(false), deleting_soon_(false), -@@ -1409,10 +1408,12 @@ RenderProcessHostImpl::RenderProcessHostImpl( +@@ -1416,10 +1415,12 @@ RenderProcessHostImpl::RenderProcessHostImpl( indexed_db_factory_(new IndexedDBDispatcherHost( id_, storage_partition_impl_->GetURLRequestContext(), @@ -359,7 +372,7 @@ index 3887d68c6d22..629c16724145 100644 id_)), channel_connected_(false), sent_render_process_ready_(false), -@@ -1447,7 +1448,8 @@ RenderProcessHostImpl::RenderProcessHostImpl( +@@ -1454,7 +1455,8 @@ RenderProcessHostImpl::RenderProcessHostImpl( } push_messaging_manager_.reset(new PushMessagingManager( @@ -369,7 +382,7 @@ index 3887d68c6d22..629c16724145 100644 AddObserver(indexed_db_factory_.get()); AddObserver(service_worker_dispatcher_host_.get()); -@@ -1780,6 +1782,17 @@ void RenderProcessHostImpl::ResetChannelProxy() { +@@ -1787,6 +1789,17 @@ void RenderProcessHostImpl::ResetChannelProxy() { void RenderProcessHostImpl::CreateMessageFilters() { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -387,16 +400,16 @@ index 3887d68c6d22..629c16724145 100644 MediaInternals* media_internals = MediaInternals::GetInstance(); // Add BrowserPluginMessageFilter to ensure it gets the first stab at messages // from guests. -@@ -1792,7 +1805,7 @@ void RenderProcessHostImpl::CreateMessageFilters() { +@@ -1801,7 +1814,7 @@ void RenderProcessHostImpl::CreateMessageFilters() { base::MakeRefCounted( GetID(), GetBrowserContext(), request_context.get(), widget_helper_.get(), media_internals, -- storage_partition_impl_->GetCacheStorageContext()); -+ cache_storage_context); +- storage_partition_impl_->GetCacheStorageContext(), ++ cache_storage_context, + storage_partition_impl_->GetGeneratedCodeCacheContext()); AddFilter(render_message_filter.get()); - render_frame_message_filter_ = new RenderFrameMessageFilter( -@@ -1819,10 +1832,10 @@ void RenderProcessHostImpl::CreateMessageFilters() { +@@ -1829,10 +1842,10 @@ void RenderProcessHostImpl::CreateMessageFilters() { ChromeBlobStorageContext::GetFor(browser_context); resource_message_filter_ = new ResourceMessageFilter( @@ -409,7 +422,7 @@ index 3887d68c6d22..629c16724145 100644 storage_partition_impl_->GetPrefetchURLLoaderService(), std::move(get_contexts_callback), BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); -@@ -1831,8 +1844,7 @@ void RenderProcessHostImpl::CreateMessageFilters() { +@@ -1841,8 +1854,7 @@ void RenderProcessHostImpl::CreateMessageFilters() { AddFilter( new MidiHost(GetID(), BrowserMainLoop::GetInstance()->midi_service())); @@ -419,7 +432,7 @@ index 3887d68c6d22..629c16724145 100644 peer_connection_tracker_host_ = new PeerConnectionTrackerHost(GetID()); AddFilter(peer_connection_tracker_host_.get()); -@@ -1854,10 +1866,6 @@ void RenderProcessHostImpl::CreateMessageFilters() { +@@ -1864,10 +1876,6 @@ void RenderProcessHostImpl::CreateMessageFilters() { AddFilter(new TraceMessageFilter(GetID())); AddFilter(new ResolveProxyMsgHelper(request_context.get())); @@ -430,7 +443,7 @@ index 3887d68c6d22..629c16724145 100644 } void RenderProcessHostImpl::BindCacheStorage( -@@ -1869,7 +1877,8 @@ void RenderProcessHostImpl::BindCacheStorage( +@@ -1879,7 +1887,8 @@ void RenderProcessHostImpl::BindCacheStorage( cache_storage_dispatcher_host_ = base::MakeRefCounted(); cache_storage_dispatcher_host_->Init( @@ -440,7 +453,7 @@ index 3887d68c6d22..629c16724145 100644 } // Send the binding to IO thread, because Cache Storage handles Mojo IPC on IO // thread entirely. -@@ -2019,7 +2028,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { +@@ -2029,7 +2038,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { registry->AddInterface(base::BindRepeating( &AppCacheDispatcherHost::Create, @@ -450,7 +463,7 @@ index 3887d68c6d22..629c16724145 100644 GetID())); AddUIThreadInterface(registry.get(), base::Bind(&FieldTrialRecorder::Create)); -@@ -2050,6 +2060,9 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { +@@ -2060,6 +2070,9 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { plugin_registry_.reset( new PluginRegistryImpl(GetBrowserContext()->GetResourceContext())); } @@ -561,10 +574,10 @@ index 2fe70f50171f..98244cd5ddf8 100644 std::move(client), creation_context_type, blink::MessagePortChannel(std::move(message_port)), diff --git content/browser/shared_worker/shared_worker_service_impl.cc content/browser/shared_worker/shared_worker_service_impl.cc -index 0727104684b1..ea180eca8131 100644 +index a1f30bf6c568..f736d07eb12f 100644 --- content/browser/shared_worker/shared_worker_service_impl.cc +++ content/browser/shared_worker/shared_worker_service_impl.cc -@@ -309,8 +309,8 @@ void SharedWorkerServiceImpl::CreateWorker( +@@ -339,8 +339,8 @@ void SharedWorkerServiceImpl::CreateWorker( BrowserThread::IO, FROM_HERE, base::BindOnce( &CreateScriptLoaderOnIO, @@ -574,12 +587,12 @@ index 0727104684b1..ea180eca8131 100644 + ->url_loader_factory_getter()), std::move(factory_bundle_for_browser), std::move(factory_bundle_for_renderer), service_worker_context_, - blob_url_loader_factory ? blob_url_loader_factory->Clone() + appcache_handle_core, diff --git content/browser/storage_partition_impl.h content/browser/storage_partition_impl.h -index e79f8775a1be..ab08f9adfc93 100644 +index 6f6c5c1e504a..097095a613dd 100644 --- content/browser/storage_partition_impl.h +++ content/browser/storage_partition_impl.h -@@ -94,7 +94,7 @@ class CONTENT_EXPORT StoragePartitionImpl +@@ -95,7 +95,7 @@ class CONTENT_EXPORT StoragePartitionImpl storage::FileSystemContext* GetFileSystemContext() override; storage::DatabaseTracker* GetDatabaseTracker() override; DOMStorageContextWrapper* GetDOMStorageContext() override; @@ -588,9 +601,9 @@ index e79f8775a1be..ab08f9adfc93 100644 IndexedDBContextImpl* GetIndexedDBContext() override; CacheStorageContextImpl* GetCacheStorageContext() override; ServiceWorkerContextWrapper* GetServiceWorkerContext() override; -@@ -134,14 +134,14 @@ class CONTENT_EXPORT StoragePartitionImpl +@@ -136,14 +136,14 @@ class CONTENT_EXPORT StoragePartitionImpl + void FlushNetworkInterfaceForTesting() override; void WaitForDeletionTasksForTesting() override; - void ResetURLLoaderFactoryForBrowserProcessForTesting() override; - BackgroundFetchContext* GetBackgroundFetchContext(); - BackgroundSyncContext* GetBackgroundSyncContext(); @@ -611,7 +624,7 @@ index e79f8775a1be..ab08f9adfc93 100644 // blink::mojom::StoragePartitionService interface. void OpenLocalStorage(const url::Origin& origin, -@@ -150,18 +150,19 @@ class CONTENT_EXPORT StoragePartitionImpl +@@ -152,18 +152,19 @@ class CONTENT_EXPORT StoragePartitionImpl const std::string& namespace_id, blink::mojom::SessionStorageNamespaceRequest request) override; @@ -635,7 +648,7 @@ index e79f8775a1be..ab08f9adfc93 100644 auto& bindings_for_testing() { return bindings_; } -@@ -172,10 +173,11 @@ class CONTENT_EXPORT StoragePartitionImpl +@@ -174,10 +175,11 @@ class CONTENT_EXPORT StoragePartitionImpl // one must use the "chrome-guest://blahblah" site URL to ensure that the // service worker stays in this StoragePartition. This is an empty GURL if // this StoragePartition is not for guests. @@ -709,10 +722,10 @@ index 653e22e0ee58..7b38a3ebd626 100644 RenderFrameHost* render_frame_host_; diff --git content/public/browser/browser_context.h content/public/browser/browser_context.h -index 4f794e25ac79..8f828995a4cc 100644 +index 28ba0306ffda..8d6fc0268d4b 100644 --- content/public/browser/browser_context.h +++ content/public/browser/browser_context.h -@@ -213,6 +213,8 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData { +@@ -217,6 +217,8 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData { BrowserContext(); @@ -721,7 +734,7 @@ index 4f794e25ac79..8f828995a4cc 100644 ~BrowserContext() override; // Shuts down the storage partitions associated to this browser context. -@@ -304,6 +306,14 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData { +@@ -311,6 +313,14 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData { const base::FilePath& partition_path, bool in_memory) = 0; @@ -737,7 +750,7 @@ index 4f794e25ac79..8f828995a4cc 100644 std::map; diff --git content/public/browser/storage_partition.h content/public/browser/storage_partition.h -index fe4b7cc8d990..1e533ebbbd07 100644 +index f55e28d79cda..297541d0a99a 100644 --- content/public/browser/storage_partition.h +++ content/public/browser/storage_partition.h @@ -14,8 +14,10 @@ @@ -751,7 +764,7 @@ index fe4b7cc8d990..1e533ebbbd07 100644 class GURL; -@@ -59,12 +61,28 @@ class ServiceWorkerContext; +@@ -60,12 +62,28 @@ class ServiceWorkerContext; class SharedWorkerService; class WebPackageContext; @@ -780,7 +793,7 @@ index fe4b7cc8d990..1e533ebbbd07 100644 // Defines what persistent state a child process can access. // // The StoragePartition defines the view each child process has of the -@@ -102,6 +120,7 @@ class CONTENT_EXPORT StoragePartition { +@@ -103,6 +121,7 @@ class CONTENT_EXPORT StoragePartition { virtual storage::FileSystemContext* GetFileSystemContext() = 0; virtual storage::DatabaseTracker* GetDatabaseTracker() = 0; virtual DOMStorageContext* GetDOMStorageContext() = 0; @@ -788,9 +801,9 @@ index fe4b7cc8d990..1e533ebbbd07 100644 virtual IndexedDBContext* GetIndexedDBContext() = 0; virtual ServiceWorkerContext* GetServiceWorkerContext() = 0; virtual SharedWorkerService* GetSharedWorkerService() = 0; -@@ -228,6 +247,26 @@ class CONTENT_EXPORT StoragePartition { - // a way to work-around https://crbug.com/857577. - virtual void ResetURLLoaderFactoryForBrowserProcessForTesting() {} +@@ -229,6 +248,26 @@ class CONTENT_EXPORT StoragePartition { + // Wait until all deletions tasks are finished. For test use only. + virtual void WaitForDeletionTasksForTesting() = 0; + virtual BackgroundFetchContext* GetBackgroundFetchContext() = 0; + virtual BackgroundSyncContext* GetBackgroundSyncContext() = 0; diff --git a/patch/patches/views_1749_2102.patch b/patch/patches/views_1749_2102.patch index 0080e9a68..872182fd4 100644 --- a/patch/patches/views_1749_2102.patch +++ b/patch/patches/views_1749_2102.patch @@ -39,7 +39,7 @@ index a19e6e937f87..817b7eada253 100644 virtual void MenuWillShow() {} diff --git ui/gfx/render_text.cc ui/gfx/render_text.cc -index 0754968fae7f..e3c0d9b81459 100644 +index c29ed3e92bc9..fc3fe3a6f12f 100644 --- ui/gfx/render_text.cc +++ ui/gfx/render_text.cc @@ -524,6 +524,14 @@ void RenderText::SetElideBehavior(ElideBehavior elide_behavior) { @@ -57,7 +57,7 @@ index 0754968fae7f..e3c0d9b81459 100644 void RenderText::SetDisplayRect(const Rect& r) { if (r != display_rect_) { display_rect_ = r; -@@ -1505,6 +1513,19 @@ void RenderText::OnTextAttributeChanged() { +@@ -1518,6 +1526,19 @@ void RenderText::OnTextAttributeChanged() { if (!multiline_ && replace_newline_chars_with_symbols_) base::ReplaceChars(layout_text_, kNewline, kNewlineSymbol, &layout_text_); @@ -78,7 +78,7 @@ index 0754968fae7f..e3c0d9b81459 100644 } diff --git ui/gfx/render_text.h ui/gfx/render_text.h -index 76c0db086c66..ed123ef02279 100644 +index 50eaca5b18eb..038d866fd8d1 100644 --- ui/gfx/render_text.h +++ ui/gfx/render_text.h @@ -307,6 +307,10 @@ class GFX_EXPORT RenderText { @@ -92,7 +92,7 @@ index 76c0db086c66..ed123ef02279 100644 const Rect& display_rect() const { return display_rect_; } void SetDisplayRect(const Rect& r); -@@ -903,6 +907,8 @@ class GFX_EXPORT RenderText { +@@ -906,6 +910,8 @@ class GFX_EXPORT RenderText { // Extra spacing placed between glyphs; used for obscured text styling. int glyph_spacing_ = 0; @@ -272,7 +272,7 @@ index b5baab3cbb18..ee82e1b05b60 100644 render_text->SetMaxLines(multi_line() ? max_lines() : 0); render_text->SetWordWrapBehavior(full_text_->word_wrap_behavior()); diff --git ui/views/controls/label.h ui/views/controls/label.h -index 1d35afeda78f..333f9c0f778d 100644 +index 9c78b30ab3a0..999eb4048f5c 100644 --- ui/views/controls/label.h +++ ui/views/controls/label.h @@ -153,6 +153,10 @@ class VIEWS_EXPORT Label : public View, 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 e33fdd411..7655de225 100644 --- a/patch/patches/views_widget_180_1481_1565_1677_1749.patch +++ b/patch/patches/views_widget_180_1481_1565_1677_1749.patch @@ -73,7 +73,7 @@ index 8ed6ffd3a284..91db6f55c396 100644 void SynchronizeVisualProperties(); diff --git content/browser/renderer_host/render_widget_host_view_event_handler.cc content/browser/renderer_host/render_widget_host_view_event_handler.cc -index 0f9d0a1c4269..cd9a314887cb 100644 +index 940d9c107664..f7a35655c757 100644 --- content/browser/renderer_host/render_widget_host_view_event_handler.cc +++ content/browser/renderer_host/render_widget_host_view_event_handler.cc @@ -30,6 +30,10 @@ @@ -87,7 +87,7 @@ index 0f9d0a1c4269..cd9a314887cb 100644 #if defined(OS_WIN) #include "content/browser/frame_host/render_frame_host_impl.h" #include "content/public/common/context_menu_params.h" -@@ -889,6 +893,14 @@ void RenderWidgetHostViewEventHandler::SetKeyboardFocus() { +@@ -891,6 +895,14 @@ void RenderWidgetHostViewEventHandler::SetKeyboardFocus() { ::SetFocus(hwnd); } } @@ -335,7 +335,7 @@ index c5e6df7ce811..8648b49b5753 100644 base::WeakPtrFactory weak_factory_; diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc -index e4e7fc6ce96c..9123f688646f 100644 +index a4a01235a2cd..a3ffe1c16270 100644 --- ui/views/widget/widget.cc +++ ui/views/widget/widget.cc @@ -132,6 +132,7 @@ Widget::InitParams::InitParams(Type type) @@ -369,7 +369,7 @@ index e4e7fc6ce96c..9123f688646f 100644 } // This must come after SetContentsView() or it might not be able to find // the correct NativeTheme (on Linux). See http://crbug.com/384492 -@@ -1103,10 +1109,16 @@ void Widget::OnNativeWidgetDestroyed() { +@@ -1099,10 +1105,16 @@ void Widget::OnNativeWidgetDestroyed() { } gfx::Size Widget::GetMinimumSize() const { @@ -387,10 +387,10 @@ index e4e7fc6ce96c..9123f688646f 100644 } diff --git ui/views/widget/widget.h ui/views/widget/widget.h -index 6862cfb45d08..d0674041b075 100644 +index c92fd03abc31..f787d9892508 100644 --- ui/views/widget/widget.h +++ ui/views/widget/widget.h -@@ -252,6 +252,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate, +@@ -249,6 +249,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate, // Whether the widget should be maximized or minimized. ui::WindowShowState show_state; gfx::NativeView parent; diff --git a/patch/patches/web_contents_1257_1565.patch b/patch/patches/web_contents_1257_1565.patch index 57e68dd22..0f2fed10f 100644 --- a/patch/patches/web_contents_1257_1565.patch +++ b/patch/patches/web_contents_1257_1565.patch @@ -1,8 +1,8 @@ diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc -index 26384f823b51..0582c1a753af 100644 +index ccde2311b622..d0df241f6f22 100644 --- content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc -@@ -1931,21 +1931,30 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { +@@ -1935,21 +1935,30 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { std::string unique_name; frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name); @@ -45,7 +45,7 @@ index 26384f823b51..0582c1a753af 100644 CHECK(render_view_host_delegate_view_); CHECK(view_.get()); -@@ -2622,6 +2631,15 @@ void WebContentsImpl::CreateNewWindow( +@@ -2626,6 +2635,15 @@ void WebContentsImpl::CreateNewWindow( create_params.renderer_initiated_creation = main_frame_route_id != MSG_ROUTING_NONE; @@ -61,7 +61,7 @@ index 26384f823b51..0582c1a753af 100644 std::unique_ptr new_contents; if (!is_guest) { create_params.context = view_->GetNativeView(); -@@ -2652,7 +2670,7 @@ void WebContentsImpl::CreateNewWindow( +@@ -2656,7 +2674,7 @@ void WebContentsImpl::CreateNewWindow( // TODO(brettw): It seems bogus that we have to call this function on the // newly created object and give it one of its own member variables. new_view->CreateViewForWidget( @@ -70,7 +70,7 @@ index 26384f823b51..0582c1a753af 100644 } // Save the created window associated with the route so we can show it // later. -@@ -5983,7 +6001,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() { +@@ -6000,7 +6018,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() { void WebContentsImpl::CreateRenderWidgetHostViewForRenderManager( RenderViewHost* render_view_host) { RenderWidgetHostViewBase* rwh_view = @@ -95,7 +95,7 @@ index df508da0aef2..f6f4bf42b108 100644 WebContents::CreateParams::CreateParams(const CreateParams& other) = default; diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h -index 0f82f91e437c..1c1e5e8f60bd 100644 +index b26563cd2cae..33d245c91cbb 100644 --- content/public/browser/web_contents.h +++ content/public/browser/web_contents.h @@ -76,9 +76,11 @@ class BrowserPluginGuestDelegate; diff --git a/patch/patches/webkit_plugin_info_2015.patch b/patch/patches/webkit_plugin_info_2015.patch index 1f8f7a4a1..c6a1463dd 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 f927253a7e0b..c537ed1b117b 100644 +index b70b944d371c..5f4649151baa 100644 --- third_party/blink/public/platform/platform.h +++ third_party/blink/public/platform/platform.h -@@ -710,6 +710,11 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -682,6 +682,11 @@ class BLINK_PLATFORM_EXPORT Platform { // runs during Chromium's build step). virtual bool IsTakingV8ContextSnapshot() { return false; } @@ -44,31 +44,31 @@ 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 976bae9c792b..10fb75b0af57 100644 +index d250bb01f5cf..ae77e162e039 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 -@@ -324,6 +324,8 @@ WebDevToolsAgentImpl::Session::Session( +@@ -332,6 +332,8 @@ WebDevToolsAgentImpl::Session::Session( &WebDevToolsAgentImpl::Session::Detach, WrapWeakPersistent(this))); - InitializeInspectorSession(reattach_state); + InitializeInspectorSession(reattach_state, std::move(reattach_session_state)); + + Platform::Current()->DevToolsAgentAttached(); } WebDevToolsAgentImpl::Session::~Session() { -@@ -349,6 +351,7 @@ void WebDevToolsAgentImpl::Session::Detach() { +@@ -357,6 +359,7 @@ void WebDevToolsAgentImpl::Session::Detach() { io_session_->DeleteSoon(); io_session_ = nullptr; inspector_session_->Dispose(); + Platform::Current()->DevToolsAgentDetached(); } - void WebDevToolsAgentImpl::Session::SendProtocolResponse(int session_id, + void WebDevToolsAgentImpl::Session::SendProtocolResponse( diff --git third_party/blink/renderer/core/frame/local_frame.cc third_party/blink/renderer/core/frame/local_frame.cc -index 464a41e6f278..7e29a6a66bf4 100644 +index 4ad61b99668c..bb7da96dbe5c 100644 --- third_party/blink/renderer/core/frame/local_frame.cc +++ third_party/blink/renderer/core/frame/local_frame.cc -@@ -1264,7 +1264,7 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() { +@@ -1265,7 +1265,7 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() { PluginData* LocalFrame::GetPluginData() const { if (!Loader().AllowPlugins(kNotAboutToInstantiatePlugin)) return nullptr; @@ -78,7 +78,7 @@ index 464a41e6f278..7e29a6a66bf4 100644 } diff --git third_party/blink/renderer/core/page/page.cc third_party/blink/renderer/core/page/page.cc -index 0f42c3e762d3..4836763bfff9 100644 +index c1140f566f50..2242209df9f6 100644 --- third_party/blink/renderer/core/page/page.cc +++ third_party/blink/renderer/core/page/page.cc @@ -164,7 +164,8 @@ Page::Page(PageClients& page_clients) @@ -141,7 +141,7 @@ index 0f42c3e762d3..4836763bfff9 100644 page->NotifyPluginsChanged(); } } -@@ -733,7 +753,8 @@ void Page::Trace(blink::Visitor* visitor) { +@@ -734,7 +754,8 @@ void Page::Trace(blink::Visitor* visitor) { visitor->Trace(overscroll_controller_); visitor->Trace(link_highlights_); visitor->Trace(main_frame_); @@ -152,7 +152,7 @@ index 0f42c3e762d3..4836763bfff9 100644 visitor->Trace(plugins_changed_observers_); visitor->Trace(next_related_page_); diff --git third_party/blink/renderer/core/page/page.h third_party/blink/renderer/core/page/page.h -index 1be040296b6e..d3472a25c1ff 100644 +index 41f555af82a0..c2f452e61072 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, @@ -165,7 +165,7 @@ index 1be040296b6e..d3472a25c1ff 100644 // Resets the plugin data for all pages in the renderer process and notifies // PluginsChangedObservers. -@@ -368,7 +369,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized, +@@ -366,7 +367,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized, const Member overscroll_controller_; const Member link_highlights_; diff --git a/patch/patches/webkit_popups.patch b/patch/patches/webkit_popups.patch index c95e424cc..aa07d8920 100644 --- a/patch/patches/webkit_popups.patch +++ b/patch/patches/webkit_popups.patch @@ -20,7 +20,7 @@ index fcba33880932..ef0bf66f8a2b 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 2acc5921abeb..3e0c07dd6aa3 100644 +index 291d4b7a9195..73d413c45a9f 100644 --- third_party/blink/renderer/core/exported/web_view_impl.cc +++ third_party/blink/renderer/core/exported/web_view_impl.cc @@ -241,8 +241,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) { @@ -80,10 +80,10 @@ index 9055bbe708a8..dc51d1db9921 100644 TransformationMatrix device_emulation_transform_; diff --git third_party/blink/renderer/core/page/chrome_client_impl.cc third_party/blink/renderer/core/page/chrome_client_impl.cc -index 5656f762955e..d3ce4ebaf088 100644 +index 452a87d9f43d..84c562716d72 100644 --- third_party/blink/renderer/core/page/chrome_client_impl.cc +++ third_party/blink/renderer/core/page/chrome_client_impl.cc -@@ -809,7 +809,7 @@ bool ChromeClientImpl::HasOpenedPopup() const { +@@ -780,7 +780,7 @@ bool ChromeClientImpl::HasOpenedPopup() const { PopupMenu* ChromeClientImpl::OpenPopupMenu(LocalFrame& frame, HTMLSelectElement& select) { NotifyPopupOpeningObservers(); diff --git a/patch/patches/webui_2037.patch b/patch/patches/webui_2037.patch index 7d1b9f36c..7a8f16103 100644 --- a/patch/patches/webui_2037.patch +++ b/patch/patches/webui_2037.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc -index 25f26dda33cf..d041b972461c 100644 +index 327117d8344c..136ba5df36c8 100644 --- chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc +++ chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc @@ -18,6 +18,7 @@ @@ -35,7 +35,7 @@ index 25f26dda33cf..d041b972461c 100644 extensions::ExtensionRegistry::Get(profile); std::string extensions_list; diff --git chrome/browser/memory_details.cc chrome/browser/memory_details.cc -index 6dd7385d105f..1b8635f7569f 100644 +index abd72f75fa01..9566c1cea50a 100644 --- chrome/browser/memory_details.cc +++ chrome/browser/memory_details.cc @@ -16,6 +16,7 @@ diff --git a/patch/patches/webview_plugin_2020.patch b/patch/patches/webview_plugin_2020.patch index 1557355c6..3afed5b45 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 45d8533d283f..71e3b67d2554 100644 +index df8b3cdab7ca..940f176053b4 100644 --- chrome/app/generated_resources.grd +++ chrome/app/generated_resources.grd @@ -4457,7 +4457,7 @@ Keep your key file in a safe place. You will need it to create new versions of y diff --git a/patch/patches/win_rt_2274.patch b/patch/patches/win_rt_2274.patch index 4e7357c21..684b1b8ca 100644 --- a/patch/patches/win_rt_2274.patch +++ b/patch/patches/win_rt_2274.patch @@ -1,5 +1,5 @@ diff --git services/service_manager/sandbox/win/sandbox_win.cc services/service_manager/sandbox/win/sandbox_win.cc -index 7beb41460e7d..335e25b64552 100644 +index d330dd221cb6..43bc51b78e96 100644 --- services/service_manager/sandbox/win/sandbox_win.cc +++ services/service_manager/sandbox/win/sandbox_win.cc @@ -883,8 +883,11 @@ sandbox::ResultCode SandboxWin::StartSandboxedProcess( diff --git a/tests/ceftests/osr_display_unittest.cc b/tests/ceftests/osr_display_unittest.cc index 6ed7379d5..720d5bdc5 100644 --- a/tests/ceftests/osr_display_unittest.cc +++ b/tests/ceftests/osr_display_unittest.cc @@ -118,7 +118,7 @@ class DisplayTestHandler : public RoutingTestHandler, public CefRenderHandler { std::string GetPageContents(const std::string& name, const std::string& status) { - return "Page1"; }