diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 0ceaf0bc7..07aa05fad 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/131.0.6778.13' + 'chromium_checkout': 'refs/tags/131.0.6778.70' } diff --git a/libcef/browser/osr/web_contents_view_osr.h b/libcef/browser/osr/web_contents_view_osr.h index 458e8143a..a15854369 100644 --- a/libcef/browser/osr/web_contents_view_osr.h +++ b/libcef/browser/osr/web_contents_view_osr.h @@ -65,6 +65,7 @@ class CefWebContentsViewOSR : public content::WebContentsView, GetBackForwardTransitionAnimationManager() override { return nullptr; } + void DestroyBackForwardTransitionAnimationManager() override {} #if BUILDFLAG(IS_MAC) bool CloseTabAfterEventTrackingIfNeeded() override { return false; } diff --git a/patch/patches/browser_security_policy_1081397.patch b/patch/patches/browser_security_policy_1081397.patch index fb15dcaad..dd31b226a 100644 --- a/patch/patches/browser_security_policy_1081397.patch +++ b/patch/patches/browser_security_policy_1081397.patch @@ -20,7 +20,7 @@ index eae60792ce033..6f6641e3fd3dd 100644 // Make an exception to allow most visited tiles to commit in third-party diff --git content/browser/renderer_host/navigation_request.cc content/browser/renderer_host/navigation_request.cc -index 53bba48293111..78fbed7d2c507 100644 +index 6f46f45b41597..d303f579b414c 100644 --- content/browser/renderer_host/navigation_request.cc +++ content/browser/renderer_host/navigation_request.cc @@ -8245,10 +8245,22 @@ NavigationRequest::GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo( diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index c2042478f..f01053d0e 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 31ad4d86787ac..435e19b1eac56 100644 +index 54279426733f7..435dc352ca0f5 100644 --- chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn @@ -12,6 +12,7 @@ import("//build/config/compiler/pgo/pgo.gni") @@ -10,7 +10,7 @@ index 31ad4d86787ac..435e19b1eac56 100644 import("//chrome/browser/buildflags.gni") import("//chrome/browser/downgrade/buildflags.gni") import("//chrome/browser/request_header_integrity/buildflags.gni") -@@ -1849,6 +1850,7 @@ static_library("browser") { +@@ -1852,6 +1853,7 @@ static_library("browser") { "//build/config/chromebox_for_meetings:buildflags", "//build/config/compiler:compiler_buildflags", "//cc", @@ -18,7 +18,7 @@ index 31ad4d86787ac..435e19b1eac56 100644 "//chrome:extra_resources", "//chrome:resources", "//chrome:strings", -@@ -2522,6 +2524,10 @@ static_library("browser") { +@@ -2525,6 +2527,10 @@ static_library("browser") { ] } diff --git a/patch/patches/chrome_browser_browser.patch b/patch/patches/chrome_browser_browser.patch index 6990d9e0a..f228bcb61 100644 --- a/patch/patches/chrome_browser_browser.patch +++ b/patch/patches/chrome_browser_browser.patch @@ -13,7 +13,7 @@ index 2480282a19d12..dbd1fbf8a15b5 100644 return false; } diff --git chrome/browser/devtools/devtools_window.cc chrome/browser/devtools/devtools_window.cc -index 63b6bc3a35b40..91a9a3d42a7c1 100644 +index 787a485764b9c..2da2fd82787a0 100644 --- chrome/browser/devtools/devtools_window.cc +++ chrome/browser/devtools/devtools_window.cc @@ -38,6 +38,7 @@ @@ -88,7 +88,7 @@ index 63b6bc3a35b40..91a9a3d42a7c1 100644 } diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn -index 04bfa8a3f5229..535230f4997cf 100644 +index 4c9e41d73cedd..eed762cd05bf9 100644 --- chrome/browser/ui/BUILD.gn +++ chrome/browser/ui/BUILD.gn @@ -8,6 +8,7 @@ import("//build/config/compiler/compiler.gni") @@ -129,7 +129,7 @@ index 04bfa8a3f5229..535230f4997cf 100644 # TODO(crbug.com/41437292): Remove this circular dependency. # Any circular includes must depend on the target "//chrome/browser:browser_public_dependencies". # These are all-platform circular includes. -@@ -5510,6 +5520,7 @@ static_library("ui") { +@@ -5512,6 +5522,7 @@ static_library("ui") { if (enable_printing) { deps += [ "//components/printing/browser", @@ -138,10 +138,10 @@ index 04bfa8a3f5229..535230f4997cf 100644 ] } diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc -index e87612be40627..41f088fd227b7 100644 +index df205a82b34c4..042df3763233b 100644 --- chrome/browser/ui/browser.cc +++ chrome/browser/ui/browser.cc -@@ -273,6 +273,25 @@ +@@ -272,6 +272,25 @@ #include "components/captive_portal/content/captive_portal_tab_helper.h" #endif @@ -167,7 +167,7 @@ index e87612be40627..41f088fd227b7 100644 #if BUILDFLAG(ENABLE_EXTENSIONS) #include "chrome/browser/extensions/extension_browser_window_helper.h" #endif -@@ -537,6 +556,10 @@ Browser::Browser(const CreateParams& params) +@@ -535,6 +554,10 @@ Browser::Browser(const CreateParams& params) type_(params.type), profile_(params.profile), window_(nullptr), @@ -178,7 +178,7 @@ index e87612be40627..41f088fd227b7 100644 tab_strip_model_delegate_( std::make_unique(this)), tab_strip_model_(std::make_unique( -@@ -767,6 +790,12 @@ Browser::~Browser() { +@@ -765,6 +788,12 @@ Browser::~Browser() { // away so they don't try and call back to us. if (select_file_dialog_.get()) select_file_dialog_->ListenerDestroyed(); @@ -191,7 +191,7 @@ index e87612be40627..41f088fd227b7 100644 } /////////////////////////////////////////////////////////////////////////////// -@@ -1329,6 +1358,8 @@ void Browser::WindowFullscreenStateChanged() { +@@ -1327,6 +1356,8 @@ void Browser::WindowFullscreenStateChanged() { ->WindowFullscreenStateChanged(); command_controller_->FullscreenStateChanged(); UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN); @@ -200,7 +200,7 @@ index e87612be40627..41f088fd227b7 100644 } void Browser::FullscreenTopUIStateChanged() { -@@ -1659,6 +1690,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent( +@@ -1646,6 +1677,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent( if (exclusive_access_manager_->HandleUserKeyEvent(event)) return content::KeyboardEventProcessingResult::HANDLED; @@ -215,7 +215,7 @@ index e87612be40627..41f088fd227b7 100644 return window()->PreHandleKeyboardEvent(event); } -@@ -1666,8 +1705,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source, +@@ -1653,8 +1692,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source, const NativeWebKeyboardEvent& event) { DevToolsWindow* devtools_window = DevToolsWindow::GetInstanceForInspectedWebContents(source); @@ -236,7 +236,7 @@ index e87612be40627..41f088fd227b7 100644 } bool Browser::TabsNeedBeforeUnloadFired() const { -@@ -1822,6 +1871,14 @@ WebContents* Browser::OpenURLFromTab( +@@ -1809,6 +1858,14 @@ WebContents* Browser::OpenURLFromTab( std::move(navigation_handle_callback)); } @@ -251,7 +251,7 @@ index e87612be40627..41f088fd227b7 100644 NavigateParams nav_params(this, params.url, params.transition); nav_params.FillNavigateParamsFromOpenURLParams(params); nav_params.source_contents = source; -@@ -1988,6 +2045,8 @@ void Browser::LoadingStateChanged(WebContents* source, +@@ -1975,6 +2032,8 @@ void Browser::LoadingStateChanged(WebContents* source, bool should_show_loading_ui) { ScheduleUIUpdate(source, content::INVALIDATE_TYPE_LOAD); UpdateWindowForLoadingStateChanged(source, should_show_loading_ui); @@ -260,7 +260,7 @@ index e87612be40627..41f088fd227b7 100644 } void Browser::CloseContents(WebContents* source) { -@@ -2016,6 +2075,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) { +@@ -2003,6 +2062,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) { } void Browser::UpdateTargetURL(WebContents* source, const GURL& url) { @@ -269,7 +269,7 @@ index e87612be40627..41f088fd227b7 100644 if (!GetStatusBubble()) return; -@@ -2023,6 +2084,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) { +@@ -2010,6 +2071,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) { GetStatusBubble()->SetURL(url); } @@ -287,7 +287,7 @@ index e87612be40627..41f088fd227b7 100644 void Browser::ContentsMouseEvent(WebContents* source, const ui::Event& event) { const ui::EventType type = event.type(); const bool exited = type == ui::EventType::kMouseExited; -@@ -2051,6 +2123,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) { +@@ -2038,6 +2110,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) { return false; } @@ -307,7 +307,7 @@ index e87612be40627..41f088fd227b7 100644 void Browser::BeforeUnloadFired(WebContents* web_contents, bool proceed, bool* proceed_to_fire_unload) { -@@ -2150,12 +2235,24 @@ void Browser::WebContentsCreated(WebContents* source_contents, +@@ -2137,12 +2222,24 @@ void Browser::WebContentsCreated(WebContents* source_contents, // Make the tab show up in the task manager. task_manager::WebContentsTags::CreateForTabContents(new_contents); @@ -332,7 +332,7 @@ index e87612be40627..41f088fd227b7 100644 // Don't show the page hung dialog when a HTML popup hangs because // the dialog will take the focus and immediately close the popup. RenderWidgetHostView* view = render_widget_host->GetView(); -@@ -2168,6 +2265,13 @@ void Browser::RendererUnresponsive( +@@ -2155,6 +2252,13 @@ void Browser::RendererUnresponsive( void Browser::RendererResponsive( WebContents* source, content::RenderWidgetHost* render_widget_host) { @@ -346,7 +346,7 @@ index e87612be40627..41f088fd227b7 100644 RenderWidgetHostView* view = render_widget_host->GetView(); if (view && !render_widget_host->GetView()->IsHTMLFormPopup()) { TabDialogs::FromWebContents(source)->HideHungRendererDialog( -@@ -2177,6 +2281,15 @@ void Browser::RendererResponsive( +@@ -2164,6 +2268,15 @@ void Browser::RendererResponsive( content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager( WebContents* source) { @@ -362,7 +362,7 @@ index e87612be40627..41f088fd227b7 100644 return javascript_dialogs::TabModalDialogManager::FromWebContents(source); } -@@ -2212,6 +2325,11 @@ void Browser::DraggableRegionsChanged( +@@ -2199,6 +2312,11 @@ void Browser::DraggableRegionsChanged( if (app_controller_) { app_controller_->DraggableRegionsChanged(regions, contents); } @@ -374,7 +374,7 @@ index e87612be40627..41f088fd227b7 100644 } void Browser::DidFinishNavigation( -@@ -2292,11 +2410,15 @@ void Browser::EnterFullscreenModeForTab( +@@ -2279,11 +2397,15 @@ void Browser::EnterFullscreenModeForTab( const blink::mojom::FullscreenOptions& options) { exclusive_access_manager_->fullscreen_controller()->EnterFullscreenModeForTab( requesting_frame, options.display_id); @@ -390,7 +390,7 @@ index e87612be40627..41f088fd227b7 100644 } bool Browser::IsFullscreenForTabOrPending(const WebContents* web_contents) { -@@ -2499,6 +2621,15 @@ void Browser::RequestMediaAccessPermission( +@@ -2486,6 +2608,15 @@ void Browser::RequestMediaAccessPermission( content::WebContents* web_contents, const content::MediaStreamRequest& request, content::MediaResponseCallback callback) { @@ -406,7 +406,7 @@ index e87612be40627..41f088fd227b7 100644 const extensions::Extension* extension = GetExtensionForOrigin(profile_, request.security_origin); MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest( -@@ -3059,9 +3190,10 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) { +@@ -3046,9 +3177,10 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) { // Browser, Getters for UI (private): StatusBubble* Browser::GetStatusBubble() { @@ -418,7 +418,7 @@ index e87612be40627..41f088fd227b7 100644 } // We hide the status bar for web apps windows as this matches native -@@ -3069,6 +3201,12 @@ StatusBubble* Browser::GetStatusBubble() { +@@ -3056,6 +3188,12 @@ StatusBubble* Browser::GetStatusBubble() { // mode, as the minimal browser UI includes the status bar. if (web_app::AppBrowserController::IsWebApp(this) && !app_controller()->HasMinimalUiButtons()) { @@ -431,7 +431,7 @@ index e87612be40627..41f088fd227b7 100644 return nullptr; } -@@ -3218,6 +3356,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) { +@@ -3205,6 +3343,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) { BookmarkTabHelper::FromWebContents(web_contents)->RemoveObserver(this); web_contents_collection_.StopObserving(web_contents); } @@ -440,7 +440,7 @@ index e87612be40627..41f088fd227b7 100644 } void Browser::TabDetachedAtImpl(content::WebContents* contents, -@@ -3372,6 +3512,14 @@ bool Browser::PictureInPictureBrowserSupportsWindowFeature( +@@ -3359,6 +3499,14 @@ bool Browser::PictureInPictureBrowserSupportsWindowFeature( bool Browser::SupportsWindowFeatureImpl(WindowFeature feature, bool check_can_support) const { @@ -456,7 +456,7 @@ index e87612be40627..41f088fd227b7 100644 case TYPE_NORMAL: return NormalBrowserSupportsWindowFeature(feature, check_can_support); diff --git chrome/browser/ui/browser.h chrome/browser/ui/browser.h -index 86ea151056ca1..680d143eecb16 100644 +index d650375ef1d4d..e3c7758efa53c 100644 --- chrome/browser/ui/browser.h +++ chrome/browser/ui/browser.h @@ -24,6 +24,7 @@ @@ -521,7 +521,7 @@ index 86ea151056ca1..680d143eecb16 100644 // Get the FindBarController for this browser, creating it if it does not // yet exist. FindBarController* GetFindBarController(); -@@ -956,10 +983,18 @@ class Browser : public TabStripModelObserver, +@@ -959,10 +986,18 @@ class Browser : public TabStripModelObserver, void SetContentsBounds(content::WebContents* source, const gfx::Rect& bounds) override; void UpdateTargetURL(content::WebContents* source, const GURL& url) override; @@ -540,7 +540,7 @@ index 86ea151056ca1..680d143eecb16 100644 void BeforeUnloadFired(content::WebContents* source, bool proceed, bool* proceed_to_fire_unload) override; -@@ -1296,6 +1331,10 @@ class Browser : public TabStripModelObserver, +@@ -1299,6 +1334,10 @@ class Browser : public TabStripModelObserver, // This Browser's window. raw_ptr window_; @@ -551,7 +551,7 @@ index 86ea151056ca1..680d143eecb16 100644 std::unique_ptr const tab_strip_model_delegate_; std::unique_ptr const tab_strip_model_; -@@ -1362,6 +1401,8 @@ class Browser : public TabStripModelObserver, +@@ -1365,6 +1404,8 @@ class Browser : public TabStripModelObserver, const std::string initial_workspace_; bool initial_visible_on_all_workspaces_state_; @@ -561,10 +561,10 @@ index 86ea151056ca1..680d143eecb16 100644 UnloadController unload_controller_; diff --git chrome/browser/ui/browser_navigator.cc chrome/browser/ui/browser_navigator.cc -index 70d7f4fbda71c..103e9c1b2a8f2 100644 +index f180b15994c6c..f69d72a70d850 100644 --- chrome/browser/ui/browser_navigator.cc +++ chrome/browser/ui/browser_navigator.cc -@@ -272,6 +272,10 @@ std::tuple GetBrowserAndTabForDisposition( +@@ -271,6 +271,10 @@ std::tuple GetBrowserAndTabForDisposition( browser_params.pip_options = pip_options; @@ -575,7 +575,7 @@ index 70d7f4fbda71c..103e9c1b2a8f2 100644 const BrowserWindow* const browser_window = params.browser->window(); const gfx::NativeWindow native_window = browser_window ? browser_window->GetNativeWindow() -@@ -560,6 +564,13 @@ std::unique_ptr CreateTargetContents( +@@ -559,6 +563,13 @@ std::unique_ptr CreateTargetContents( std::unique_ptr target_contents = WebContents::Create(create_params); diff --git a/patch/patches/chrome_browser_context_menus.patch b/patch/patches/chrome_browser_context_menus.patch index f755178df..80da040a3 100644 --- a/patch/patches/chrome_browser_context_menus.patch +++ b/patch/patches/chrome_browser_context_menus.patch @@ -1,8 +1,8 @@ diff --git chrome/browser/renderer_context_menu/render_view_context_menu.cc chrome/browser/renderer_context_menu/render_view_context_menu.cc -index db228a497bd28..94e04bca7e28d 100644 +index 31f179bf8f410..daa9134a59282 100644 --- chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -360,6 +360,18 @@ base::OnceCallback* GetMenuShownCallback() { +@@ -361,6 +361,18 @@ base::OnceCallback* GetMenuShownCallback() { return callback.get(); } @@ -21,7 +21,7 @@ index db228a497bd28..94e04bca7e28d 100644 enum class UmaEnumIdLookupType { GeneralEnumId, ContextSpecificEnumId, -@@ -628,6 +640,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) { +@@ -629,6 +641,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) { return 1; } @@ -32,7 +32,7 @@ index db228a497bd28..94e04bca7e28d 100644 id = CollapseCommandsForUMA(id); const auto& map = GetIdcToUmaMap(type); auto it = map.find(id); -@@ -909,6 +925,14 @@ RenderViewContextMenu::RenderViewContextMenu( +@@ -910,6 +926,14 @@ RenderViewContextMenu::RenderViewContextMenu( : nullptr; #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -47,7 +47,7 @@ index db228a497bd28..94e04bca7e28d 100644 observers_.AddObserver(&autofill_context_menu_manager_); } -@@ -1365,6 +1389,12 @@ void RenderViewContextMenu::InitMenu() { +@@ -1366,6 +1390,12 @@ void RenderViewContextMenu::InitMenu() { autofill_client->HideAutofillSuggestions( autofill::SuggestionHidingReason::kContextMenuOpened); } @@ -60,7 +60,7 @@ index db228a497bd28..94e04bca7e28d 100644 } Profile* RenderViewContextMenu::GetProfile() const { -@@ -3648,6 +3678,26 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting( +@@ -3650,6 +3680,26 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting( execute_plugin_action_callback_ = std::move(cb); } @@ -88,7 +88,7 @@ index db228a497bd28..94e04bca7e28d 100644 RenderViewContextMenu::GetHandlersForLinkUrl() { custom_handlers::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 0266119ae4010..d7e04a4e3804d 100644 +index 0bb9353cb7da0..04e430b33665e 100644 --- chrome/browser/renderer_context_menu/render_view_context_menu.h +++ chrome/browser/renderer_context_menu/render_view_context_menu.h @@ -153,7 +153,21 @@ class RenderViewContextMenu @@ -113,7 +113,7 @@ index 0266119ae4010..d7e04a4e3804d 100644 Profile* GetProfile() const; // This may return nullptr (e.g. for WebUI dialogs). Virtual to allow tests to -@@ -477,6 +491,9 @@ class RenderViewContextMenu +@@ -476,6 +490,9 @@ class RenderViewContextMenu // built. bool is_protocol_submenu_valid_ = false; diff --git a/patch/patches/chrome_browser_download.patch b/patch/patches/chrome_browser_download.patch index c989ac8c0..8903a0315 100644 --- a/patch/patches/chrome_browser_download.patch +++ b/patch/patches/chrome_browser_download.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/download/chrome_download_manager_delegate.cc chrome/browser/download/chrome_download_manager_delegate.cc -index 6b356ae53968e..da22286db5a3f 100644 +index 0ca641ab809b7..aeebc9b676486 100644 --- chrome/browser/download/chrome_download_manager_delegate.cc +++ chrome/browser/download/chrome_download_manager_delegate.cc @@ -31,6 +31,7 @@ @@ -56,7 +56,7 @@ index 6b356ae53968e..da22286db5a3f 100644 DownloadTargetDeterminer::CompletionCallback target_determined_callback = base::BindOnce(&ChromeDownloadManagerDelegate::OnDownloadTargetDetermined, weak_ptr_factory_.GetWeakPtr(), download->GetId(), -@@ -1080,8 +1099,11 @@ void ChromeDownloadManagerDelegate::OpenDownload(DownloadItem* download) { +@@ -1122,8 +1141,11 @@ void ChromeDownloadManagerDelegate::OpenDownload(DownloadItem* download) { Browser* browser = web_contents ? chrome::FindBrowserWithTab(web_contents) : nullptr; std::unique_ptr browser_displayer; @@ -71,7 +71,7 @@ index 6b356ae53968e..da22286db5a3f 100644 std::make_unique(profile_); browser = browser_displayer->browser(); diff --git chrome/browser/download/chrome_download_manager_delegate.h chrome/browser/download/chrome_download_manager_delegate.h -index 32d23a0c98061..be6a99a33bdeb 100644 +index 7ae09b406f344..801d6c846e744 100644 --- chrome/browser/download/chrome_download_manager_delegate.h +++ chrome/browser/download/chrome_download_manager_delegate.h @@ -19,6 +19,7 @@ @@ -82,7 +82,7 @@ index 32d23a0c98061..be6a99a33bdeb 100644 #include "chrome/browser/download/download_completion_blocker.h" #include "chrome/browser/download/download_target_determiner_delegate.h" #include "components/download/public/common/download_danger_type.h" -@@ -57,6 +58,12 @@ class CrxInstallError; +@@ -58,6 +59,12 @@ class CrxInstallError; } #endif @@ -95,7 +95,7 @@ index 32d23a0c98061..be6a99a33bdeb 100644 // This is the Chrome side helper for the download system. class ChromeDownloadManagerDelegate : public content::DownloadManagerDelegate, -@@ -393,6 +400,10 @@ class ChromeDownloadManagerDelegate +@@ -401,6 +408,10 @@ class ChromeDownloadManagerDelegate // Whether a file picker dialog is showing. bool is_file_picker_showing_; diff --git a/patch/patches/chrome_browser_extensions.patch b/patch/patches/chrome_browser_extensions.patch index a46417528..d25235e36 100644 --- a/patch/patches/chrome_browser_extensions.patch +++ b/patch/patches/chrome_browser_extensions.patch @@ -34,7 +34,7 @@ index 66ea000f8c048..02eeb15adceed 100644 WebViewGuestDelegate* ChromeExtensionsAPIClient::CreateWebViewGuestDelegate( diff --git chrome/browser/extensions/api/tabs/tabs_api.cc chrome/browser/extensions/api/tabs/tabs_api.cc -index d0ec6330ae8c1..c9e2857fa06b4 100644 +index bc9187e767fd3..f4e45472f5352 100644 --- chrome/browser/extensions/api/tabs/tabs_api.cc +++ chrome/browser/extensions/api/tabs/tabs_api.cc @@ -1603,7 +1603,7 @@ ExtensionFunction::ResponseAction TabsUpdateFunction::Run() { @@ -73,18 +73,16 @@ index d0ec6330ae8c1..c9e2857fa06b4 100644 // Bug fix for crbug.com/1197888. Don't let the extension update the tab if // the user is dragging tabs. if (!ExtensionTabUtil::IsTabStripEditable()) { -@@ -1685,8 +1685,9 @@ ExtensionFunction::ResponseAction TabsUpdateFunction::Run() { +@@ -1685,7 +1685,8 @@ ExtensionFunction::ResponseAction TabsUpdateFunction::Run() { // Navigate the tab to a new location if the url is different. if (params->update_properties.url) { std::string updated_url = *params->update_properties.url; - if (browser->profile()->IsIncognitoProfile() && -- !IsURLAllowedInIncognito(GURL(updated_url), browser->profile())) { + auto* profile = Profile::FromBrowserContext(browser_context()); + if (profile->IsIncognitoProfile() && -+ !IsURLAllowedInIncognito(GURL(updated_url), profile)) { + !IsURLAllowedInIncognito(GURL(updated_url))) { return RespondNow(Error(ErrorUtils::FormatErrorMessage( tabs_constants::kURLsNotAllowedInIncognitoError, updated_url))); - } @@ -1700,7 +1701,7 @@ ExtensionFunction::ResponseAction TabsUpdateFunction::Run() { return RespondNow(Error(std::move(error))); } diff --git a/patch/patches/chrome_runtime.patch b/patch/patches/chrome_runtime.patch index ac66b7843..4bbe8665f 100644 --- a/patch/patches/chrome_runtime.patch +++ b/patch/patches/chrome_runtime.patch @@ -465,7 +465,7 @@ index e26e3625c99c8..c0d4a95607e37 100644 +#endif } diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc -index e389b440fa666..88a1e390cb9e2 100644 +index bfbdf8fcc8fa0..1872ee98bef6e 100644 --- chrome/browser/chrome_content_browser_client.cc +++ chrome/browser/chrome_content_browser_client.cc @@ -48,6 +48,7 @@ @@ -476,7 +476,7 @@ index e389b440fa666..88a1e390cb9e2 100644 #include "chrome/browser/after_startup_task_utils.h" #include "chrome/browser/ai/ai_manager_keyed_service_factory.h" #include "chrome/browser/app_mode/app_mode_utils.h" -@@ -1515,6 +1516,8 @@ ChromeContentBrowserClient::GetPopupNavigationDelegateFactoryForTesting() { +@@ -1521,6 +1522,8 @@ ChromeContentBrowserClient::GetPopupNavigationDelegateFactoryForTesting() { } ChromeContentBrowserClient::ChromeContentBrowserClient() { @@ -485,7 +485,7 @@ index e389b440fa666..88a1e390cb9e2 100644 #if BUILDFLAG(ENABLE_PLUGINS) extra_parts_.push_back( std::make_unique()); -@@ -1552,6 +1555,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() { +@@ -1558,6 +1561,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() { } } @@ -497,7 +497,7 @@ index e389b440fa666..88a1e390cb9e2 100644 // static void ChromeContentBrowserClient::RegisterLocalStatePrefs( PrefRegistrySimple* registry) { -@@ -3966,28 +3974,25 @@ bool UpdatePreferredColorScheme(WebPreferences* web_prefs, +@@ -3988,28 +3996,25 @@ bool UpdatePreferredColorScheme(WebPreferences* web_prefs, web_prefs->preferred_color_scheme; } #else @@ -543,7 +543,7 @@ index e389b440fa666..88a1e390cb9e2 100644 #endif // BUILDFLAG(IS_ANDROID) // Reauth WebUI doesn't support dark mode yet because it shares the dialog -@@ -4741,9 +4746,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated( +@@ -4766,9 +4771,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated( &search::HandleNewTabURLReverseRewrite); #endif // BUILDFLAG(IS_ANDROID) @@ -555,7 +555,7 @@ index e389b440fa666..88a1e390cb9e2 100644 } base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() { -@@ -6880,7 +6887,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated( +@@ -6905,7 +6912,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated( #endif } @@ -564,7 +564,7 @@ index e389b440fa666..88a1e390cb9e2 100644 content::BrowserContext* context, bool in_memory, const base::FilePath& relative_partition_path, -@@ -6898,6 +6905,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams( +@@ -6923,6 +6930,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams( network_context_params->user_agent = GetUserAgentBasedOnPolicy(context); network_context_params->accept_language = GetApplicationLocale(); } @@ -573,7 +573,7 @@ index e389b440fa666..88a1e390cb9e2 100644 } std::vector -@@ -8060,11 +8069,11 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted( +@@ -8085,11 +8094,11 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted( const auto now = base::TimeTicks::Now(); const auto timeout = GetKeepaliveTimerTimeout(context); keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout); @@ -587,7 +587,7 @@ index e389b440fa666..88a1e390cb9e2 100644 FROM_HERE, keepalive_deadline_ - now, base::BindOnce( &ChromeContentBrowserClient::OnKeepaliveTimerFired, -@@ -8086,7 +8095,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() { +@@ -8111,7 +8120,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() { --num_keepalive_requests_; if (num_keepalive_requests_ == 0) { DVLOG(1) << "Stopping the keepalive timer"; @@ -597,7 +597,7 @@ index e389b440fa666..88a1e390cb9e2 100644 // This deletes the keep alive handle attached to the timer function and // unblock the shutdown sequence. } -@@ -8260,7 +8270,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired( +@@ -8285,7 +8295,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired( const auto now = base::TimeTicks::Now(); const auto then = keepalive_deadline_; if (now < then) { @@ -607,7 +607,7 @@ index e389b440fa666..88a1e390cb9e2 100644 base::BindOnce(&ChromeContentBrowserClient::OnKeepaliveTimerFired, weak_factory_.GetWeakPtr(), diff --git chrome/browser/chrome_content_browser_client.h chrome/browser/chrome_content_browser_client.h -index 8f3e428979146..a29e251d492ab 100644 +index d0985c14449a3..9785793aa5630 100644 --- chrome/browser/chrome_content_browser_client.h +++ chrome/browser/chrome_content_browser_client.h @@ -149,6 +149,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { @@ -628,7 +628,7 @@ index 8f3e428979146..a29e251d492ab 100644 content::BrowserContext* context, bool in_memory, const base::FilePath& relative_partition_path, -@@ -1272,7 +1274,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { +@@ -1276,7 +1278,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { #if !BUILDFLAG(IS_ANDROID) uint64_t num_keepalive_requests_ = 0; diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index 636434268..f9c1a2a45 100644 --- a/patch/patches/content_2015.patch +++ b/patch/patches/content_2015.patch @@ -12,7 +12,7 @@ index 11c9cd82d0392..9c700bc625cd5 100644 version.Set("V8-Version", V8_VERSION_STRING); std::string host = info.GetHeaderValue("host"); diff --git content/browser/loader/navigation_url_loader_impl.cc content/browser/loader/navigation_url_loader_impl.cc -index ebfa887660e23..6a8958000fb64 100644 +index 0852fba0c4352..173c5724c6e9c 100644 --- content/browser/loader/navigation_url_loader_impl.cc +++ content/browser/loader/navigation_url_loader_impl.cc @@ -863,7 +863,7 @@ NavigationURLLoaderImpl::CreateNonNetworkLoaderFactory( @@ -47,7 +47,7 @@ index ebfa887660e23..6a8958000fb64 100644 return std::make_pair( /*is_cacheable=*/false, diff --git content/public/browser/content_browser_client.cc content/public/browser/content_browser_client.cc -index 21967547790ca..7bdf48b830a21 100644 +index b80b9e005c94e..313579c039744 100644 --- content/public/browser/content_browser_client.cc +++ content/public/browser/content_browser_client.cc @@ -1138,7 +1138,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload( @@ -68,7 +68,7 @@ index 21967547790ca..7bdf48b830a21 100644 std::vector diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h -index 0f6781dc459e1..3f3095cce2ba6 100644 +index eadc4ffef8055..d23b45b3ecc74 100644 --- content/public/browser/content_browser_client.h +++ content/public/browser/content_browser_client.h @@ -1329,6 +1329,12 @@ class CONTENT_EXPORT ContentBrowserClient { @@ -166,10 +166,10 @@ index 15e28effa2cbf..eb25a1adb7f6c 100644 base::BindRepeating(&RenderThreadImpl::OnRendererInterfaceReceiver, base::Unretained(this))); diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc -index da2515e0067a9..e792751f278b4 100644 +index c668742dfc869..9bb7b446e7fb8 100644 --- content/renderer/renderer_blink_platform_impl.cc +++ content/renderer/renderer_blink_platform_impl.cc -@@ -1037,6 +1037,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() { +@@ -1032,6 +1032,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() { //------------------------------------------------------------------------------ @@ -186,10 +186,10 @@ index da2515e0067a9..e792751f278b4 100644 RendererBlinkPlatformImpl::CreateWebV8ValueConverter() { return std::make_unique(); diff --git content/renderer/renderer_blink_platform_impl.h content/renderer/renderer_blink_platform_impl.h -index 69c52cb8333fc..ac2bbc7459864 100644 +index 17c01a1f03ad4..33a484f412bba 100644 --- content/renderer/renderer_blink_platform_impl.h +++ content/renderer/renderer_blink_platform_impl.h -@@ -245,6 +245,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { +@@ -244,6 +244,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { InertAndMinimumIntervalOfUserLevelMemoryPressureSignal() override; #endif // BUILDFLAG(IS_ANDROID) diff --git a/patch/patches/crashpad_tp_1995.patch b/patch/patches/crashpad_tp_1995.patch index d7fd07760..2100efc2c 100644 --- a/patch/patches/crashpad_tp_1995.patch +++ b/patch/patches/crashpad_tp_1995.patch @@ -40,19 +40,19 @@ index b362e0aadbadd..1588232a6e4d4 100644 virtual ~PruneCondition() {} diff --git third_party/crashpad/crashpad/client/settings.cc third_party/crashpad/crashpad/client/settings.cc -index 0174c62b52856..c87205500aef0 100644 +index 76d77c86072d5..9cb6be87eb46f 100644 --- third_party/crashpad/crashpad/client/settings.cc +++ third_party/crashpad/crashpad/client/settings.cc -@@ -117,7 +117,7 @@ void ScopedLockedFileHandleTraits::Free(FileHandle handle) { - - struct Settings::Data { - static constexpr uint32_t kSettingsMagic = 'CPds'; +@@ -122,7 +122,7 @@ struct Settings::Data { + // Version number only used for incompatible changes to Data. Do not change + // this when adding additional fields at the end. Modifying `kSettingsVersion` + // will wipe away the entire struct when reading from other versions. - static constexpr uint32_t kSettingsVersion = 1; + static constexpr uint32_t kSettingsVersion = 2; enum Options : uint32_t { kUploadsEnabled = 1 << 0, -@@ -128,6 +128,9 @@ struct Settings::Data { +@@ -133,6 +133,9 @@ struct Settings::Data { options(0), padding_0(0), last_upload_attempt_time(0), @@ -62,7 +62,7 @@ index 0174c62b52856..c87205500aef0 100644 client_id() {} uint32_t magic; -@@ -135,6 +138,9 @@ struct Settings::Data { +@@ -140,6 +143,9 @@ struct Settings::Data { uint32_t options; uint32_t padding_0; int64_t last_upload_attempt_time; // time_t @@ -72,7 +72,7 @@ index 0174c62b52856..c87205500aef0 100644 UUID client_id; }; -@@ -234,6 +240,56 @@ bool Settings::IsLockExpired(const base::FilePath& file_path, +@@ -239,6 +245,56 @@ bool Settings::IsLockExpired(const base::FilePath& file_path, } #endif // !CRASHPAD_FLOCK_ALWAYS_SUPPORTED diff --git a/patch/patches/gn_config.patch b/patch/patches/gn_config.patch index 9bd1156f7..d72bec98c 100644 --- a/patch/patches/gn_config.patch +++ b/patch/patches/gn_config.patch @@ -76,7 +76,7 @@ index 1da479dd5eebc..ff9c7e467997c 100644 - visual_studio_runtime_dirs = [] } diff --git chrome/chrome_paks.gni chrome/chrome_paks.gni -index 4f99bf3e0ee60..d4b3f46070697 100644 +index e546a14a02ca6..720bf0e9508db 100644 --- chrome/chrome_paks.gni +++ chrome/chrome_paks.gni @@ -6,6 +6,7 @@ import("//ash/ambient/resources/resources.gni") @@ -87,7 +87,7 @@ index 4f99bf3e0ee60..d4b3f46070697 100644 import("//chrome/browser/buildflags.gni") import("//chrome/common/features.gni") import("//components/compose/features.gni") -@@ -473,6 +474,10 @@ template("chrome_extra_paks") { +@@ -475,6 +476,10 @@ template("chrome_extra_paks") { ] deps += [ "//extensions:extensions_resources" ] } diff --git a/patch/patches/gritsettings.patch b/patch/patches/gritsettings.patch index 697ebc64b..6874c2c1b 100644 --- a/patch/patches/gritsettings.patch +++ b/patch/patches/gritsettings.patch @@ -1,8 +1,14 @@ diff --git tools/gritsettings/resource_ids.spec tools/gritsettings/resource_ids.spec -index 38cf9d8fd803f..f7fe30053dfca 100644 +index 89c76bad269ec..b0dd86ac9bb24 100644 --- tools/gritsettings/resource_ids.spec +++ tools/gritsettings/resource_ids.spec -@@ -1376,6 +1376,15 @@ +@@ -1376,11 +1376,20 @@ + "<(SHARED_INTERMEDIATE_DIR)/third_party/blink/public/strings/permission_element_generated_strings.grd": { + "META": {"sizes": {"messages": [2000],}}, + "messages": [10080], +- } ++ }, + # END "everything else" section. # Everything but chrome/, components/, content/, and ios/ @@ -13,7 +19,7 @@ index 38cf9d8fd803f..f7fe30053dfca 100644 + "cef/libcef/resources/cef_strings.grd": { + "META": {"align": 32000}, + "messages": [32000], -+ }, ++ } + # Thinking about appending to the end? # Please read the header and find the right section above instead. diff --git a/patch/patches/mac_platform_style_bubble_893292.patch b/patch/patches/mac_platform_style_bubble_893292.patch index bfca41917..53160c5a5 100644 --- a/patch/patches/mac_platform_style_bubble_893292.patch +++ b/patch/patches/mac_platform_style_bubble_893292.patch @@ -1,8 +1,8 @@ diff --git chrome/browser/ui/views/profiles/profile_menu_view_base.cc chrome/browser/ui/views/profiles/profile_menu_view_base.cc -index 6cc1e99acab04..a1d8b7caf1e2c 100644 +index 9bb83d87c445f..23685ae498ce3 100644 --- chrome/browser/ui/views/profiles/profile_menu_view_base.cc +++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc -@@ -1237,8 +1237,8 @@ int ProfileMenuViewBase::GetMaxHeight() const { +@@ -1238,8 +1238,8 @@ int ProfileMenuViewBase::GetMaxHeight() const { ->GetDisplayNearestPoint(anchor_rect.CenterPoint()) .work_area(); int available_space = screen_space.bottom() - anchor_rect.bottom(); diff --git a/patch/patches/mime_handler_view_guest_1565_2727.patch b/patch/patches/mime_handler_view_guest_1565_2727.patch index 96f08f0ee..b4c3c8378 100644 --- a/patch/patches/mime_handler_view_guest_1565_2727.patch +++ b/patch/patches/mime_handler_view_guest_1565_2727.patch @@ -1,5 +1,5 @@ diff --git content/browser/web_contents/web_contents_view.h content/browser/web_contents/web_contents_view.h -index 446020ac6a831..6e3f6d048704c 100644 +index 37cb1dac49610..6e5989c73bf08 100644 --- content/browser/web_contents/web_contents_view.h +++ content/browser/web_contents/web_contents_view.h @@ -26,7 +26,7 @@ struct DropData; diff --git a/patch/patches/rfh_navigation_4829483.patch b/patch/patches/rfh_navigation_4829483.patch index 4072dead7..68fc26a24 100644 --- a/patch/patches/rfh_navigation_4829483.patch +++ b/patch/patches/rfh_navigation_4829483.patch @@ -1,8 +1,8 @@ diff --git content/browser/renderer_host/render_frame_host_impl.cc content/browser/renderer_host/render_frame_host_impl.cc -index 98c865765c57d..f31210f9c3070 100644 +index 6223e072246c2..41341cff4b73c 100644 --- content/browser/renderer_host/render_frame_host_impl.cc +++ content/browser/renderer_host/render_frame_host_impl.cc -@@ -9125,6 +9125,16 @@ void RenderFrameHostImpl::CreateNewWindow( +@@ -9130,6 +9130,16 @@ void RenderFrameHostImpl::CreateNewWindow( return; } @@ -19,7 +19,7 @@ index 98c865765c57d..f31210f9c3070 100644 // Otherwise, consume user activation before we proceed. In particular, it is // important to do this before we return from the |opener_suppressed| case // below. -@@ -11466,6 +11476,7 @@ void RenderFrameHostImpl::CommitNavigation( +@@ -11472,6 +11482,7 @@ void RenderFrameHostImpl::CommitNavigation( auto browser_calc_origin_to_commit = navigation_request->GetOriginToCommitWithDebugInfo(); if (!process_lock.is_error_page() && !is_mhtml_subframe && diff --git a/patch/patches/services_network_2622.patch b/patch/patches/services_network_2622.patch index 99f248448..f6f5fe9e0 100644 --- a/patch/patches/services_network_2622.patch +++ b/patch/patches/services_network_2622.patch @@ -80,10 +80,10 @@ index f78c6a467befc..97f1d21218eed 100644 void CookieManager::SetForceKeepSessionState() { diff --git services/network/network_context.cc services/network/network_context.cc -index d18f5b091d33e..ff7f620d3750d 100644 +index 383f570b3afee..7b5f096bdc78a 100644 --- services/network/network_context.cc +++ services/network/network_context.cc -@@ -2577,16 +2577,20 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( +@@ -2585,16 +2585,20 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( network_service_->network_quality_estimator()); } diff --git a/patch/patches/trace_event.patch b/patch/patches/trace_event.patch index 5e346a1ca..b61a4c31f 100644 --- a/patch/patches/trace_event.patch +++ b/patch/patches/trace_event.patch @@ -1,5 +1,5 @@ diff --git base/trace_event/builtin_categories.h base/trace_event/builtin_categories.h -index bf7628ed92355..a0911d52890b9 100644 +index 9a07b21450ccd..ef58e51e7bfb0 100644 --- base/trace_event/builtin_categories.h +++ base/trace_event/builtin_categories.h @@ -71,6 +71,8 @@ diff --git a/patch/patches/web_contents_1257_1565.patch b/patch/patches/web_contents_1257_1565.patch index 87a3b4aa2..95e4684cf 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 f25b2cc6c138a..75d0f1d479668 100644 +index eaa40a041a817..13c93d9e85b08 100644 --- content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc -@@ -3651,6 +3651,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, +@@ -3656,6 +3656,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, params.main_frame_name, GetOpener(), primary_main_frame_policy, base::UnguessableToken::Create()); @@ -15,7 +15,7 @@ index f25b2cc6c138a..75d0f1d479668 100644 std::unique_ptr delegate = GetContentClient()->browser()->GetWebContentsViewDelegate(this); -@@ -3661,6 +3667,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, +@@ -3666,6 +3672,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, view_ = CreateWebContentsView(this, std::move(delegate), &render_view_host_delegate_view_); } @@ -23,7 +23,7 @@ index f25b2cc6c138a..75d0f1d479668 100644 CHECK(render_view_host_delegate_view_); CHECK(view_.get()); -@@ -3858,6 +3865,9 @@ void WebContentsImpl::RenderWidgetCreated( +@@ -3863,6 +3870,9 @@ void WebContentsImpl::RenderWidgetCreated( OPTIONAL_TRACE_EVENT1("content", "WebContentsImpl::RenderWidgetCreated", "render_widget_host", render_widget_host); created_widgets_.insert(render_widget_host); @@ -33,7 +33,7 @@ index f25b2cc6c138a..75d0f1d479668 100644 } void WebContentsImpl::RenderWidgetDeleted( -@@ -4741,6 +4751,15 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -4746,6 +4756,15 @@ FrameTree* WebContentsImpl::CreateNewWindow( create_params.picture_in_picture_options = *(params.pip_options); } @@ -49,7 +49,7 @@ index f25b2cc6c138a..75d0f1d479668 100644 // Check whether there is an available prerendered page for this navigation if // this is not for guest. If it exists, take WebContents pre-created for // hosting the prerendered page instead of creating new WebContents. -@@ -9156,6 +9175,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, +@@ -9161,6 +9180,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, } CloseListenerManager::DidChangeFocusedFrame(this); diff --git a/patch/patches/webkit_plugin_info_2015.patch b/patch/patches/webkit_plugin_info_2015.patch index 551949050..7593313a2 100644 --- a/patch/patches/webkit_plugin_info_2015.patch +++ b/patch/patches/webkit_plugin_info_2015.patch @@ -1,8 +1,8 @@ diff --git third_party/blink/public/platform/platform.h third_party/blink/public/platform/platform.h -index 700e93a9ed053..9d5d1f67adb07 100644 +index 136ef25ea7e09..df60c7292b8c4 100644 --- third_party/blink/public/platform/platform.h +++ third_party/blink/public/platform/platform.h -@@ -810,6 +810,11 @@ class BLINK_PLATFORM_EXPORT Platform { +@@ -808,6 +808,11 @@ class BLINK_PLATFORM_EXPORT Platform { } #endif diff --git a/patch/patches/webkit_popups.patch b/patch/patches/webkit_popups.patch index 5dbf10d3b..59e946847 100644 --- a/patch/patches/webkit_popups.patch +++ b/patch/patches/webkit_popups.patch @@ -11,7 +11,7 @@ index 746af7113a66d..63346d59fe411 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 b5281ba471641..f5704e97f557e 100644 +index fb7d3474e5191..04159df707fd9 100644 --- third_party/blink/renderer/core/exported/web_view_impl.cc +++ third_party/blink/renderer/core/exported/web_view_impl.cc @@ -253,8 +253,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {