diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 38dd02c75..d767ea5b5 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/71.0.3578.20', + 'chromium_checkout': 'refs/tags/71.0.3578.80', } diff --git a/libcef/browser/chrome_browser_process_stub.cc b/libcef/browser/chrome_browser_process_stub.cc index 6fa5b75c2..b5bf76095 100644 --- a/libcef/browser/chrome_browser_process_stub.cc +++ b/libcef/browser/chrome_browser_process_stub.cc @@ -244,8 +244,7 @@ const std::string& ChromeBrowserProcessStub::GetApplicationLocale() { } void ChromeBrowserProcessStub::SetApplicationLocale( - const std::string& actual_locale, - const std::string& preferred_locale) { + const std::string& actual_locale) { locale_ = actual_locale; } diff --git a/libcef/browser/chrome_browser_process_stub.h b/libcef/browser/chrome_browser_process_stub.h index d2794d42b..a7c05f897 100644 --- a/libcef/browser/chrome_browser_process_stub.h +++ b/libcef/browser/chrome_browser_process_stub.h @@ -75,8 +75,7 @@ class ChromeBrowserProcessStub : public BrowserProcess, printing::BackgroundPrintingManager* background_printing_manager() override; IntranetRedirectDetector* intranet_redirect_detector() override; const std::string& GetApplicationLocale() override; - void SetApplicationLocale(const std::string& actual_locale, - const std::string& preferred_locale) override; + void SetApplicationLocale(const std::string& actual_locale) override; DownloadStatusUpdater* download_status_updater() override; DownloadRequestLimiter* download_request_limiter() override; BackgroundModeManager* background_mode_manager() override; diff --git a/libcef/common/main_delegate.cc b/libcef/common/main_delegate.cc index be81861ab..f604c0f40 100644 --- a/libcef/common/main_delegate.cc +++ b/libcef/common/main_delegate.cc @@ -698,7 +698,7 @@ void CefMainDelegate::InitializeResourceBundle() { ui::ResourceBundle::InitSharedInstanceWithLocale( locale, &content_client_, ui::ResourceBundle::LOAD_COMMON_RESOURCES); if (!loaded_locale.empty() && g_browser_process) - g_browser_process->SetApplicationLocale(loaded_locale, locale); + g_browser_process->SetApplicationLocale(loaded_locale); ui::ResourceBundle& resource_bundle = ui::ResourceBundle::GetSharedInstance(); diff --git a/patch/patch.cfg b/patch/patch.cfg index 7e33c2e78..3e4b2abad 100644 --- a/patch/patch.cfg +++ b/patch/patch.cfg @@ -402,10 +402,5 @@ patches = [ # macOS: Fix crash when showing a select popup with CefDoMessageLoopWork. # https://bitbucket.org/chromiumembedded/cef/issues/2495 'name': 'message_pump_mac_2495', - }, - { - # Remove duplicate jsoncpp from OpenVR. - # https://bugs.chromium.org/p/chromium/issues/detail?id=780987 - 'name': 'openvr_jsoncpp_780987', } ] diff --git a/patch/patches/browser_child_frame_2507.patch b/patch/patches/browser_child_frame_2507.patch index e6ed7586e..5d489fd4e 100644 --- a/patch/patches/browser_child_frame_2507.patch +++ b/patch/patches/browser_child_frame_2507.patch @@ -1,8 +1,8 @@ diff --git content/browser/renderer_host/render_widget_host_view_child_frame.cc content/browser/renderer_host/render_widget_host_view_child_frame.cc -index 0ba4a669381e..dac7ba25ac0d 100644 +index 99d980ac4ca9..b7d2b3f10bfb 100644 --- content/browser/renderer_host/render_widget_host_view_child_frame.cc +++ content/browser/renderer_host/render_widget_host_view_child_frame.cc -@@ -652,6 +652,7 @@ void RenderWidgetHostViewChildFrame::SubmitCompositorFrame( +@@ -665,6 +665,7 @@ void RenderWidgetHostViewChildFrame::SubmitCompositorFrame( "RenderWidgetHostViewChildFrame::OnSwapCompositorFrame"); support_->SubmitCompositorFrame(local_surface_id, std::move(frame), std::move(hit_test_region_list)); @@ -10,7 +10,7 @@ index 0ba4a669381e..dac7ba25ac0d 100644 } void RenderWidgetHostViewChildFrame::OnDidNotProduceFrame( -@@ -935,7 +936,6 @@ void RenderWidgetHostViewChildFrame::OnFirstSurfaceActivation( +@@ -942,7 +943,6 @@ void RenderWidgetHostViewChildFrame::OnFirstSurfaceActivation( last_activated_surface_info_ = surface_info; has_frame_ = true; FirstSurfaceActivation(surface_info); diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index 85f8fa3c8..4d16e4370 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 ece19724354a..840899064205 100644 +index 8947045aed93..ae92887ad635 100644 --- chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn @@ -8,6 +8,7 @@ import("//build/config/features.gni") @@ -10,7 +10,7 @@ index ece19724354a..840899064205 100644 import("//chrome/common/features.gni") import("//components/feature_engagement/features.gni") import("//components/feed/features.gni") -@@ -1712,6 +1713,7 @@ jumbo_split_static_library("browser") { +@@ -1714,6 +1715,7 @@ jumbo_split_static_library("browser") { "//base:i18n", "//base/allocator:buildflags", "//cc", @@ -18,7 +18,7 @@ index ece19724354a..840899064205 100644 "//chrome:extra_resources", "//chrome:resources", "//chrome:strings", -@@ -1988,6 +1990,10 @@ jumbo_split_static_library("browser") { +@@ -1990,6 +1992,10 @@ jumbo_split_static_library("browser") { ] } @@ -29,7 +29,7 @@ index ece19724354a..840899064205 100644 if (is_android) { sources += [ "after_startup_task_utils_android.cc", -@@ -3592,7 +3598,7 @@ jumbo_split_static_library("browser") { +@@ -3596,7 +3602,7 @@ jumbo_split_static_library("browser") { ] } diff --git a/patch/patches/chrome_browser_net_export.patch b/patch/patches/chrome_browser_net_export.patch index a3b3431d2..0034a88b9 100644 --- a/patch/patches/chrome_browser_net_export.patch +++ b/patch/patches/chrome_browser_net_export.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/browser_process.h chrome/browser/browser_process.h -index 840e44398dc6..4835c5ddcd64 100644 +index 9b52c6682024..f188476b45ee 100644 --- chrome/browser/browser_process.h +++ chrome/browser/browser_process.h @@ -39,6 +39,10 @@ class SystemNetworkContextManager; @@ -24,10 +24,10 @@ index 840e44398dc6..4835c5ddcd64 100644 // network quality change events. virtual network::NetworkQualityTracker* network_quality_tracker() = 0; diff --git chrome/browser/browser_process_impl.cc chrome/browser/browser_process_impl.cc -index 827c58d28114..7a0a31aeb654 100644 +index 0c18c4e54307..bc816cfae4d0 100644 --- chrome/browser/browser_process_impl.cc +++ chrome/browser/browser_process_impl.cc -@@ -662,6 +662,10 @@ BrowserProcessImpl::system_network_context_manager() { +@@ -665,6 +665,10 @@ BrowserProcessImpl::system_network_context_manager() { return SystemNetworkContextManager::GetInstance(); } @@ -39,7 +39,7 @@ index 827c58d28114..7a0a31aeb654 100644 BrowserProcessImpl::shared_url_loader_factory() { return system_network_context_manager()->GetSharedURLLoaderFactory(); diff --git chrome/browser/browser_process_impl.h chrome/browser/browser_process_impl.h -index 8799ad360d51..1bac38e1929b 100644 +index ab192b468f53..d0864716dcfe 100644 --- chrome/browser/browser_process_impl.h +++ chrome/browser/browser_process_impl.h @@ -143,6 +143,7 @@ class BrowserProcessImpl : public BrowserProcess, diff --git a/patch/patches/chrome_browser_profiles.patch b/patch/patches/chrome_browser_profiles.patch index 8f7fd2acc..f2152aa91 100644 --- a/patch/patches/chrome_browser_profiles.patch +++ b/patch/patches/chrome_browser_profiles.patch @@ -71,7 +71,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 af01ba808a5a..ce2743af4de2 100644 +index 08c6c70aea17..ac157a1afc78 100644 --- chrome/browser/profiles/profile_manager.cc +++ chrome/browser/profiles/profile_manager.cc @@ -388,7 +388,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir) diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index 2cfdc7bea..707b66384 100644 --- a/patch/patches/content_2015.patch +++ b/patch/patches/content_2015.patch @@ -118,10 +118,10 @@ index a17ae7ca0c07..c80e30494698 100644 FROM_HERE, {BrowserThread::IO}, base::BindOnce(&PrefetchURLLoaderService::GetFactory, diff --git content/browser/frame_host/render_frame_message_filter.cc content/browser/frame_host/render_frame_message_filter.cc -index 3310e9b06232..7b6c6ad26c34 100644 +index f1db4db0d671..18ca2f2e1604 100644 --- content/browser/frame_host/render_frame_message_filter.cc +++ content/browser/frame_host/render_frame_message_filter.cc -@@ -644,6 +644,7 @@ void RenderFrameMessageFilter::GetCookies(int render_frame_id, +@@ -652,6 +652,7 @@ void RenderFrameMessageFilter::GetCookies(int render_frame_id, void RenderFrameMessageFilter::OnGetPluginInfo( int render_frame_id, const GURL& url, @@ -129,7 +129,7 @@ index 3310e9b06232..7b6c6ad26c34 100644 const url::Origin& main_frame_origin, const std::string& mime_type, bool* found, -@@ -652,8 +653,8 @@ void RenderFrameMessageFilter::OnGetPluginInfo( +@@ -660,8 +661,8 @@ void RenderFrameMessageFilter::OnGetPluginInfo( bool allow_wildcard = true; *found = plugin_service_->GetPluginInfo( render_process_id_, render_frame_id, resource_context_, url, @@ -376,7 +376,7 @@ index cf3e520475a5..b21f22084186 100644 void RenderFrameImpl::WillCommitProvisionalLoad() { diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc -index b82d9757e0ae..00f73388656e 100644 +index f2d704c09e6e..f55ee220d817 100644 --- content/renderer/render_thread_impl.cc +++ content/renderer/render_thread_impl.cc @@ -821,6 +821,8 @@ void RenderThreadImpl::Init() { diff --git a/patch/patches/extensions_1947.patch b/patch/patches/extensions_1947.patch index b3e1edd1c..393d6bd57 100644 --- a/patch/patches/extensions_1947.patch +++ b/patch/patches/extensions_1947.patch @@ -27,7 +27,7 @@ index 9e81f0a33ede..b796e79ae7ef 100644 auto* browser_context = web_contents->GetBrowserContext(); diff --git content/browser/frame_host/render_frame_host_manager.cc content/browser/frame_host/render_frame_host_manager.cc -index 5301d9c140d7..37117b8c0da0 100644 +index 69913022bb19..6850ed9cd735 100644 --- content/browser/frame_host/render_frame_host_manager.cc +++ content/browser/frame_host/render_frame_host_manager.cc @@ -924,10 +924,11 @@ bool RenderFrameHostManager::ShouldSwapBrowsingInstancesForNavigation( @@ -57,10 +57,10 @@ index 5301d9c140d7..37117b8c0da0 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 056852ce578d..02f80a8b6778 100644 +index b33545b865e4..468ba636b05c 100644 --- content/public/browser/content_browser_client.h +++ content/public/browser/content_browser_client.h -@@ -437,6 +437,13 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -446,6 +446,13 @@ class CONTENT_EXPORT ContentBrowserClient { // Returns true if error page should be isolated in its own process. virtual bool ShouldIsolateErrorPage(bool in_main_frame); diff --git a/patch/patches/external_textures_1006.patch b/patch/patches/external_textures_1006.patch index 840b71ed3..2e1b91322 100644 --- a/patch/patches/external_textures_1006.patch +++ b/patch/patches/external_textures_1006.patch @@ -501,10 +501,10 @@ index b422c3075ae7..1c4b452d1df5 100644 GLint shm_id, GLuint shm_offset, diff --git gpu/command_buffer/client/gles2_implementation.cc gpu/command_buffer/client/gles2_implementation.cc -index 9ee4ed69f3e8..e6b2f002522f 100644 +index 65420b9c8bdb..38bb6176100d 100644 --- gpu/command_buffer/client/gles2_implementation.cc +++ gpu/command_buffer/client/gles2_implementation.cc -@@ -7254,6 +7254,22 @@ void GLES2Implementation::Viewport(GLint x, +@@ -7256,6 +7256,22 @@ void GLES2Implementation::Viewport(GLint x, CheckGLError(); } @@ -1297,10 +1297,10 @@ index b3905bdfa650..dc984321f2b8 100644 // The device scale factor of the monitor that this compositor is compositing diff --git ui/compositor/host/host_context_factory_private.cc ui/compositor/host/host_context_factory_private.cc -index 9c73b44101df..94fe32c76046 100644 +index 952525b7f823..871379326bc2 100644 --- ui/compositor/host/host_context_factory_private.cc +++ ui/compositor/host/host_context_factory_private.cc -@@ -244,6 +244,10 @@ void HostContextFactoryPrivate::SetOutputIsSecure(Compositor* compositor, +@@ -245,6 +245,10 @@ void HostContextFactoryPrivate::SetOutputIsSecure(Compositor* compositor, iter->second.display_private->SetOutputIsSecure(secure); } diff --git a/patch/patches/linux_gtk_2014.patch b/patch/patches/linux_gtk_2014.patch index 450a50eab..8642a4dd0 100644 --- a/patch/patches/linux_gtk_2014.patch +++ b/patch/patches/linux_gtk_2014.patch @@ -68,10 +68,10 @@ index d44c7feaabec..5f1992335a38 100644 void ChromeBrowserMainExtraPartsViewsLinux::ToolkitInitialized() { diff --git chrome/test/BUILD.gn chrome/test/BUILD.gn -index bfe218062685..2b3d2a25605b 100644 +index 5b4eced0cb65..aae0c2a19541 100644 --- chrome/test/BUILD.gn +++ chrome/test/BUILD.gn -@@ -3850,7 +3850,7 @@ test("unit_tests") { +@@ -3852,7 +3852,7 @@ test("unit_tests") { "../browser/ui/input_method/input_method_engine_unittest.cc", ] } @@ -80,7 +80,7 @@ index bfe218062685..2b3d2a25605b 100644 sources += [ "../browser/ui/libgtkui/select_file_dialog_impl_gtk_unittest.cc" ] deps += [ "//build/config/linux/gtk" ] -@@ -3871,7 +3871,7 @@ test("unit_tests") { +@@ -3873,7 +3873,7 @@ test("unit_tests") { if (use_gio) { configs += [ "//build/linux:gio_config" ] } @@ -89,7 +89,7 @@ index bfe218062685..2b3d2a25605b 100644 deps += [ "//chrome/browser/ui/libgtkui" ] } -@@ -4850,7 +4850,7 @@ if (!is_android) { +@@ -4859,7 +4859,7 @@ if (!is_android) { # suites, it seems like one or another starts timing out too. "../browser/ui/views/keyboard_access_browsertest.cc", ] diff --git a/patch/patches/openvr_jsoncpp_780987.patch b/patch/patches/openvr_jsoncpp_780987.patch deleted file mode 100644 index 1fb3e548e..000000000 --- a/patch/patches/openvr_jsoncpp_780987.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff --git device/vr/BUILD.gn device/vr/BUILD.gn -index 7a50872f6979..03921dcf8ede 100644 ---- device/vr/BUILD.gn -+++ device/vr/BUILD.gn -@@ -213,6 +213,7 @@ if (enable_openvr) { - deps = [ - "//base", - "//device/vr/public/mojom:test_mojom", -+ "//third_party/openvr:openvr_headers", - ] - } - } -diff --git third_party/openvr/BUILD.gn third_party/openvr/BUILD.gn -index 6c208d65b35a..7a6ae8cb44fc 100644 ---- third_party/openvr/BUILD.gn -+++ third_party/openvr/BUILD.gn -@@ -2,6 +2,22 @@ - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - -+source_set("openvr_headers") { -+ sources = [ -+ "src/headers/openvr.h", -+ "src/headers/openvr_capi.h", -+ "src/headers/openvr_driver.h", -+ "src/src/ivrclientcore.h", -+ "src/src/vrcommon/dirtools_public.h", -+ "src/src/vrcommon/envvartools_public.h", -+ "src/src/vrcommon/hmderrors_public.h", -+ "src/src/vrcommon/pathtools_public.h", -+ "src/src/vrcommon/sharedlibtools_public.h", -+ "src/src/vrcommon/strtools_public.h", -+ "src/src/vrcommon/vrpathregistry_public.h", -+ ] -+} -+ - component("openvr") { - output_name = "openvr_api" - -@@ -20,7 +36,6 @@ component("openvr") { - ] - - sources = [ -- "src/src/jsoncpp.cpp", - "src/src/openvr_api_public.cpp", - "src/src/vrcommon/dirtools_public.cpp", - "src/src/vrcommon/envvartools_public.cpp", -@@ -31,6 +46,10 @@ component("openvr") { - "src/src/vrcommon/vrpathregistry_public.cpp", - ] - -+ public_deps = [ -+ "//third_party/jsoncpp", -+ ] -+ - if (target_cpu == "x64" && is_win) { - defines += [ "WIN64" ] - } -@@ -38,7 +57,7 @@ component("openvr") { - include_dirs = [ - "src/headers", - "src/src", -- "src/src/json", - "src/src/vrcommon", -+ "//third_party/jsoncpp/source/include", - ] - } -diff --git third_party/openvr/src/src/vrcommon/vrpathregistry_public.cpp third_party/openvr/src/src/vrcommon/vrpathregistry_public.cpp -index 137b36f57cd4..dcbb9aaed52f 100644 ---- third_party/openvr/src/src/vrcommon/vrpathregistry_public.cpp -+++ third_party/openvr/src/src/vrcommon/vrpathregistry_public.cpp -@@ -1,7 +1,11 @@ - //========= Copyright Valve Corporation ============// - - #include "vrpathregistry_public.h" --#include "json/json.h" -+ -+#include -+#include -+#include -+ - #include "pathtools_public.h" - #include "envvartools_public.h" - #include "strtools_public.h" diff --git a/patch/patches/print_header_footer_1478_1565.patch b/patch/patches/print_header_footer_1478_1565.patch index 73835d151..14273d686 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 4e488b81fecf..4749815f1a94 100644 +index 40fc10af525a..7e6949985cf8 100644 --- chrome/browser/ui/BUILD.gn +++ chrome/browser/ui/BUILD.gn @@ -368,6 +368,7 @@ jumbo_split_static_library("ui") { diff --git a/patch/patches/resource_bundle_2512.patch b/patch/patches/resource_bundle_2512.patch index 5a88f9cd5..9deb8bdae 100644 --- a/patch/patches/resource_bundle_2512.patch +++ b/patch/patches/resource_bundle_2512.patch @@ -1,8 +1,8 @@ diff --git ui/base/resource/resource_bundle.cc ui/base/resource/resource_bundle.cc -index 315a2814447f..f7de790c9bc8 100644 +index d6d21eeb8ef6..7bd89d8126ff 100644 --- ui/base/resource/resource_bundle.cc +++ ui/base/resource/resource_bundle.cc -@@ -698,6 +698,12 @@ ResourceBundle::ResourceBundle(Delegate* delegate) +@@ -693,6 +693,12 @@ ResourceBundle::ResourceBundle(Delegate* delegate) : delegate_(delegate), locale_resources_data_lock_(new base::Lock), max_scale_factor_(SCALE_FACTOR_100P) { @@ -15,7 +15,7 @@ index 315a2814447f..f7de790c9bc8 100644 mangle_localized_strings_ = base::CommandLine::ForCurrentProcess()->HasSwitch( switches::kMangleLocalizedStrings); } -@@ -707,6 +713,11 @@ ResourceBundle::~ResourceBundle() { +@@ -702,6 +708,11 @@ ResourceBundle::~ResourceBundle() { UnloadLocaleResources(); } @@ -28,7 +28,7 @@ index 315a2814447f..f7de790c9bc8 100644 void ResourceBundle::InitSharedInstance(Delegate* delegate) { DCHECK(g_shared_instance_ == NULL) << "ResourceBundle initialized twice"; diff --git ui/base/resource/resource_bundle.h ui/base/resource/resource_bundle.h -index c05b5b910463..02299c9fe559 100644 +index c24fcf0ba3c9..2c9ca937bbe7 100644 --- ui/base/resource/resource_bundle.h +++ ui/base/resource/resource_bundle.h @@ -150,6 +150,11 @@ class UI_BASE_EXPORT ResourceBundle { diff --git a/patch/patches/storage_partition_1973.patch b/patch/patches/storage_partition_1973.patch index 0cdacea97..7d8026678 100644 --- a/patch/patches/storage_partition_1973.patch +++ b/patch/patches/storage_partition_1973.patch @@ -251,10 +251,10 @@ index a0220133cd28..02b8726dfbc1 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 5caac8e8afb7..7f042ef246e4 100644 +index 257cbf5c1652..195c4f5d7d73 100644 --- content/browser/loader/navigation_url_loader_impl.cc +++ content/browser/loader/navigation_url_loader_impl.cc -@@ -1226,7 +1226,7 @@ class NavigationURLLoaderImpl::URLLoaderRequestController +@@ -1253,7 +1253,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_, @@ -263,9 +263,9 @@ index 5caac8e8afb7..7f042ef246e4 100644 false /* allow_wildcard */, &stale, &plugin, nullptr); if (stale) { -@@ -1593,7 +1593,7 @@ NavigationURLLoaderImpl::NavigationURLLoaderImpl( +@@ -1635,7 +1635,7 @@ NavigationURLLoaderImpl::NavigationURLLoaderImpl( + std::unique_ptr new_request = CreateResourceRequest( request_info.get(), frame_tree_node_id, allow_download_); - new_request->transition_type = request_info->common_params.transition; - auto* partition = static_cast(storage_partition); + auto* partition = storage_partition; @@ -319,7 +319,7 @@ index d3042e6a2fc7..07c8478b8ffb 100644 partition->GetPaymentAppContext(); diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc -index 0a20b9c08fae..8e4e9121670d 100644 +index cb57a9ea4440..bd60ba8f4201 100644 --- content/browser/renderer_host/render_process_host_impl.cc +++ content/browser/renderer_host/render_process_host_impl.cc @@ -752,11 +752,10 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data, @@ -338,7 +338,7 @@ index 0a20b9c08fae..8e4e9121670d 100644 // Is this the default storage partition? If it isn't, then just give it its // own non-shared process. -@@ -1486,7 +1485,7 @@ int RenderProcessHost::GetCurrentRenderProcessCountForTesting() { +@@ -1507,7 +1506,7 @@ int RenderProcessHost::GetCurrentRenderProcessCountForTesting() { // static RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost( BrowserContext* browser_context, @@ -347,7 +347,7 @@ index 0a20b9c08fae..8e4e9121670d 100644 SiteInstance* site_instance, bool is_for_guests_only) { if (g_render_process_host_factory_) { -@@ -1495,8 +1494,8 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost( +@@ -1516,8 +1515,8 @@ RenderProcessHost* RenderProcessHostImpl::CreateRenderProcessHost( } if (!storage_partition_impl) { @@ -358,7 +358,7 @@ index 0a20b9c08fae..8e4e9121670d 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 -@@ -1521,7 +1520,7 @@ const unsigned int RenderProcessHostImpl::kMaxFrameDepthForPriority = +@@ -1542,7 +1541,7 @@ const unsigned int RenderProcessHostImpl::kMaxFrameDepthForPriority = RenderProcessHostImpl::RenderProcessHostImpl( BrowserContext* browser_context, @@ -367,7 +367,7 @@ index 0a20b9c08fae..8e4e9121670d 100644 bool is_for_guests_only) : fast_shutdown_started_(false), deleting_soon_(false), -@@ -1573,10 +1572,12 @@ RenderProcessHostImpl::RenderProcessHostImpl( +@@ -1594,10 +1593,12 @@ RenderProcessHostImpl::RenderProcessHostImpl( permission_service_context_(new PermissionServiceContext(this)), indexed_db_factory_(new IndexedDBDispatcherHost( id_, @@ -382,7 +382,7 @@ index 0a20b9c08fae..8e4e9121670d 100644 id_)), channel_connected_(false), sent_render_process_ready_(false), -@@ -1612,7 +1613,8 @@ RenderProcessHostImpl::RenderProcessHostImpl( +@@ -1633,7 +1634,8 @@ RenderProcessHostImpl::RenderProcessHostImpl( } push_messaging_manager_.reset(new PushMessagingManager( @@ -392,7 +392,7 @@ index 0a20b9c08fae..8e4e9121670d 100644 AddObserver(indexed_db_factory_.get()); AddObserver(service_worker_dispatcher_host_.get()); -@@ -1948,6 +1950,15 @@ void RenderProcessHostImpl::ResetChannelProxy() { +@@ -1969,6 +1971,15 @@ void RenderProcessHostImpl::ResetChannelProxy() { void RenderProcessHostImpl::CreateMessageFilters() { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -408,7 +408,7 @@ index 0a20b9c08fae..8e4e9121670d 100644 MediaInternals* media_internals = MediaInternals::GetInstance(); // Add BrowserPluginMessageFilter to ensure it gets the first stab at messages // from guests. -@@ -1986,10 +1997,10 @@ void RenderProcessHostImpl::CreateMessageFilters() { +@@ -2007,10 +2018,10 @@ void RenderProcessHostImpl::CreateMessageFilters() { ChromeBlobStorageContext::GetFor(browser_context); resource_message_filter_ = new ResourceMessageFilter( @@ -421,7 +421,7 @@ index 0a20b9c08fae..8e4e9121670d 100644 storage_partition_impl_->GetPrefetchURLLoaderService(), BrowserContext::GetSharedCorsOriginAccessList(browser_context), std::move(get_contexts_callback), -@@ -1999,8 +2010,7 @@ void RenderProcessHostImpl::CreateMessageFilters() { +@@ -2020,8 +2031,7 @@ void RenderProcessHostImpl::CreateMessageFilters() { AddFilter( new MidiHost(GetID(), BrowserMainLoop::GetInstance()->midi_service())); @@ -431,7 +431,7 @@ index 0a20b9c08fae..8e4e9121670d 100644 peer_connection_tracker_host_ = new PeerConnectionTrackerHost(GetID()); AddFilter(peer_connection_tracker_host_.get()); -@@ -2017,10 +2027,6 @@ void RenderProcessHostImpl::CreateMessageFilters() { +@@ -2038,10 +2048,6 @@ void RenderProcessHostImpl::CreateMessageFilters() { AddFilter(new TraceMessageFilter(GetID())); AddFilter(new ResolveProxyMsgHelper(GetID())); @@ -442,7 +442,7 @@ index 0a20b9c08fae..8e4e9121670d 100644 } void RenderProcessHostImpl::BindCacheStorage( -@@ -2032,7 +2038,8 @@ void RenderProcessHostImpl::BindCacheStorage( +@@ -2053,7 +2059,8 @@ void RenderProcessHostImpl::BindCacheStorage( cache_storage_dispatcher_host_ = base::MakeRefCounted(); cache_storage_dispatcher_host_->Init( @@ -452,7 +452,7 @@ index 0a20b9c08fae..8e4e9121670d 100644 } // Send the binding to IO thread, because Cache Storage handles Mojo IPC on IO // thread entirely. -@@ -2217,7 +2224,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { +@@ -2238,7 +2245,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { registry->AddInterface(base::BindRepeating( &CodeCacheHostImpl::Create, GetID(), @@ -462,7 +462,7 @@ index 0a20b9c08fae..8e4e9121670d 100644 base::RetainedRef( storage_partition_impl_->GetGeneratedCodeCacheContext()))); -@@ -2228,7 +2236,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { +@@ -2249,7 +2257,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { registry->AddInterface(base::BindRepeating( &AppCacheDispatcherHost::Create, @@ -472,7 +472,7 @@ index 0a20b9c08fae..8e4e9121670d 100644 GetID())); AddUIThreadInterface( -@@ -2273,6 +2282,9 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { +@@ -2294,6 +2303,9 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { plugin_registry_.reset( new PluginRegistryImpl(GetBrowserContext()->GetResourceContext())); } diff --git a/patch/patches/views_1749_2102.patch b/patch/patches/views_1749_2102.patch index 6689a130a..9f5a1f4b2 100644 --- a/patch/patches/views_1749_2102.patch +++ b/patch/patches/views_1749_2102.patch @@ -295,10 +295,10 @@ index 9c78b30ab3a0..999eb4048f5c 100644 std::unique_ptr selection_controller_; diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc -index ed55698be6ad..b2b8963ed6e5 100644 +index 9e56ca54813b..f4100b838507 100644 --- ui/views/controls/menu/menu_controller.cc +++ ui/views/controls/menu/menu_controller.cc -@@ -2447,8 +2447,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem( +@@ -2451,8 +2451,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem( void MenuController::OpenSubmenuChangeSelectionIfCan() { MenuItemView* item = pending_state_.item; @@ -313,7 +313,7 @@ index ed55698be6ad..b2b8963ed6e5 100644 MenuItemView* to_select = NULL; if (item->GetSubmenu()->GetMenuItemCount() > 0) to_select = FindInitialSelectableMenuItem(item, INCREMENT_SELECTION_DOWN); -@@ -2463,8 +2468,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() { +@@ -2467,8 +2472,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() { void MenuController::CloseSubmenu() { MenuItemView* item = state_.item; DCHECK(item); 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 27ab09c2c..417c38533 100644 --- a/patch/patches/views_widget_180_1481_1565_1677_1749.patch +++ b/patch/patches/views_widget_180_1481_1565_1677_1749.patch @@ -18,7 +18,7 @@ index e155153ec1ee..47b2ac1b3968 100644 return renderer_frame_number_; } diff --git content/browser/renderer_host/render_widget_host_view_base.h content/browser/renderer_host/render_widget_host_view_base.h -index becc63fa3a8a..fb5822319d62 100644 +index c48b0aa86d8a..f16c2bff2316 100644 --- content/browser/renderer_host/render_widget_host_view_base.h +++ content/browser/renderer_host/render_widget_host_view_base.h @@ -83,6 +83,7 @@ class CursorManager; @@ -194,7 +194,7 @@ index 364d6df184c5..0d32a4579c87 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 53e0077dca31..9eb853fd3532 100644 +index 0ab1728d69b1..76557f4f49ca 100644 --- ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc +++ ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc @@ -145,6 +145,7 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11( @@ -287,7 +287,7 @@ index 53e0077dca31..9eb853fd3532 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 4ae19b04ef8a..6e58f00808db 100644 +index 2600a0621f3d..52c486e33f69 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 diff --git a/patch/patches/web_contents_1257_1565.patch b/patch/patches/web_contents_1257_1565.patch index c654e54ba..76f6150db 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 8ce6d0d2f8ca..79927c392d2a 100644 +index c9d8ca8da493..e3114420d847 100644 --- content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc -@@ -1992,21 +1992,30 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { +@@ -1993,21 +1993,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 8ce6d0d2f8ca..79927c392d2a 100644 CHECK(render_view_host_delegate_view_); CHECK(view_.get()); -@@ -2701,6 +2710,15 @@ void WebContentsImpl::CreateNewWindow( +@@ -2702,6 +2711,15 @@ void WebContentsImpl::CreateNewWindow( create_params.renderer_initiated_creation = main_frame_route_id != MSG_ROUTING_NONE; @@ -61,7 +61,7 @@ index 8ce6d0d2f8ca..79927c392d2a 100644 std::unique_ptr new_contents; if (!is_guest) { create_params.context = view_->GetNativeView(); -@@ -2733,7 +2751,7 @@ void WebContentsImpl::CreateNewWindow( +@@ -2734,7 +2752,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 8ce6d0d2f8ca..79927c392d2a 100644 } // Save the created window associated with the route so we can show it // later. -@@ -6170,7 +6188,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() { +@@ -6171,7 +6189,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 5a98f3963..f6d3a32ae 100644 --- a/patch/patches/webkit_plugin_info_2015.patch +++ b/patch/patches/webkit_plugin_info_2015.patch @@ -1,14 +1,84 @@ diff --git third_party/blink/public/mojom/plugins/plugin_registry.mojom third_party/blink/public/mojom/plugins/plugin_registry.mojom -index 92e9cb865204..4628c56882b4 100644 +index 92e9cb865204..e3d51ec6263e 100644 --- third_party/blink/public/mojom/plugins/plugin_registry.mojom +++ third_party/blink/public/mojom/plugins/plugin_registry.mojom -@@ -34,5 +34,5 @@ interface PluginRegistry { - // - // TODO(crbug.com/850278): We shouldn't rely on the renderer to tell us the main frame origin. - [Sync] +@@ -1,38 +1,38 @@ +-// Copyright 2018 The Chromium Authors. All rights reserved. +-// Use of this source code is governed by a BSD-style license that can be +-// found in the LICENSE file. +- +-module blink.mojom; +- +-import "mojo/public/mojom/base/file_path.mojom"; +-import "mojo/public/mojom/base/string16.mojom"; +-import "url/mojom/origin.mojom"; +- +-struct PluginMimeType { +- string mime_type; +- mojo_base.mojom.String16 description; +- array file_extensions; +-}; +- +-struct PluginInfo { +- mojo_base.mojom.String16 name; +- mojo_base.mojom.String16 description; +- mojo_base.mojom.FilePath filename; +- uint32 background_color; +- array mime_types; +-}; +- +-interface PluginRegistry { +- // Retrieves the list of plugins available to the renderer. +- // +- // If |refresh| is true, then cached information should not be used to +- // satisfy this call. |main_frame_origin| is used by the browser process to +- // filter plugins from the plugin list based on content settings. +- // +- // |main_frame_origin| is used to handle exceptions for plugin content +- // settings. +- // +- // TODO(crbug.com/850278): We shouldn't rely on the renderer to tell us the main frame origin. +- [Sync] - GetPlugins(bool refresh, url.mojom.Origin main_frame_origin) => (array plugins); +-}; ++// Copyright 2018 The Chromium Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++module blink.mojom; ++ ++import "mojo/public/mojom/base/file_path.mojom"; ++import "mojo/public/mojom/base/string16.mojom"; ++import "url/mojom/origin.mojom"; ++ ++struct PluginMimeType { ++ string mime_type; ++ mojo_base.mojom.String16 description; ++ array file_extensions; ++}; ++ ++struct PluginInfo { ++ mojo_base.mojom.String16 name; ++ mojo_base.mojom.String16 description; ++ mojo_base.mojom.FilePath filename; ++ uint32 background_color; ++ array mime_types; ++}; ++ ++interface PluginRegistry { ++ // Retrieves the list of plugins available to the renderer. ++ // ++ // If |refresh| is true, then cached information should not be used to ++ // satisfy this call. |main_frame_origin| is used by the browser process to ++ // filter plugins from the plugin list based on content settings. ++ // ++ // |main_frame_origin| is used to handle exceptions for plugin content ++ // settings. ++ // ++ // TODO(crbug.com/850278): We shouldn't rely on the renderer to tell us the main frame origin. ++ [Sync] + 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 2f57bdd1ef3e..7910c9c12937 100644 --- third_party/blink/public/platform/platform.h @@ -44,10 +114,10 @@ index c360933eb10f..6295f9d675f7 100644 .Top() .GetSecurityContext() diff --git third_party/blink/renderer/core/frame/local_frame.cc third_party/blink/renderer/core/frame/local_frame.cc -index 339d96d4dfbd..27b86a9b7a78 100644 +index 19862e24a7f5..8ab075d9d7f4 100644 --- third_party/blink/renderer/core/frame/local_frame.cc +++ third_party/blink/renderer/core/frame/local_frame.cc -@@ -1238,7 +1238,7 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() { +@@ -1296,7 +1296,7 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() { PluginData* LocalFrame::GetPluginData() const { if (!Loader().AllowPlugins(kNotAboutToInstantiatePlugin)) return nullptr; diff --git a/patch/patches/webview_plugin_2020.patch b/patch/patches/webview_plugin_2020.patch index ae7d5c6c8..3d050fb2d 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 bb7bbbd686f0..da72f775794b 100644 +index e1aa088c0bbf..abf4e4d52612 100644 --- chrome/app/generated_resources.grd +++ chrome/app/generated_resources.grd @@ -4510,7 +4510,7 @@ Keep your key file in a safe place. You will need it to create new versions of y