From f6bc8313a64909e4610abfab4b8475ae86b6c266 Mon Sep 17 00:00:00 2001 From: CEF Spotify Date: Wed, 25 Aug 2021 21:08:49 +0000 Subject: [PATCH] Update to Chromium version 93.0.4577.58 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- .../chrome_browser_context_menus.patch | 14 +++--- patch/patches/chrome_browser_profiles.patch | 14 +++--- patch/patches/content_2015.patch | 50 +++++++++---------- patch/patches/net_cookie_flags.patch | 4 +- patch/patches/services_network_2718.patch | 2 +- patch/patches/webkit_plugin_info_2015.patch | 18 +++---- 7 files changed, 52 insertions(+), 52 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 4a55df85d..eb4449481 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,6 +7,6 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': 'refs/tags/93.0.4577.51', + 'chromium_checkout': 'refs/tags/93.0.4577.58', 'depot_tools_checkout': '45d2afa080' } diff --git a/patch/patches/chrome_browser_context_menus.patch b/patch/patches/chrome_browser_context_menus.patch index ed24778ec..b7870f4ad 100644 --- a/patch/patches/chrome_browser_context_menus.patch +++ b/patch/patches/chrome_browser_context_menus.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/renderer_context_menu/render_view_context_menu.cc chrome/browser/renderer_context_menu/render_view_context_menu.cc -index f709ee1009830..fdfaf2048f39d 100644 +index f709ee100983..fdfaf2048f39 100644 --- chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc @@ -277,6 +277,13 @@ base::OnceCallback* GetMenuShownCallback() { @@ -69,7 +69,7 @@ index f709ee1009830..fdfaf2048f39d 100644 RenderViewContextMenu::GetHandlersForLinkUrl() { ProtocolHandlerRegistry::ProtocolHandlerList handlers = diff --git chrome/browser/renderer_context_menu/render_view_context_menu.h chrome/browser/renderer_context_menu/render_view_context_menu.h -index 3e75832061fd2..76ffd6b12bc84 100644 +index 3e75832061fd..76ffd6b12bc8 100644 --- chrome/browser/renderer_context_menu/render_view_context_menu.h +++ chrome/browser/renderer_context_menu/render_view_context_menu.h @@ -105,6 +105,12 @@ class RenderViewContextMenu : public RenderViewContextMenuBase, @@ -96,7 +96,7 @@ index 3e75832061fd2..76ffd6b12bc84 100644 // "Use enhanced spell check" items. std::unique_ptr spelling_suggestions_menu_observer_; diff --git chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc -index 13a65de79e185..0901c4cade4f1 100644 +index 13a65de79e18..0901c4cade4f 100644 --- chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc +++ chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc @@ -136,6 +136,9 @@ void RenderViewContextMenuViews::RunMenuAt(views::Widget* parent, @@ -110,7 +110,7 @@ index 13a65de79e185..0901c4cade4f1 100644 // that Ctrl+C, Ctrl+V, Ctrl+X, Ctrl-A, etc do what they normally do. switch (command_id) { diff --git components/renderer_context_menu/render_view_context_menu_base.cc components/renderer_context_menu/render_view_context_menu_base.cc -index b2513d5ca3ead..f1894f4e05385 100644 +index b2513d5ca3ea..f1894f4e0538 100644 --- components/renderer_context_menu/render_view_context_menu_base.cc +++ components/renderer_context_menu/render_view_context_menu_base.cc @@ -376,6 +376,17 @@ bool RenderViewContextMenuBase::IsCommandIdChecked(int id) const { @@ -132,7 +132,7 @@ index b2513d5ca3ead..f1894f4e05385 100644 command_executed_ = true; RecordUsedItem(id); diff --git components/renderer_context_menu/render_view_context_menu_base.h components/renderer_context_menu/render_view_context_menu_base.h -index 051953091fd4f..7e771526ce52a 100644 +index 051953091fd4..7e771526ce52 100644 --- components/renderer_context_menu/render_view_context_menu_base.h +++ components/renderer_context_menu/render_view_context_menu_base.h @@ -82,6 +82,9 @@ class RenderViewContextMenuBase : public ui::SimpleMenuModel::Delegate, @@ -176,7 +176,7 @@ index 051953091fd4f..7e771526ce52a 100644 bool IsCustomItemEnabled(int id) const; diff --git components/renderer_context_menu/render_view_context_menu_observer.cc components/renderer_context_menu/render_view_context_menu_observer.cc -index 2e2d05f91c646..85b256b2be9bd 100644 +index 2e2d05f91c64..85b256b2be9b 100644 --- components/renderer_context_menu/render_view_context_menu_observer.cc +++ components/renderer_context_menu/render_view_context_menu_observer.cc @@ -15,3 +15,8 @@ bool RenderViewContextMenuObserver::IsCommandIdChecked(int command_id) { @@ -189,7 +189,7 @@ index 2e2d05f91c646..85b256b2be9bd 100644 + return false; +} diff --git components/renderer_context_menu/render_view_context_menu_observer.h components/renderer_context_menu/render_view_context_menu_observer.h -index b360a8eb4e820..6f9023a629046 100644 +index b360a8eb4e82..6f9023a62904 100644 --- components/renderer_context_menu/render_view_context_menu_observer.h +++ components/renderer_context_menu/render_view_context_menu_observer.h @@ -11,6 +11,10 @@ namespace content { diff --git a/patch/patches/chrome_browser_profiles.patch b/patch/patches/chrome_browser_profiles.patch index f4b6afd32..c5c2c34a2 100644 --- a/patch/patches/chrome_browser_profiles.patch +++ b/patch/patches/chrome_browser_profiles.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/profiles/off_the_record_profile_impl.cc chrome/browser/profiles/off_the_record_profile_impl.cc -index d4654752a2132..5829ddeaa91a7 100644 +index d4654752a213..5829ddeaa91a 100644 --- chrome/browser/profiles/off_the_record_profile_impl.cc +++ chrome/browser/profiles/off_the_record_profile_impl.cc @@ -628,7 +628,9 @@ std::unique_ptr Profile::CreateOffTheRecordProfile( @@ -14,7 +14,7 @@ index d4654752a2132..5829ddeaa91a7 100644 } diff --git chrome/browser/profiles/profile.cc chrome/browser/profiles/profile.cc -index 01f72891d3035..050f4aa94c6d0 100644 +index 01f72891d303..050f4aa94c6d 100644 --- chrome/browser/profiles/profile.cc +++ chrome/browser/profiles/profile.cc @@ -86,6 +86,7 @@ base::LazyInstance>::Leaky @@ -52,7 +52,7 @@ index 01f72891d3035..050f4aa94c6d0 100644 Profile::OTRProfileID Profile::OTRProfileID::CreateUniqueForDevTools() { return CreateUnique(kDevToolsOTRProfileIDPrefix); diff --git chrome/browser/profiles/profile.h chrome/browser/profiles/profile.h -index e3e819d9ecd87..ef8c6ebd1cf2e 100644 +index e3e819d9ecd8..ef8c6ebd1cf2 100644 --- chrome/browser/profiles/profile.h +++ chrome/browser/profiles/profile.h @@ -119,6 +119,10 @@ class Profile : public content::BrowserContext { @@ -85,7 +85,7 @@ index e3e819d9ecd87..ef8c6ebd1cf2e 100644 virtual bool IsSignedIn() = 0; diff --git chrome/browser/profiles/profile_impl.cc chrome/browser/profiles/profile_impl.cc -index 9a6b9dd9fe3c9..4c74e5995c16b 100644 +index 9a6b9dd9fe3c..4c74e5995c16 100644 --- chrome/browser/profiles/profile_impl.cc +++ chrome/browser/profiles/profile_impl.cc @@ -963,7 +963,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id, @@ -100,7 +100,7 @@ index 9a6b9dd9fe3c9..4c74e5995c16b 100644 return raw_otr_profile; } diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc -index 69c65075f3a27..5bbada14840be 100644 +index 69c65075f3a2..5bbada14840b 100644 --- chrome/browser/profiles/profile_manager.cc +++ chrome/browser/profiles/profile_manager.cc @@ -495,7 +495,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir) @@ -113,7 +113,7 @@ index 69c65075f3a27..5bbada14840be 100644 } diff --git chrome/browser/profiles/profile_manager.h chrome/browser/profiles/profile_manager.h -index 915a95e287c58..0424e8bdd7d84 100644 +index 915a95e287c5..0424e8bdd7d8 100644 --- chrome/browser/profiles/profile_manager.h +++ chrome/browser/profiles/profile_manager.h @@ -119,7 +119,7 @@ class ProfileManager : public Profile::Delegate { @@ -135,7 +135,7 @@ index 915a95e287c58..0424e8bdd7d84 100644 // Returns the directory where the first created profile is stored, // relative to the user data directory currently in use. diff --git chrome/browser/profiles/renderer_updater.cc chrome/browser/profiles/renderer_updater.cc -index c8771e1d5072b..4ce60104e0c61 100644 +index c8771e1d5072..4ce60104e0c6 100644 --- chrome/browser/profiles/renderer_updater.cc +++ chrome/browser/profiles/renderer_updater.cc @@ -8,6 +8,7 @@ diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index fc2747b2c..260189550 100644 --- a/patch/patches/content_2015.patch +++ b/patch/patches/content_2015.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/download/download_target_determiner.cc chrome/browser/download/download_target_determiner.cc -index 1891a950448c9..cf6cdb676edc9 100644 +index 1891a950448c..cf6cdb676edc 100644 --- chrome/browser/download/download_target_determiner.cc +++ chrome/browser/download/download_target_determiner.cc @@ -677,7 +677,7 @@ void IsHandledBySafePlugin(int render_process_id, @@ -12,7 +12,7 @@ index 1891a950448c9..cf6cdb676edc9 100644 if (is_stale && stale_plugin_action == RETRY_IF_STALE_PLUGIN_LIST) { // The GetPlugins call causes the plugin list to be refreshed. Once that's diff --git chrome/browser/plugins/chrome_plugin_service_filter.cc chrome/browser/plugins/chrome_plugin_service_filter.cc -index 27f7028908745..35e1cdb72874f 100644 +index 27f702890874..35e1cdb72874 100644 --- chrome/browser/plugins/chrome_plugin_service_filter.cc +++ chrome/browser/plugins/chrome_plugin_service_filter.cc @@ -133,6 +133,7 @@ bool ChromePluginServiceFilter::IsPluginAvailable( @@ -24,7 +24,7 @@ index 27f7028908745..35e1cdb72874f 100644 content::WebPluginInfo* plugin) { base::AutoLock auto_lock(lock_); diff --git chrome/browser/plugins/chrome_plugin_service_filter.h chrome/browser/plugins/chrome_plugin_service_filter.h -index 937d3d5bc84fd..ac327392dcf37 100644 +index 937d3d5bc84f..ac327392dcf3 100644 --- chrome/browser/plugins/chrome_plugin_service_filter.h +++ chrome/browser/plugins/chrome_plugin_service_filter.h @@ -64,6 +64,7 @@ class ChromePluginServiceFilter : public content::PluginServiceFilter, @@ -36,7 +36,7 @@ index 937d3d5bc84fd..ac327392dcf37 100644 content::WebPluginInfo* plugin) override; diff --git chrome/browser/plugins/pdf_iframe_navigation_throttle.cc chrome/browser/plugins/pdf_iframe_navigation_throttle.cc -index d0a5a12620bd3..a02e13bbd8154 100644 +index d0a5a12620bd..a02e13bbd815 100644 --- chrome/browser/plugins/pdf_iframe_navigation_throttle.cc +++ chrome/browser/plugins/pdf_iframe_navigation_throttle.cc @@ -65,7 +65,7 @@ bool IsPDFPluginEnabled(content::NavigationHandle* navigation_handle, @@ -49,7 +49,7 @@ index d0a5a12620bd3..a02e13bbd8154 100644 false /* allow_wildcard */, is_stale, &plugin_info, nullptr /* actual_mime_type */); diff --git chrome/browser/ui/views/frame/browser_root_view.cc chrome/browser/ui/views/frame/browser_root_view.cc -index 6e2d09885b457..da23a0211754b 100644 +index 6e2d09885b45..da23a0211754 100644 --- chrome/browser/ui/views/frame/browser_root_view.cc +++ chrome/browser/ui/views/frame/browser_root_view.cc @@ -85,7 +85,7 @@ void OnFindURLMimeType(const GURL& url, @@ -62,7 +62,7 @@ index 6e2d09885b457..da23a0211754b 100644 #endif diff --git content/browser/devtools/devtools_http_handler.cc content/browser/devtools/devtools_http_handler.cc -index dc4db573977d6..489ed518257c3 100644 +index dc4db573977d..489ed518257c 100644 --- content/browser/devtools/devtools_http_handler.cc +++ content/browser/devtools/devtools_http_handler.cc @@ -575,7 +575,7 @@ void DevToolsHttpHandler::OnJsonRequest( @@ -75,7 +75,7 @@ index dc4db573977d6..489ed518257c3 100644 GetContentClient()->browser()->GetUserAgent()); version.SetString("V8-Version", V8_VERSION_STRING); diff --git content/browser/loader/navigation_url_loader_impl.cc content/browser/loader/navigation_url_loader_impl.cc -index 4d0c1a27449d5..34bb0372c7f8f 100644 +index 4d0c1a27449d..34bb0372c7f8 100644 --- content/browser/loader/navigation_url_loader_impl.cc +++ content/browser/loader/navigation_url_loader_impl.cc @@ -631,6 +631,13 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest( @@ -102,7 +102,7 @@ index 4d0c1a27449d5..34bb0372c7f8f 100644 if (stale) { diff --git content/browser/plugin_service_impl.cc content/browser/plugin_service_impl.cc -index 9be14f9a03219..00e2520112d81 100644 +index 9be14f9a0321..00e2520112d8 100644 --- content/browser/plugin_service_impl.cc +++ content/browser/plugin_service_impl.cc @@ -270,6 +270,7 @@ bool PluginServiceImpl::GetPluginInfoArray( @@ -124,7 +124,7 @@ index 9be14f9a03219..00e2520112d81 100644 if (actual_mime_type) *actual_mime_type = mime_types[i]; diff --git content/browser/plugin_service_impl.h content/browser/plugin_service_impl.h -index b0fb11b4d5ba7..1bce64c6b20ee 100644 +index b0fb11b4d5ba..1bce64c6b20e 100644 --- content/browser/plugin_service_impl.h +++ content/browser/plugin_service_impl.h @@ -54,6 +54,7 @@ class CONTENT_EXPORT PluginServiceImpl : public PluginService { @@ -136,7 +136,7 @@ index b0fb11b4d5ba7..1bce64c6b20ee 100644 const std::string& mime_type, bool allow_wildcard, diff --git content/browser/renderer_host/plugin_registry_impl.cc content/browser/renderer_host/plugin_registry_impl.cc -index 68ccb16a86ad0..7e9aeed8c8c32 100644 +index 68ccb16a86ad..7e9aeed8c8c3 100644 --- content/browser/renderer_host/plugin_registry_impl.cc +++ content/browser/renderer_host/plugin_registry_impl.cc @@ -30,6 +30,7 @@ void PluginRegistryImpl::Bind( @@ -169,7 +169,7 @@ index 68ccb16a86ad0..7e9aeed8c8c32 100644 auto plugin_blink = blink::mojom::PluginInfo::New(); plugin_blink->name = plugin.name; diff --git content/browser/renderer_host/plugin_registry_impl.h content/browser/renderer_host/plugin_registry_impl.h -index 632ae86c6fd69..55b749ec12421 100644 +index 632ae86c6fd6..55b749ec1242 100644 --- content/browser/renderer_host/plugin_registry_impl.h +++ content/browser/renderer_host/plugin_registry_impl.h @@ -24,11 +24,13 @@ class PluginRegistryImpl : public blink::mojom::PluginRegistry { @@ -188,7 +188,7 @@ index 632ae86c6fd69..55b749ec12421 100644 const std::vector& all_plugins); diff --git content/browser/renderer_host/render_frame_host_impl.cc content/browser/renderer_host/render_frame_host_impl.cc -index d0899ee86e4cd..ea25a783f2128 100644 +index d0899ee86e4c..ea25a783f212 100644 --- content/browser/renderer_host/render_frame_host_impl.cc +++ content/browser/renderer_host/render_frame_host_impl.cc @@ -12016,6 +12016,7 @@ void RenderFrameHostImpl::BindHungDetectorHost( @@ -210,7 +210,7 @@ index d0899ee86e4cd..ea25a783f2128 100644 std::move(callback).Run(found, info, actual_mime_type); } diff --git content/browser/renderer_host/render_frame_host_impl.h content/browser/renderer_host/render_frame_host_impl.h -index f679024417988..c5a0be030b00f 100644 +index f67902441798..c5a0be030b00 100644 --- content/browser/renderer_host/render_frame_host_impl.h +++ content/browser/renderer_host/render_frame_host_impl.h @@ -2535,6 +2535,7 @@ class CONTENT_EXPORT RenderFrameHostImpl @@ -222,7 +222,7 @@ index f679024417988..c5a0be030b00f 100644 const std::string& mime_type, GetPluginInfoCallback callback) override; diff --git content/common/pepper_plugin.mojom content/common/pepper_plugin.mojom -index a544bfed7ed85..60aad01350c2f 100644 +index a544bfed7ed8..60aad01350c2 100644 --- content/common/pepper_plugin.mojom +++ content/common/pepper_plugin.mojom @@ -29,6 +29,7 @@ interface PepperHost { @@ -234,7 +234,7 @@ index a544bfed7ed85..60aad01350c2f 100644 string mime_type) => (bool found, diff --git content/public/browser/content_browser_client.cc content/public/browser/content_browser_client.cc -index b5022114e4e19..7d8f17f9e39ac 100644 +index b5022114e4e1..7d8f17f9e39a 100644 --- content/public/browser/content_browser_client.cc +++ content/public/browser/content_browser_client.cc @@ -9,7 +9,7 @@ @@ -247,7 +247,7 @@ index b5022114e4e19..7d8f17f9e39ac 100644 #include diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h -index 799490ac3f7c0..fe921248a0818 100644 +index 799490ac3f7c..fe921248a081 100644 --- content/public/browser/content_browser_client.h +++ content/public/browser/content_browser_client.h @@ -32,6 +32,7 @@ @@ -285,7 +285,7 @@ index 799490ac3f7c0..fe921248a0818 100644 virtual std::string GetUserAgent(); diff --git content/public/browser/plugin_service.h content/public/browser/plugin_service.h -index edcc4c1747123..29eea000a9100 100644 +index edcc4c174712..29eea000a910 100644 --- content/public/browser/plugin_service.h +++ content/public/browser/plugin_service.h @@ -78,6 +78,7 @@ class CONTENT_EXPORT PluginService { @@ -297,7 +297,7 @@ index edcc4c1747123..29eea000a9100 100644 const std::string& mime_type, bool allow_wildcard, diff --git content/public/browser/plugin_service_filter.h content/public/browser/plugin_service_filter.h -index 570b5a4738b94..923a5f7195c53 100644 +index 570b5a4738b9..923a5f7195c5 100644 --- content/public/browser/plugin_service_filter.h +++ content/public/browser/plugin_service_filter.h @@ -30,6 +30,7 @@ class PluginServiceFilter { @@ -309,7 +309,7 @@ index 570b5a4738b94..923a5f7195c53 100644 WebPluginInfo* plugin) = 0; diff --git content/public/renderer/content_renderer_client.h content/public/renderer/content_renderer_client.h -index 7ec0901cf6ba2..db5b5529a4cda 100644 +index 7ec0901cf6ba..db5b5529a4cd 100644 --- content/public/renderer/content_renderer_client.h +++ content/public/renderer/content_renderer_client.h @@ -82,6 +82,9 @@ class CONTENT_EXPORT ContentRendererClient { @@ -334,7 +334,7 @@ index 7ec0901cf6ba2..db5b5529a4cda 100644 // started. virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {} diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc -index 118192cb4ea36..f1c38d907ba97 100644 +index 118192cb4ea3..f1c38d907ba9 100644 --- content/renderer/render_frame_impl.cc +++ content/renderer/render_frame_impl.cc @@ -3320,7 +3320,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin( @@ -348,7 +348,7 @@ index 118192cb4ea36..f1c38d907ba97 100644 &mime_type); if (!found) diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc -index d372704f462dc..29fc97bd3e48b 100644 +index d372704f462d..29fc97bd3e48 100644 --- content/renderer/render_thread_impl.cc +++ content/renderer/render_thread_impl.cc @@ -607,6 +607,8 @@ void RenderThreadImpl::Init() { @@ -361,7 +361,7 @@ index d372704f462dc..29fc97bd3e48b 100644 &RenderThreadImpl::OnRendererInterfaceReceiver, base::Unretained(this))); diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc -index 2ca27e17e9e10..e4b443d28af38 100644 +index 2ca27e17e9e1..e4b443d28af3 100644 --- content/renderer/renderer_blink_platform_impl.cc +++ content/renderer/renderer_blink_platform_impl.cc @@ -1107,6 +1107,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() { @@ -381,7 +381,7 @@ index 2ca27e17e9e10..e4b443d28af38 100644 if (!code_cache_host_) { code_cache_host_ = mojo::SharedRemote( diff --git content/renderer/renderer_blink_platform_impl.h content/renderer/renderer_blink_platform_impl.h -index cb8770a47a808..34df834f31b83 100644 +index cb8770a47a80..34df834f31b8 100644 --- content/renderer/renderer_blink_platform_impl.h +++ content/renderer/renderer_blink_platform_impl.h @@ -258,6 +258,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { @@ -395,7 +395,7 @@ index cb8770a47a808..34df834f31b83 100644 // plus eTLD+1, such as https://google.com), or to a more specific origin. void SetIsLockedToSite(); diff --git content/shell/browser/shell_plugin_service_filter.cc content/shell/browser/shell_plugin_service_filter.cc -index c25b7d1a18432..7e007d964f1a1 100644 +index c25b7d1a1843..7e007d964f1a 100644 --- content/shell/browser/shell_plugin_service_filter.cc +++ content/shell/browser/shell_plugin_service_filter.cc @@ -17,6 +17,7 @@ bool ShellPluginServiceFilter::IsPluginAvailable( @@ -407,7 +407,7 @@ index c25b7d1a18432..7e007d964f1a1 100644 WebPluginInfo* plugin) { return plugin->name == u"Blink Test Plugin" || diff --git content/shell/browser/shell_plugin_service_filter.h content/shell/browser/shell_plugin_service_filter.h -index 337b4b0653fe2..107ab4c9d8a85 100644 +index 337b4b0653fe..107ab4c9d8a8 100644 --- content/shell/browser/shell_plugin_service_filter.h +++ content/shell/browser/shell_plugin_service_filter.h @@ -20,6 +20,7 @@ class ShellPluginServiceFilter : public PluginServiceFilter { diff --git a/patch/patches/net_cookie_flags.patch b/patch/patches/net_cookie_flags.patch index 0a3a58654..fbe23fa30 100644 --- a/patch/patches/net_cookie_flags.patch +++ b/patch/patches/net_cookie_flags.patch @@ -10,10 +10,10 @@ index 96d1a51ec107..e8120a818b1f 100644 +// This load will not send any cookies. For CEF usage. +LOAD_FLAG(DO_NOT_SEND_COOKIES, 1 << 17) diff --git net/url_request/url_request_http_job.cc net/url_request/url_request_http_job.cc -index 3f7b5bb32fa2..2c092b62f3ce 100644 +index 596e93a13605..1750f1c936dd 100644 --- net/url_request/url_request_http_job.cc +++ net/url_request/url_request_http_job.cc -@@ -566,7 +566,8 @@ void URLRequestHttpJob::AddCookieHeaderAndStart() { +@@ -565,7 +565,8 @@ void URLRequestHttpJob::AddCookieHeaderAndStart() { // Read cookies whenever allow_credentials() is true, even if the PrivacyMode // is being overridden by NetworkDelegate and will eventually block them, as // blocked cookies still need to be logged in that case. diff --git a/patch/patches/services_network_2718.patch b/patch/patches/services_network_2718.patch index 9a9ad241f..41851142e 100644 --- a/patch/patches/services_network_2718.patch +++ b/patch/patches/services_network_2718.patch @@ -1,5 +1,5 @@ diff --git content/browser/storage_partition_impl.cc content/browser/storage_partition_impl.cc -index ba5ab2ff3ef43..de29e2f77abda 100644 +index ba5ab2ff3ef4..de29e2f77abd 100644 --- content/browser/storage_partition_impl.cc +++ content/browser/storage_partition_impl.cc @@ -494,10 +494,6 @@ class LoginHandlerDelegate { diff --git a/patch/patches/webkit_plugin_info_2015.patch b/patch/patches/webkit_plugin_info_2015.patch index a74eee529..1af314d3f 100644 --- a/patch/patches/webkit_plugin_info_2015.patch +++ b/patch/patches/webkit_plugin_info_2015.patch @@ -1,5 +1,5 @@ diff --git third_party/blink/public/mojom/plugins/plugin_registry.mojom third_party/blink/public/mojom/plugins/plugin_registry.mojom -index ff7a8ed89e94a..77f44956ff22f 100644 +index ff7a8ed89e94..77f44956ff22 100644 --- third_party/blink/public/mojom/plugins/plugin_registry.mojom +++ third_party/blink/public/mojom/plugins/plugin_registry.mojom @@ -36,5 +36,5 @@ interface PluginRegistry { @@ -10,7 +10,7 @@ index ff7a8ed89e94a..77f44956ff22f 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 9d96af5c4c9b5..fee49109c35d3 100644 +index 9d96af5c4c9b..fee49109c35d 100644 --- third_party/blink/public/platform/platform.h +++ third_party/blink/public/platform/platform.h @@ -875,6 +875,11 @@ class BLINK_PLATFORM_EXPORT Platform { @@ -26,7 +26,7 @@ index 9d96af5c4c9b5..fee49109c35d3 100644 static void InitializeMainThreadCommon(Platform* platform, std::unique_ptr main_thread); diff --git third_party/blink/renderer/core/dom/document_init.cc third_party/blink/renderer/core/dom/document_init.cc -index 463e3e5e73419..97aaf0da2b9a5 100644 +index 463e3e5e7341..97aaf0da2b9a 100644 --- third_party/blink/renderer/core/dom/document_init.cc +++ third_party/blink/renderer/core/dom/document_init.cc @@ -177,11 +177,11 @@ PluginData* DocumentInit::GetPluginData(LocalFrame* frame, const KURL& url) { @@ -44,7 +44,7 @@ index 463e3e5e73419..97aaf0da2b9a5 100644 DocumentInit& DocumentInit::WithTypeFrom(const String& mime_type) { diff --git third_party/blink/renderer/core/frame/local_frame.cc third_party/blink/renderer/core/frame/local_frame.cc -index c0f2ba8de2f77..745dfcb704ad2 100644 +index c0f2ba8de2f7..745dfcb704ad 100644 --- third_party/blink/renderer/core/frame/local_frame.cc +++ third_party/blink/renderer/core/frame/local_frame.cc @@ -1879,7 +1879,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() { @@ -57,7 +57,7 @@ index c0f2ba8de2f77..745dfcb704ad2 100644 } diff --git third_party/blink/renderer/core/inspector/devtools_session.cc third_party/blink/renderer/core/inspector/devtools_session.cc -index 881b5a6234586..c28e864b98bc1 100644 +index 881b5a623458..c28e864b98bc 100644 --- third_party/blink/renderer/core/inspector/devtools_session.cc +++ third_party/blink/renderer/core/inspector/devtools_session.cc @@ -8,6 +8,7 @@ @@ -85,7 +85,7 @@ index 881b5a6234586..c28e864b98bc1 100644 void DevToolsSession::DispatchProtocolCommand( diff --git third_party/blink/renderer/core/page/page.cc third_party/blink/renderer/core/page/page.cc -index 3afca2407df4b..6127652fb5f42 100644 +index 3afca2407df4..6127652fb5f4 100644 --- third_party/blink/renderer/core/page/page.cc +++ third_party/blink/renderer/core/page/page.cc @@ -212,7 +212,8 @@ Page::Page(base::PassKey, @@ -160,7 +160,7 @@ index 3afca2407df4b..6127652fb5f42 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 72e214c315acf..c89b578f7d6d5 100644 +index 72e214c315ac..c89b578f7d6d 100644 --- third_party/blink/renderer/core/page/page.h +++ third_party/blink/renderer/core/page/page.h @@ -148,7 +148,8 @@ class CORE_EXPORT Page final : public GarbageCollected, @@ -184,7 +184,7 @@ index 72e214c315acf..c89b578f7d6d5 100644 Member validation_message_client_; diff --git third_party/blink/renderer/core/page/plugin_data.cc third_party/blink/renderer/core/page/plugin_data.cc -index a7a72fb87a672..84a07fc6f0413 100644 +index a7a72fb87a67..84a07fc6f041 100644 --- third_party/blink/renderer/core/page/plugin_data.cc +++ third_party/blink/renderer/core/page/plugin_data.cc @@ -92,10 +92,12 @@ void PluginData::RefreshBrowserSidePluginCache() { @@ -212,7 +212,7 @@ index a7a72fb87a672..84a07fc6f0413 100644 auto* plugin_info = MakeGarbageCollected( plugin->name, FilePathToWebString(plugin->filename), diff --git third_party/blink/renderer/core/page/plugin_data.h third_party/blink/renderer/core/page/plugin_data.h -index 310319d4595be..491b7705a006c 100644 +index 310319d4595b..491b7705a006 100644 --- third_party/blink/renderer/core/page/plugin_data.h +++ third_party/blink/renderer/core/page/plugin_data.h @@ -98,7 +98,8 @@ class CORE_EXPORT PluginData final : public GarbageCollected {