diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 06337e833..2722c6c33 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/75.0.3770.0' + 'chromium_checkout': 'refs/tags/75.0.3770.80' } diff --git a/patch/patch.cfg b/patch/patch.cfg index 89a737b92..1e9968478 100644 --- a/patch/patch.cfg +++ b/patch/patch.cfg @@ -368,9 +368,6 @@ patches = [ { # macOS: Fix undesirable switch to discrete GPU during startup. # https://bitbucket.org/chromiumembedded/cef/issues/2398 - # - # macOS: Rely on symlinks to find the Libraries directory. - # https://bugs.chromium.org/p/chromium/issues/detail?id=757974#c23 'name': 'mac_gpu', }, { @@ -445,10 +442,5 @@ patches = [ # unique_ptr types. # https://chromium-review.googlesource.com/c/chromium/src/+/1584292 'name': 'compositor_frame_reporting_controller_1584292', - }, - { - # Fix AssertContextWasntDestroyed due to pointer reuse. - # https://chromium-review.googlesource.com/c/chromium/src/+/1590418 - 'name': 'simple_dependency_manager_1590418', } ] diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index dc6389e6c..40a427f00 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 987b36217aad..832eab3ee56a 100644 +index 600fe26a3f35..1888bc494bcc 100644 --- chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn @@ -8,6 +8,7 @@ import("//build/config/features.gni") @@ -29,7 +29,7 @@ index 987b36217aad..832eab3ee56a 100644 if (is_android) { sources += [ "after_startup_task_utils_android.cc", -@@ -3916,7 +3922,7 @@ jumbo_split_static_library("browser") { +@@ -3917,7 +3923,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 2c5bf4333..e4d555ef0 100644 --- a/patch/patches/chrome_browser_net_export.patch +++ b/patch/patches/chrome_browser_net_export.patch @@ -51,7 +51,7 @@ index 6c8e21f6f5fe..4496c5579265 100644 override; network::NetworkQualityTracker* network_quality_tracker() override; diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn -index 535c4f04c0f3..8cd8768022ae 100644 +index 7561cab16804..407f7a6008a3 100644 --- chrome/browser/ui/BUILD.gn +++ chrome/browser/ui/BUILD.gn @@ -9,6 +9,7 @@ import("//build/config/features.gni") diff --git a/patch/patches/chrome_browser_product_override.patch b/patch/patches/chrome_browser_product_override.patch index 2c63dd4f5..a0bc877f9 100644 --- a/patch/patches/chrome_browser_product_override.patch +++ b/patch/patches/chrome_browser_product_override.patch @@ -1,8 +1,8 @@ diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc -index cf4250c7ba26..b8a05db7cced 100644 +index 26c3593d94d0..1ca67c62e464 100644 --- chrome/browser/chrome_content_browser_client.cc +++ chrome/browser/chrome_content_browser_client.cc -@@ -1049,12 +1049,16 @@ void LaunchURL( +@@ -1063,12 +1063,16 @@ void LaunchURL( } } @@ -22,7 +22,7 @@ index cf4250c7ba26..b8a05db7cced 100644 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); if (command_line->HasSwitch(switches::kUserAgent)) { diff --git chrome/browser/chrome_content_browser_client.h chrome/browser/chrome_content_browser_client.h -index 07e0e051ff1d..41337a1719a1 100644 +index 6bbed7653db9..f663648004ee 100644 --- chrome/browser/chrome_content_browser_client.h +++ chrome/browser/chrome_content_browser_client.h @@ -77,7 +77,8 @@ class Origin; diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index 8979a28cc..5f1d170a0 100644 --- a/patch/patches/content_2015.patch +++ b/patch/patches/content_2015.patch @@ -278,10 +278,10 @@ index 8673d65844ea..7d13c72dca9b 100644 std::string /* mime_type */, bool /* found */, diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h -index 0a1bf5d0b4d1..6dea4f0f4a44 100644 +index 39174b67d1d3..f5a825c113cf 100644 --- content/public/browser/content_browser_client.h +++ content/public/browser/content_browser_client.h -@@ -1460,6 +1460,15 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -1466,6 +1466,15 @@ class CONTENT_EXPORT ContentBrowserClient { network::mojom::URLLoaderFactoryRequest* factory_request, network::mojom::URLLoaderFactory*& out_factory); @@ -297,7 +297,7 @@ index 0a1bf5d0b4d1..6dea4f0f4a44 100644 // Creates an OverlayWindow to be used for Picture-in-Picture. This window // will house the content shown when in Picture-in-Picture mode. This will // return a new OverlayWindow. -@@ -1527,6 +1536,10 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -1533,6 +1542,10 @@ class CONTENT_EXPORT ContentBrowserClient { // Used as part of the user agent string. virtual std::string GetProduct() const; diff --git a/patch/patches/linux_gtk_2014.patch b/patch/patches/linux_gtk_2014.patch index a38c74481..003bf6e46 100644 --- a/patch/patches/linux_gtk_2014.patch +++ b/patch/patches/linux_gtk_2014.patch @@ -68,10 +68,10 @@ index c3511e3e6a66..3500f4a2b005 100644 void ChromeBrowserMainExtraPartsViewsLinux::ToolkitInitialized() { diff --git chrome/test/BUILD.gn chrome/test/BUILD.gn -index 5406779a17c2..b1ed0f2c970b 100644 +index 63be9ca9369f..9f73a3c841f3 100644 --- chrome/test/BUILD.gn +++ chrome/test/BUILD.gn -@@ -4159,7 +4159,7 @@ test("unit_tests") { +@@ -4170,7 +4170,7 @@ test("unit_tests") { "../browser/ui/input_method/input_method_engine_unittest.cc", ] } @@ -80,7 +80,7 @@ index 5406779a17c2..b1ed0f2c970b 100644 sources += [ "../browser/ui/libgtkui/select_file_dialog_impl_gtk_unittest.cc" ] deps += [ "//build/config/linux/gtk" ] -@@ -4180,7 +4180,7 @@ test("unit_tests") { +@@ -4191,7 +4191,7 @@ test("unit_tests") { if (use_gio) { configs += [ "//build/linux:gio_config" ] } @@ -89,7 +89,7 @@ index 5406779a17c2..b1ed0f2c970b 100644 deps += [ "//chrome/browser/ui/libgtkui" ] } -@@ -5206,7 +5206,7 @@ if (!is_android) { +@@ -5217,7 +5217,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/linux_poll_2466.patch b/patch/patches/linux_poll_2466.patch index 58dbbdc6b..ee9f98595 100644 --- a/patch/patches/linux_poll_2466.patch +++ b/patch/patches/linux_poll_2466.patch @@ -1,5 +1,5 @@ diff --git base/files/file_path_watcher_linux.cc base/files/file_path_watcher_linux.cc -index 22732f2864ef..7d5caef5c3b0 100644 +index 3f5eb8e2e002..245a0ca9055f 100644 --- base/files/file_path_watcher_linux.cc +++ base/files/file_path_watcher_linux.cc @@ -5,6 +5,7 @@ @@ -15,10 +15,10 @@ index 22732f2864ef..7d5caef5c3b0 100644 #include +#include + #include #include #include - #include -@@ -220,22 +222,15 @@ void InotifyReaderThreadDelegate::ThreadMain() { +@@ -263,22 +265,15 @@ void InotifyReaderThreadDelegate::ThreadMain() { PlatformThread::SetName("inotify_reader"); // Make sure the file descriptors are good for use with select(). diff --git a/patch/patches/mac_gpu.patch b/patch/patches/mac_gpu.patch index 46d35b4c6..aa68bdb5f 100644 --- a/patch/patches/mac_gpu.patch +++ b/patch/patches/mac_gpu.patch @@ -1,5 +1,5 @@ diff --git ui/gl/init/gl_initializer_mac.cc ui/gl/init/gl_initializer_mac.cc -index 85cab0eaef3e..37b2d42a34f5 100644 +index 8d690474060f..03059842b1a4 100644 --- ui/gl/init/gl_initializer_mac.cc +++ ui/gl/init/gl_initializer_mac.cc @@ -46,11 +46,8 @@ bool InitializeOneOffForSandbox() { @@ -16,14 +16,3 @@ index 85cab0eaef3e..37b2d42a34f5 100644 if (GetGLImplementation() == kGLImplementationAppleGL) { attribs.push_back(kCGLPFARendererID); attribs.push_back( -@@ -102,8 +99,8 @@ bool InitializeStaticEGLInternal(GLImplementation implementation) { - // as app bundles. In that case, the .dylib is next to the executable. - base::FilePath base_dir; - if (base::mac::AmIBundled()) { -- base_dir = -- base::mac::FrameworkBundlePath().Append("Versions/Current/Libraries/"); -+ // Rely on symlinks to find the correct version. -+ base_dir = base::mac::FrameworkBundlePath().Append("Libraries/"); - } else { - if (!base::PathService::Get(base::FILE_EXE, &base_dir)) { - LOG(ERROR) << "PathService::Get failed."; diff --git a/patch/patches/prefs_content_1161.patch b/patch/patches/prefs_content_1161.patch index 0719964d7..68ec6cb05 100644 --- a/patch/patches/prefs_content_1161.patch +++ b/patch/patches/prefs_content_1161.patch @@ -1,5 +1,5 @@ diff --git content/public/common/common_param_traits_macros.h content/public/common/common_param_traits_macros.h -index 24bded9417c5..cb5d04ab32ab 100644 +index c97b4e009baa..04dee2983825 100644 --- content/public/common/common_param_traits_macros.h +++ content/public/common/common_param_traits_macros.h @@ -189,6 +189,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences) @@ -35,7 +35,7 @@ index a83015f3629a..fe79480e9af7 100644 bool record_whole_document; diff --git content/renderer/render_view_impl.cc content/renderer/render_view_impl.cc -index 3e328daa5827..7d0869aa29fd 100644 +index 83e40b6568da..b47165e7ac74 100644 --- content/renderer/render_view_impl.cc +++ content/renderer/render_view_impl.cc @@ -1026,6 +1026,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs, diff --git a/patch/patches/renderer_preferences_util_545103.patch b/patch/patches/renderer_preferences_util_545103.patch index 91af65e86..0d72f64bb 100644 --- a/patch/patches/renderer_preferences_util_545103.patch +++ b/patch/patches/renderer_preferences_util_545103.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/renderer_preferences_util.cc chrome/browser/renderer_preferences_util.cc -index f5ed7f0683c5..5b31fb309985 100644 +index 77a1a97f5e8e..c4f1c94db8b3 100644 --- chrome/browser/renderer_preferences_util.cc +++ chrome/browser/renderer_preferences_util.cc @@ -29,7 +29,8 @@ diff --git a/patch/patches/services_network_2622.patch b/patch/patches/services_network_2622.patch index 46ced3bb3..90d066f24 100644 --- a/patch/patches/services_network_2622.patch +++ b/patch/patches/services_network_2622.patch @@ -35,7 +35,7 @@ index 2b24d1ac1b5b..6577495d87a9 100644 base_cache_path.Append(chrome::kCacheDirname); network_context_params->http_cache_max_size = diff --git chrome/browser/profiles/profile.h chrome/browser/profiles/profile.h -index e77d8abd6601..88331e9af5e0 100644 +index 737f5f8b8193..241edaa39671 100644 --- chrome/browser/profiles/profile.h +++ chrome/browser/profiles/profile.h @@ -321,6 +321,11 @@ class Profile : public content::BrowserContext { @@ -132,10 +132,10 @@ index 8be1b9dea5f7..30f23449ac51 100644 void CookieManager::SetForceKeepSessionState() { diff --git services/network/network_context.cc services/network/network_context.cc -index 9d6f7b930e11..c16e5ca90c14 100644 +index 9349b0bea419..167b6df982d0 100644 --- services/network/network_context.cc +++ services/network/network_context.cc -@@ -1742,6 +1742,7 @@ URLRequestContextOwner NetworkContext::ApplyContextParamsToBuilder( +@@ -1753,6 +1753,7 @@ URLRequestContextOwner NetworkContext::ApplyContextParamsToBuilder( } scoped_refptr session_cleanup_cookie_store; @@ -143,7 +143,7 @@ index 9d6f7b930e11..c16e5ca90c14 100644 if (params_->cookie_path) { scoped_refptr client_task_runner = base::MessageLoopCurrent::Get()->task_runner(); -@@ -1769,18 +1770,27 @@ URLRequestContextOwner NetworkContext::ApplyContextParamsToBuilder( +@@ -1780,18 +1781,27 @@ URLRequestContextOwner NetworkContext::ApplyContextParamsToBuilder( session_cleanup_cookie_store = base::MakeRefCounted(sqlite_store); diff --git a/patch/patches/simple_dependency_manager_1590418.patch b/patch/patches/simple_dependency_manager_1590418.patch deleted file mode 100644 index 552d2cf2c..000000000 --- a/patch/patches/simple_dependency_manager_1590418.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git chrome/browser/profiles/profile_key.cc chrome/browser/profiles/profile_key.cc -index b225f2b..946403e 100644 ---- chrome/browser/profiles/profile_key.cc -+++ chrome/browser/profiles/profile_key.cc -@@ -5,9 +5,12 @@ - #include "chrome/browser/profiles/profile_key.h" - - #include "base/logging.h" -+#include "components/keyed_service/core/simple_dependency_manager.h" - - ProfileKey::ProfileKey(const base::FilePath& path, ProfileKey* original_key) -- : SimpleFactoryKey(path), prefs_(nullptr), original_key_(original_key) {} -+ : SimpleFactoryKey(path), prefs_(nullptr), original_key_(original_key) { -+ SimpleDependencyManager::GetInstance()->MarkContextLive(this); -+} - - ProfileKey::~ProfileKey() = default; - -diff --git components/keyed_service/core/simple_dependency_manager.cc components/keyed_service/core/simple_dependency_manager.cc -index 254c6ef..57d20b9 100644 ---- components/keyed_service/core/simple_dependency_manager.cc -+++ components/keyed_service/core/simple_dependency_manager.cc -@@ -43,6 +43,10 @@ - DependencyManager::CreateContextServices(key, true); - } - -+void SimpleDependencyManager::MarkContextLive(SimpleFactoryKey* key) { -+ DependencyManager::MarkContextLive(key); -+} -+ - SimpleDependencyManager::SimpleDependencyManager() = default; - - SimpleDependencyManager::~SimpleDependencyManager() = default; -diff --git components/keyed_service/core/simple_dependency_manager.h components/keyed_service/core/simple_dependency_manager.h -index 72fa74c..480f971 100644 ---- components/keyed_service/core/simple_dependency_manager.h -+++ components/keyed_service/core/simple_dependency_manager.h -@@ -35,6 +35,11 @@ - // ServiceIsNULLWhileTesting(). - void CreateServicesForTest(SimpleFactoryKey* key); - -+ // Marks |context| as live (i.e., not stale). This method can be called as a -+ // safeguard against |AssertContextWasntDestroyed()| checks going off due to -+ // |context| aliasing an instance from a prior construction. -+ void MarkContextLive(SimpleFactoryKey* key); -+ - private: - ~SimpleDependencyManager() override; - diff --git a/patch/patches/storage_incognito_2289.patch b/patch/patches/storage_incognito_2289.patch index beb1b4b9f..357b58a0a 100644 --- a/patch/patches/storage_incognito_2289.patch +++ b/patch/patches/storage_incognito_2289.patch @@ -52,7 +52,7 @@ index b2b3920da3b0..686afc464b42 100644 std::move(stats_db), BrowserFeatureProvider::GetFactoryCB()); decode_history = new_decode_history.get(); diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc -index f3a90e61f2b4..a9d322d66d86 100644 +index 0866af8555cd..cc5750725c30 100644 --- content/browser/renderer_host/render_process_host_impl.cc +++ content/browser/renderer_host/render_process_host_impl.cc @@ -2203,6 +2203,9 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { diff --git a/patch/patches/views_1749_2102.patch b/patch/patches/views_1749_2102.patch index 113893376..a926078c2 100644 --- a/patch/patches/views_1749_2102.patch +++ b/patch/patches/views_1749_2102.patch @@ -39,7 +39,7 @@ index cce16a111356..9f0a8b73adb5 100644 virtual void MenuWillShow() {} diff --git ui/gfx/render_text.cc ui/gfx/render_text.cc -index 9c38cd6d4fdb..dcd34308a8bc 100644 +index 9d665b99613c..543f79f3beb7 100644 --- ui/gfx/render_text.cc +++ ui/gfx/render_text.cc @@ -514,6 +514,14 @@ void RenderText::SetElideBehavior(ElideBehavior elide_behavior) { @@ -240,7 +240,7 @@ index 9df5c850d12d..e7007ffbb762 100644 std::unique_ptr selection_controller_; diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc -index 5e630a1a5f47..a3725641c2db 100644 +index eb93ba807319..b558892cc737 100644 --- ui/views/controls/menu/menu_controller.cc +++ ui/views/controls/menu/menu_controller.cc @@ -2570,8 +2570,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem( diff --git a/patch/patches/web_contents_1257_1565.patch b/patch/patches/web_contents_1257_1565.patch index 5226510b4..7cdca2b57 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 1491bf580c59..ab2c83357303 100644 +index 70e30ae11033..633a3f1ba3f7 100644 --- content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc -@@ -2068,21 +2068,30 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { +@@ -2069,21 +2069,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 1491bf580c59..ab2c83357303 100644 CHECK(render_view_host_delegate_view_); CHECK(view_.get()); -@@ -2781,6 +2790,15 @@ void WebContentsImpl::CreateNewWindow( +@@ -2782,6 +2791,15 @@ void WebContentsImpl::CreateNewWindow( create_params.renderer_initiated_creation = main_frame_route_id != MSG_ROUTING_NONE; @@ -61,7 +61,7 @@ index 1491bf580c59..ab2c83357303 100644 std::unique_ptr new_contents; if (!is_guest) { create_params.context = view_->GetNativeView(); -@@ -2813,7 +2831,7 @@ void WebContentsImpl::CreateNewWindow( +@@ -2814,7 +2832,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 1491bf580c59..ab2c83357303 100644 } // Save the created window associated with the route so we can show it // later. -@@ -6372,7 +6390,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() { +@@ -6381,7 +6399,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 2b16b1274..ec5da0c86 100644 --- a/patch/patches/webkit_plugin_info_2015.patch +++ b/patch/patches/webkit_plugin_info_2015.patch @@ -44,7 +44,7 @@ index a616fafed51f..dae131dad5de 100644 .Top() .GetSecurityContext() diff --git third_party/blink/renderer/core/frame/local_frame.cc third_party/blink/renderer/core/frame/local_frame.cc -index dd0e2f0df7b5..3c3ff59f72a9 100644 +index c1f7d53655bd..728fec52942f 100644 --- third_party/blink/renderer/core/frame/local_frame.cc +++ third_party/blink/renderer/core/frame/local_frame.cc @@ -1257,7 +1257,7 @@ FrameResourceCoordinator* LocalFrame::GetFrameResourceCoordinator() { @@ -85,10 +85,10 @@ index 6435384652b7..79bd103df30d 100644 void DevToolsSession::FlushProtocolNotifications() { diff --git third_party/blink/renderer/core/page/page.cc third_party/blink/renderer/core/page/page.cc -index 5480f0e29789..3bf2f35c9741 100644 +index 1c2e3dbbb014..4a01e801edde 100644 --- third_party/blink/renderer/core/page/page.cc +++ third_party/blink/renderer/core/page/page.cc -@@ -180,7 +180,8 @@ Page::Page(PageClients& page_clients) +@@ -185,7 +185,8 @@ Page::Page(PageClients& page_clients) MakeGarbageCollected(GetVisualViewport(), GetChromeClient())), link_highlights_(MakeGarbageCollected(*this)), @@ -98,7 +98,7 @@ index 5480f0e29789..3bf2f35c9741 100644 // TODO(pdr): Initialize |validation_message_client_| lazily. validation_message_client_( MakeGarbageCollected(*this)), -@@ -337,21 +338,40 @@ void Page::InitialStyleChanged() { +@@ -346,21 +347,40 @@ void Page::InitialStyleChanged() { } } @@ -148,7 +148,7 @@ index 5480f0e29789..3bf2f35c9741 100644 page->NotifyPluginsChanged(); } } -@@ -786,7 +806,8 @@ void Page::Trace(blink::Visitor* visitor) { +@@ -803,7 +823,8 @@ void Page::Trace(blink::Visitor* visitor) { visitor->Trace(link_highlights_); visitor->Trace(spatial_navigation_controller_); visitor->Trace(main_frame_); @@ -159,7 +159,7 @@ index 5480f0e29789..3bf2f35c9741 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 f3d748e4a3e7..3750ba015d76 100644 +index eb5e930c4653..3a12676266d3 100644 --- third_party/blink/renderer/core/page/page.h +++ third_party/blink/renderer/core/page/page.h @@ -140,7 +140,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized, @@ -172,7 +172,7 @@ index f3d748e4a3e7..3750ba015d76 100644 // Resets the plugin data for all pages in the renderer process and notifies // PluginsChangedObservers. -@@ -364,7 +365,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized, +@@ -366,7 +367,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized, const Member link_highlights_; Member spatial_navigation_controller_; diff --git a/patch/patches/webkit_pointer_event_781966.patch b/patch/patches/webkit_pointer_event_781966.patch index 7746bc9d4..780248585 100644 --- a/patch/patches/webkit_pointer_event_781966.patch +++ b/patch/patches/webkit_pointer_event_781966.patch @@ -1,8 +1,8 @@ diff --git third_party/blink/renderer/core/input/pointer_event_manager.cc third_party/blink/renderer/core/input/pointer_event_manager.cc -index b84e3bdd6679..a0d65d9a65a1 100644 +index 6a7744b5f75f..1368809f0740 100644 --- third_party/blink/renderer/core/input/pointer_event_manager.cc +++ third_party/blink/renderer/core/input/pointer_event_manager.cc -@@ -285,7 +285,7 @@ void PointerEventManager::HandlePointerInterruption( +@@ -311,7 +311,7 @@ void PointerEventManager::HandlePointerInterruption( for (auto pointer_event : canceled_pointer_events) { // If we are sending a pointercancel we have sent the pointerevent to some // target before. diff --git a/patch/patches/webkit_popups.patch b/patch/patches/webkit_popups.patch index 436450a83..512ee5490 100644 --- a/patch/patches/webkit_popups.patch +++ b/patch/patches/webkit_popups.patch @@ -11,7 +11,7 @@ index f831c084e1d3..80dd4ea3a154 100644 // Cancels and hides the current popup (datetime, select...) if any. virtual void CancelPagePopup() = 0; diff --git third_party/blink/renderer/core/exported/web_view_impl.cc third_party/blink/renderer/core/exported/web_view_impl.cc -index fa2150289b4f..611dffb1ef7d 100644 +index 6ff1e3ca2f18..5da32fea5993 100644 --- third_party/blink/renderer/core/exported/web_view_impl.cc +++ third_party/blink/renderer/core/exported/web_view_impl.cc @@ -238,8 +238,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) { @@ -39,7 +39,7 @@ index fa2150289b4f..611dffb1ef7d 100644 fullscreen_controller_(std::make_unique(this)) { if (!AsView().client) { diff --git third_party/blink/renderer/core/exported/web_view_impl.h third_party/blink/renderer/core/exported/web_view_impl.h -index aaa17462ee65..647b51d8fddc 100644 +index 64a22db62dba..09713163f4a0 100644 --- third_party/blink/renderer/core/exported/web_view_impl.h +++ third_party/blink/renderer/core/exported/web_view_impl.h @@ -105,7 +105,8 @@ class CORE_EXPORT WebViewImpl final : public WebView, diff --git a/patch/patches/webview_plugin_2020.patch b/patch/patches/webview_plugin_2020.patch index a89a9a67c..7d5e19da4 100644 --- a/patch/patches/webview_plugin_2020.patch +++ b/patch/patches/webview_plugin_2020.patch @@ -1,8 +1,8 @@ diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd -index 4989fa559ee6..c6859944e8b4 100644 +index 27c735629140..929ddbca4a6c 100644 --- chrome/app/generated_resources.grd +++ chrome/app/generated_resources.grd -@@ -4644,7 +4644,7 @@ Keep your key file in a safe place. You will need it to create new versions of y +@@ -4645,7 +4645,7 @@ Keep your key file in a safe place. You will need it to create new versions of y