diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 93488b947..dbf25f4a0 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/94.0.4606.12', + 'chromium_checkout': 'refs/tags/94.0.4606.20', 'depot_tools_checkout': '64a9f33bdd' } diff --git a/patch/patches/base_sandbox_2743.patch b/patch/patches/base_sandbox_2743.patch index 78193bc5f..09611c8c4 100644 --- a/patch/patches/base_sandbox_2743.patch +++ b/patch/patches/base_sandbox_2743.patch @@ -1,5 +1,5 @@ diff --git base/BUILD.gn base/BUILD.gn -index bafc85477602d..7672916319fa9 100644 +index bafc85477602..7672916319fa 100644 --- base/BUILD.gn +++ base/BUILD.gn @@ -34,6 +34,7 @@ import("//build/config/ui.gni") @@ -37,7 +37,7 @@ index bafc85477602d..7672916319fa9 100644 "cfgmgr32.lib", "powrprof.lib", diff --git base/hash/md5.h base/hash/md5.h -index 8a49f08dcb04d..2f03d7a6d1b34 100644 +index 8a49f08dcb04..2f03d7a6d1b3 100644 --- base/hash/md5.h +++ base/hash/md5.h @@ -10,8 +10,9 @@ @@ -52,7 +52,7 @@ index 8a49f08dcb04d..2f03d7a6d1b34 100644 #else #include "base/hash/md5_boringssl.h" diff --git base/hash/sha1.h base/hash/sha1.h -index 5bb10fe069850..206344d0fd3b1 100644 +index 5bb10fe06985..206344d0fd3b 100644 --- base/hash/sha1.h +++ base/hash/sha1.h @@ -14,7 +14,9 @@ @@ -67,7 +67,7 @@ index 5bb10fe069850..206344d0fd3b1 100644 #else #include "base/hash/sha1_boringssl.h" diff --git base/unguessable_token.cc base/unguessable_token.cc -index d156be5597625..fc753a2ceb88a 100644 +index d156be559762..fc753a2ceb88 100644 --- base/unguessable_token.cc +++ base/unguessable_token.cc @@ -9,8 +9,9 @@ diff --git a/patch/patches/base_string_piece_1049498.patch b/patch/patches/base_string_piece_1049498.patch index 613fd47b2..af39204fc 100644 --- a/patch/patches/base_string_piece_1049498.patch +++ b/patch/patches/base_string_piece_1049498.patch @@ -1,5 +1,5 @@ diff --git base/strings/string_piece.h base/strings/string_piece.h -index 5ceb3a40eb01b..89476bfa41e9b 100644 +index 5ceb3a40eb01..89476bfa41e9 100644 --- base/strings/string_piece.h +++ base/strings/string_piece.h @@ -23,6 +23,7 @@ diff --git a/patch/patches/browser_scheduler.patch b/patch/patches/browser_scheduler.patch index 0efe9776c..516b5cd39 100644 --- a/patch/patches/browser_scheduler.patch +++ b/patch/patches/browser_scheduler.patch @@ -1,5 +1,5 @@ diff --git content/browser/scheduler/browser_task_executor.cc content/browser/scheduler/browser_task_executor.cc -index c04efa1296318..8c8515cb74a2b 100644 +index c04efa129631..8c8515cb74a2 100644 --- content/browser/scheduler/browser_task_executor.cc +++ content/browser/scheduler/browser_task_executor.cc @@ -269,7 +269,7 @@ BrowserTaskExecutor::OnUserInputStart() { diff --git a/patch/patches/browser_security_policy_1081397.patch b/patch/patches/browser_security_policy_1081397.patch index c566e4106..7ce5d0825 100644 --- a/patch/patches/browser_security_policy_1081397.patch +++ b/patch/patches/browser_security_policy_1081397.patch @@ -1,5 +1,5 @@ diff --git content/browser/child_process_security_policy_impl.cc content/browser/child_process_security_policy_impl.cc -index 8b338161af4bc..e0c4e36f9f140 100644 +index 8b338161af4b..e0c4e36f9f14 100644 --- content/browser/child_process_security_policy_impl.cc +++ content/browser/child_process_security_policy_impl.cc @@ -1734,6 +1734,16 @@ bool ChildProcessSecurityPolicyImpl::CanAccessDataForOrigin( @@ -20,7 +20,7 @@ index 8b338161af4bc..e0c4e36f9f140 100644 // TODO(wjmaclean): We should update the ProcessLock comparison API diff --git content/browser/renderer_host/navigation_request.cc content/browser/renderer_host/navigation_request.cc -index b4d827ec6b9ca..5168da29c5d4d 100644 +index b4d827ec6b9c..5168da29c5d4 100644 --- content/browser/renderer_host/navigation_request.cc +++ content/browser/renderer_host/navigation_request.cc @@ -5686,6 +5686,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithoutFinalFrameHost( diff --git a/patch/patches/browser_web_ui_controller_factory.patch b/patch/patches/browser_web_ui_controller_factory.patch index be22e0e1d..478980040 100644 --- a/patch/patches/browser_web_ui_controller_factory.patch +++ b/patch/patches/browser_web_ui_controller_factory.patch @@ -1,5 +1,5 @@ diff --git content/public/browser/web_ui_controller_factory.h content/public/browser/web_ui_controller_factory.h -index eb068fb9bb42c..4e8e6a1a7abf4 100644 +index eb068fb9bb42..4e8e6a1a7abf 100644 --- content/public/browser/web_ui_controller_factory.h +++ content/public/browser/web_ui_controller_factory.h @@ -47,9 +47,6 @@ class CONTENT_EXPORT WebUIControllerFactory { diff --git a/patch/patches/build.patch b/patch/patches/build.patch index 83a4bd1b7..04fcaa728 100644 --- a/patch/patches/build.patch +++ b/patch/patches/build.patch @@ -1,5 +1,5 @@ diff --git build/config/compiler/BUILD.gn build/config/compiler/BUILD.gn -index d7073ad38f0bf..1e00da32ead45 100644 +index d7073ad38f0b..1e00da32ead4 100644 --- build/config/compiler/BUILD.gn +++ build/config/compiler/BUILD.gn @@ -1863,8 +1863,6 @@ config("thin_archive") { diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index 25ba7b34c..0e1b097e4 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 f0fee1d39ff72..bc9b22974d52c 100644 +index f0fee1d39ff7..bc9b22974d52 100644 --- chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn @@ -13,6 +13,7 @@ import("//build/config/features.gni") diff --git a/patch/patches/chrome_browser_background_mode_1100085.patch b/patch/patches/chrome_browser_background_mode_1100085.patch index d3c7e3d72..09cf986b0 100644 --- a/patch/patches/chrome_browser_background_mode_1100085.patch +++ b/patch/patches/chrome_browser_background_mode_1100085.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/browser_process.h chrome/browser/browser_process.h -index a7657cb6e5d5e..d6c6f3225fcb6 100644 +index a7657cb6e5d5..d6c6f3225fcb 100644 --- chrome/browser/browser_process.h +++ chrome/browser/browser_process.h @@ -198,9 +198,9 @@ class BrowserProcess { @@ -14,7 +14,7 @@ index a7657cb6e5d5e..d6c6f3225fcb6 100644 std::unique_ptr manager) = 0; #endif diff --git chrome/browser/browser_process_impl.cc chrome/browser/browser_process_impl.cc -index 18620c247548a..bbe2db2355d1e 100644 +index 18620c247548..bbe2db2355d1 100644 --- chrome/browser/browser_process_impl.cc +++ chrome/browser/browser_process_impl.cc @@ -981,18 +981,14 @@ DownloadRequestLimiter* BrowserProcessImpl::download_request_limiter() { @@ -38,7 +38,7 @@ index 18620c247548a..bbe2db2355d1e 100644 std::unique_ptr manager) { background_mode_manager_ = std::move(manager); diff --git chrome/browser/browser_process_impl.h chrome/browser/browser_process_impl.h -index 2bb0b1ec912b0..2235c7b56a456 100644 +index 2bb0b1ec912b..2235c7b56a45 100644 --- chrome/browser/browser_process_impl.h +++ chrome/browser/browser_process_impl.h @@ -174,8 +174,8 @@ class BrowserProcessImpl : public BrowserProcess, @@ -52,7 +52,7 @@ index 2bb0b1ec912b0..2235c7b56a456 100644 std::unique_ptr manager) override; #endif diff --git chrome/browser/lifetime/browser_close_manager.cc chrome/browser/lifetime/browser_close_manager.cc -index fb05f448cb250..e94c28d492e7a 100644 +index fb05f448cb25..e94c28d492e7 100644 --- chrome/browser/lifetime/browser_close_manager.cc +++ chrome/browser/lifetime/browser_close_manager.cc @@ -151,12 +151,14 @@ void BrowserCloseManager::CloseBrowsers() { diff --git a/patch/patches/chrome_browser_browser.patch b/patch/patches/chrome_browser_browser.patch index fe0554d4c..e4faf1b95 100644 --- a/patch/patches/chrome_browser_browser.patch +++ b/patch/patches/chrome_browser_browser.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/browser_about_handler.cc chrome/browser/browser_about_handler.cc -index ba0c5c3fc0446..b4df9af95ecd1 100644 +index ba0c5c3fc044..b4df9af95ecd 100644 --- chrome/browser/browser_about_handler.cc +++ chrome/browser/browser_about_handler.cc @@ -70,6 +70,9 @@ bool HandleNonNavigationAboutURL(const GURL& url) { @@ -13,7 +13,7 @@ index ba0c5c3fc0446..b4df9af95ecd1 100644 return false; } diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc -index b6a5989bbee66..622e68ccecc70 100644 +index 7e29403699d5..c08ffc779e1c 100644 --- chrome/browser/ui/browser.cc +++ chrome/browser/ui/browser.cc @@ -262,6 +262,20 @@ @@ -37,7 +37,7 @@ index b6a5989bbee66..622e68ccecc70 100644 #if BUILDFLAG(ENABLE_EXTENSIONS) #include "chrome/browser/extensions/extension_browser_window_helper.h" #endif -@@ -496,6 +510,13 @@ Browser::Browser(const CreateParams& params) +@@ -497,6 +511,13 @@ Browser::Browser(const CreateParams& params) tab_strip_model_->AddObserver(this); @@ -51,7 +51,7 @@ index b6a5989bbee66..622e68ccecc70 100644 location_bar_model_ = std::make_unique( location_bar_model_delegate_.get(), content::kMaxURLDisplayChars); -@@ -1326,6 +1347,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent( +@@ -1327,6 +1348,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent( if (exclusive_access_manager_->HandleUserKeyEvent(event)) return content::KeyboardEventProcessingResult::HANDLED; @@ -66,7 +66,7 @@ index b6a5989bbee66..622e68ccecc70 100644 return window()->PreHandleKeyboardEvent(event); } -@@ -1333,8 +1362,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source, +@@ -1334,8 +1363,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source, const NativeWebKeyboardEvent& event) { DevToolsWindow* devtools_window = DevToolsWindow::GetInstanceForInspectedWebContents(source); @@ -87,7 +87,7 @@ index b6a5989bbee66..622e68ccecc70 100644 } bool Browser::TabsNeedBeforeUnloadFired() { -@@ -1559,6 +1598,14 @@ WebContents* Browser::OpenURLFromTab(WebContents* source, +@@ -1560,6 +1599,14 @@ WebContents* Browser::OpenURLFromTab(WebContents* source, return window->OpenURLFromTab(source, params); } @@ -102,7 +102,7 @@ index b6a5989bbee66..622e68ccecc70 100644 NavigateParams nav_params(this, params.url, params.transition); nav_params.FillNavigateParamsFromOpenURLParams(params); nav_params.source_contents = source; -@@ -1658,6 +1705,15 @@ void Browser::AddNewContents(WebContents* source, +@@ -1659,6 +1706,15 @@ void Browser::AddNewContents(WebContents* source, source, disposition); } @@ -118,7 +118,7 @@ index b6a5989bbee66..622e68ccecc70 100644 chrome::AddWebContents(this, source, std::move(new_contents), target_url, disposition, initial_rect); } -@@ -1676,6 +1732,8 @@ void Browser::LoadingStateChanged(WebContents* source, +@@ -1677,6 +1733,8 @@ void Browser::LoadingStateChanged(WebContents* source, bool to_different_document) { ScheduleUIUpdate(source, content::INVALIDATE_TYPE_LOAD); UpdateWindowForLoadingStateChanged(source, to_different_document); @@ -127,7 +127,7 @@ index b6a5989bbee66..622e68ccecc70 100644 } void Browser::CloseContents(WebContents* source) { -@@ -1703,6 +1761,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) { +@@ -1704,6 +1762,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) { } void Browser::UpdateTargetURL(WebContents* source, const GURL& url) { @@ -136,7 +136,7 @@ index b6a5989bbee66..622e68ccecc70 100644 if (!GetStatusBubble()) return; -@@ -1710,6 +1770,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) { +@@ -1711,6 +1771,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) { GetStatusBubble()->SetURL(url); } @@ -154,7 +154,7 @@ index b6a5989bbee66..622e68ccecc70 100644 void Browser::ContentsMouseEvent(WebContents* source, bool motion, bool exited) { -@@ -1826,6 +1897,10 @@ void Browser::WebContentsCreated(WebContents* source_contents, +@@ -1827,6 +1898,10 @@ void Browser::WebContentsCreated(WebContents* source_contents, // Make the tab show up in the task manager. task_manager::WebContentsTags::CreateForTabContents(new_contents); @@ -165,7 +165,7 @@ index b6a5989bbee66..622e68ccecc70 100644 } void Browser::PortalWebContentsCreated(WebContents* portal_web_contents) { -@@ -1862,6 +1937,8 @@ void Browser::RendererResponsive( +@@ -1863,6 +1938,8 @@ void Browser::RendererResponsive( void Browser::DidNavigatePrimaryMainFramePostCommit(WebContents* web_contents) { if (web_contents == tab_strip_model_->GetActiveWebContents()) UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE); @@ -174,7 +174,7 @@ index b6a5989bbee66..622e68ccecc70 100644 } content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager( -@@ -1901,11 +1978,15 @@ void Browser::EnterFullscreenModeForTab( +@@ -1902,11 +1979,15 @@ void Browser::EnterFullscreenModeForTab( const blink::mojom::FullscreenOptions& options) { exclusive_access_manager_->fullscreen_controller()->EnterFullscreenModeForTab( requesting_frame, options.display_id); @@ -190,7 +190,7 @@ index b6a5989bbee66..622e68ccecc70 100644 } bool Browser::IsFullscreenForTabOrPending(const WebContents* web_contents) { -@@ -2750,6 +2831,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) { +@@ -2751,6 +2832,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) { content_translate_driver->RemoveTranslationObserver(this); BookmarkTabHelper::FromWebContents(web_contents)->RemoveObserver(this); } @@ -200,7 +200,7 @@ index b6a5989bbee66..622e68ccecc70 100644 void Browser::TabDetachedAtImpl(content::WebContents* contents, diff --git chrome/browser/ui/browser.h chrome/browser/ui/browser.h -index 17c3233034d0e..4052f9c8dfc68 100644 +index 7649c59dde3f..a3b719f5c673 100644 --- chrome/browser/ui/browser.h +++ chrome/browser/ui/browser.h @@ -21,6 +21,7 @@ @@ -222,7 +222,7 @@ index 17c3233034d0e..4052f9c8dfc68 100644 #if defined(OS_ANDROID) #error This file should only be included on desktop. #endif -@@ -285,6 +290,11 @@ class Browser : public TabStripModelObserver, +@@ -291,6 +296,11 @@ class Browser : public TabStripModelObserver, // maximizable. bool can_maximize = true; @@ -234,7 +234,7 @@ index 17c3233034d0e..4052f9c8dfc68 100644 private: friend class Browser; friend class WindowSizerChromeOSTest; -@@ -349,6 +359,13 @@ class Browser : public TabStripModelObserver, +@@ -355,6 +365,13 @@ class Browser : public TabStripModelObserver, return creation_source_ == CreationSource::kSessionRestore; } @@ -248,7 +248,7 @@ index 17c3233034d0e..4052f9c8dfc68 100644 // Accessors //////////////////////////////////////////////////////////////// const CreateParams& create_params() const { return create_params_; } -@@ -419,6 +436,12 @@ class Browser : public TabStripModelObserver, +@@ -428,6 +445,12 @@ class Browser : public TabStripModelObserver, base::WeakPtr AsWeakPtr(); @@ -261,7 +261,7 @@ index 17c3233034d0e..4052f9c8dfc68 100644 // Get the FindBarController for this browser, creating it if it does not // yet exist. FindBarController* GetFindBarController(); -@@ -784,6 +807,11 @@ class Browser : public TabStripModelObserver, +@@ -793,6 +816,11 @@ class Browser : public TabStripModelObserver, void SetContentsBounds(content::WebContents* source, const gfx::Rect& bounds) override; void UpdateTargetURL(content::WebContents* source, const GURL& url) override; @@ -273,7 +273,7 @@ index 17c3233034d0e..4052f9c8dfc68 100644 void ContentsMouseEvent(content::WebContents* source, bool motion, bool exited) override; -@@ -1172,6 +1200,8 @@ class Browser : public TabStripModelObserver, +@@ -1186,6 +1214,8 @@ class Browser : public TabStripModelObserver, const std::string initial_workspace_; bool initial_visible_on_all_workspaces_state_; @@ -282,7 +282,7 @@ index 17c3233034d0e..4052f9c8dfc68 100644 CreationSource creation_source_ = CreationSource::kUnknown; UnloadController unload_controller_; -@@ -1229,6 +1259,10 @@ class Browser : public TabStripModelObserver, +@@ -1243,6 +1273,10 @@ class Browser : public TabStripModelObserver, extension_browser_window_helper_; #endif @@ -294,7 +294,7 @@ index 17c3233034d0e..4052f9c8dfc68 100644 // The following factory is used for chrome update coalescing. diff --git chrome/browser/ui/browser_navigator.cc chrome/browser/ui/browser_navigator.cc -index a4af0836da1aa..bdf26e401d563 100644 +index a4af0836da1a..bdf26e401d56 100644 --- chrome/browser/ui/browser_navigator.cc +++ chrome/browser/ui/browser_navigator.cc @@ -456,6 +456,13 @@ std::unique_ptr CreateTargetContents( @@ -312,7 +312,7 @@ index a4af0836da1aa..bdf26e401d563 100644 // tab helpers, so the entire set of tab helpers needs to be set up // immediately. diff --git chrome/browser/ui/browser_tabstrip.cc chrome/browser/ui/browser_tabstrip.cc -index 40907675219d3..19e1093947ed0 100644 +index 40907675219d..19e1093947ed 100644 --- chrome/browser/ui/browser_tabstrip.cc +++ chrome/browser/ui/browser_tabstrip.cc @@ -30,9 +30,13 @@ void AddTabAt(Browser* browser, diff --git a/patch/patches/chrome_browser_content_settings.patch b/patch/patches/chrome_browser_content_settings.patch index da61070c6..361586404 100644 --- a/patch/patches/chrome_browser_content_settings.patch +++ b/patch/patches/chrome_browser_content_settings.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/content_settings/host_content_settings_map_factory.cc chrome/browser/content_settings/host_content_settings_map_factory.cc -index 173582c7c4904..bbf57904b6de9 100644 +index 173582c7c490..bbf57904b6de 100644 --- chrome/browser/content_settings/host_content_settings_map_factory.cc +++ chrome/browser/content_settings/host_content_settings_map_factory.cc @@ -8,6 +8,7 @@ @@ -54,7 +54,7 @@ index 173582c7c4904..bbf57904b6de9 100644 #if BUILDFLAG(ENABLE_SUPERVISED_USERS) SupervisedUserSettingsService* supervised_service = diff --git components/content_settings/renderer/content_settings_agent_impl.cc components/content_settings/renderer/content_settings_agent_impl.cc -index e410df38c0b44..3d5701b9918ac 100644 +index e410df38c0b4..3d5701b9918a 100644 --- components/content_settings/renderer/content_settings_agent_impl.cc +++ components/content_settings/renderer/content_settings_agent_impl.cc @@ -170,7 +170,7 @@ ContentSetting GetContentSettingFromRulesImpl( diff --git a/patch/patches/chrome_browser_context_menus.patch b/patch/patches/chrome_browser_context_menus.patch index 3918f4649..76b764da9 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 9e358b1cde224..67ccd6ca0c50d 100644 +index 5d5704536562..739ec9ce0bd6 100644 --- chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc @@ -279,6 +279,13 @@ base::OnceCallback* GetMenuShownCallback() { @@ -69,7 +69,7 @@ index 9e358b1cde224..67ccd6ca0c50d 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 fbcde566b8c90..261b1b3e05dfc 100644 +index fbcde566b8c9..261b1b3e05df 100644 --- chrome/browser/renderer_context_menu/render_view_context_menu.h +++ chrome/browser/renderer_context_menu/render_view_context_menu.h @@ -106,6 +106,12 @@ class RenderViewContextMenu : public RenderViewContextMenuBase, @@ -96,7 +96,7 @@ index fbcde566b8c90..261b1b3e05dfc 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 f40f15c23bfb2..06d4d197ce137 100644 +index f40f15c23bfb..06d4d197ce13 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 f40f15c23bfb2..06d4d197ce137 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_net_export.patch b/patch/patches/chrome_browser_net_export.patch index b50cba07c..d35da6bf2 100644 --- a/patch/patches/chrome_browser_net_export.patch +++ b/patch/patches/chrome_browser_net_export.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn -index 839907dd232a2..38edcddb6d755 100644 +index 839907dd232a..38edcddb6d75 100644 --- chrome/browser/ui/BUILD.gn +++ chrome/browser/ui/BUILD.gn @@ -11,6 +11,7 @@ import("//build/config/features.gni") @@ -38,7 +38,7 @@ index 839907dd232a2..38edcddb6d755 100644 ] if (use_cups) { diff --git chrome/browser/ui/webui/net_export_ui.cc chrome/browser/ui/webui/net_export_ui.cc -index fcd1f66b3a7a4..70ded321f5498 100644 +index fcd1f66b3a7a..70ded321f549 100644 --- chrome/browser/ui/webui/net_export_ui.cc +++ chrome/browser/ui/webui/net_export_ui.cc @@ -21,6 +21,7 @@ diff --git a/patch/patches/chrome_browser_profile_menu.patch b/patch/patches/chrome_browser_profile_menu.patch index 05e39d2ba..ddd090e7d 100644 --- a/patch/patches/chrome_browser_profile_menu.patch +++ b/patch/patches/chrome_browser_profile_menu.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/profiles/profile_window.cc chrome/browser/profiles/profile_window.cc -index c00884e06f960..858fdb75529f8 100644 +index c00884e06f96..858fdb75529f 100644 --- chrome/browser/profiles/profile_window.cc +++ chrome/browser/profiles/profile_window.cc @@ -272,7 +272,9 @@ void BubbleViewModeFromAvatarBubbleMode(BrowserWindow::AvatarBubbleMode mode, @@ -14,7 +14,7 @@ index c00884e06f960..858fdb75529f8 100644 : profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER; } diff --git chrome/browser/ui/views/profiles/incognito_menu_view.cc chrome/browser/ui/views/profiles/incognito_menu_view.cc -index 8a93e597977b0..4d0faa950a2af 100644 +index 8a93e597977b..4d0faa950a2a 100644 --- chrome/browser/ui/views/profiles/incognito_menu_view.cc +++ chrome/browser/ui/views/profiles/incognito_menu_view.cc @@ -37,7 +37,9 @@ @@ -29,7 +29,7 @@ index 8a93e597977b0..4d0faa950a2af 100644 chrome::RecordDialogCreation( diff --git chrome/browser/ui/views/profiles/profile_menu_view_base.cc chrome/browser/ui/views/profiles/profile_menu_view_base.cc -index 5b5baee89fc2f..26dc4a9591bf9 100644 +index 5b5baee89fc2..26dc4a9591bf 100644 --- chrome/browser/ui/views/profiles/profile_menu_view_base.cc +++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc @@ -511,7 +511,9 @@ void ProfileMenuViewBase::ShowBubble(profiles::BubbleViewMode view_mode, diff --git a/patch/patches/chrome_browser_profiles.patch b/patch/patches/chrome_browser_profiles.patch index 8dac41cf3..08821f702 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 baef951fe2535..a72b08b21c606 100644 +index baef951fe253..a72b08b21c60 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 baef951fe2535..a72b08b21c606 100644 } diff --git chrome/browser/profiles/profile.cc chrome/browser/profiles/profile.cc -index 403c59f81857a..d73fb2d6fa88b 100644 +index 403c59f81857..d73fb2d6fa88 100644 --- chrome/browser/profiles/profile.cc +++ chrome/browser/profiles/profile.cc @@ -86,6 +86,7 @@ base::LazyInstance>::Leaky @@ -52,7 +52,7 @@ index 403c59f81857a..d73fb2d6fa88b 100644 Profile::OTRProfileID Profile::OTRProfileID::CreateUniqueForDevTools() { return CreateUnique(kDevToolsOTRProfileIDPrefix); diff --git chrome/browser/profiles/profile.h chrome/browser/profiles/profile.h -index 4d0cc18bd6a85..76adcbd9b7fcc 100644 +index 4d0cc18bd6a8..76adcbd9b7fc 100644 --- chrome/browser/profiles/profile.h +++ chrome/browser/profiles/profile.h @@ -112,6 +112,10 @@ class Profile : public content::BrowserContext { @@ -85,7 +85,7 @@ index 4d0cc18bd6a85..76adcbd9b7fcc 100644 virtual bool IsSignedIn() = 0; diff --git chrome/browser/profiles/profile_impl.cc chrome/browser/profiles/profile_impl.cc -index 569a2780dab4c..b46ff6fa0b2b7 100644 +index 569a2780dab4..b46ff6fa0b2b 100644 --- chrome/browser/profiles/profile_impl.cc +++ chrome/browser/profiles/profile_impl.cc @@ -985,7 +985,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id, @@ -100,7 +100,7 @@ index 569a2780dab4c..b46ff6fa0b2b7 100644 return raw_otr_profile; } diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc -index 04aab51e9b179..532e719058f4b 100644 +index 04aab51e9b17..532e719058f4 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 04aab51e9b179..532e719058f4b 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 0757d75a24b28..bd916bdaf820f 100644 +index 0757d75a24b2..bd916bdaf820 100644 --- chrome/browser/profiles/renderer_updater.cc +++ chrome/browser/profiles/renderer_updater.cc @@ -8,6 +8,7 @@ diff --git a/patch/patches/chrome_browser_safe_browsing.patch b/patch/patches/chrome_browser_safe_browsing.patch index 56ff72b4c..7fcf58aa1 100644 --- a/patch/patches/chrome_browser_safe_browsing.patch +++ b/patch/patches/chrome_browser_safe_browsing.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/safe_browsing/BUILD.gn chrome/browser/safe_browsing/BUILD.gn -index ff31c91fc6f0c..3125b3eaeeae8 100644 +index ff31c91fc6f0..3125b3eaeeae 100644 --- chrome/browser/safe_browsing/BUILD.gn +++ chrome/browser/safe_browsing/BUILD.gn @@ -27,6 +27,7 @@ static_library("safe_browsing") { diff --git a/patch/patches/chrome_browser_themes.patch b/patch/patches/chrome_browser_themes.patch index f84953a5c..230d28edd 100644 --- a/patch/patches/chrome_browser_themes.patch +++ b/patch/patches/chrome_browser_themes.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/themes/theme_service.cc chrome/browser/themes/theme_service.cc -index abba09a2eda93..d9e23612dfa0e 100644 +index abba09a2eda9..d9e23612dfa0 100644 --- chrome/browser/themes/theme_service.cc +++ chrome/browser/themes/theme_service.cc @@ -26,6 +26,7 @@ @@ -42,7 +42,7 @@ index abba09a2eda93..d9e23612dfa0e 100644 theme_syncable_service_ = std::make_unique(profile_, this); diff --git chrome/browser/themes/theme_service_factory.cc chrome/browser/themes/theme_service_factory.cc -index dc2350f0b2443..7f4b9283534f3 100644 +index dc2350f0b244..7f4b9283534f 100644 --- chrome/browser/themes/theme_service_factory.cc +++ chrome/browser/themes/theme_service_factory.cc @@ -7,6 +7,7 @@ diff --git a/patch/patches/chrome_plugins.patch b/patch/patches/chrome_plugins.patch index 307f44a32..ffd39219a 100644 --- a/patch/patches/chrome_plugins.patch +++ b/patch/patches/chrome_plugins.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/plugins/plugin_info_host_impl.cc chrome/browser/plugins/plugin_info_host_impl.cc -index 4cb831441aed4..ed0092720b63f 100644 +index 4cb831441aed..ed0092720b63 100644 --- chrome/browser/plugins/plugin_info_host_impl.cc +++ chrome/browser/plugins/plugin_info_host_impl.cc @@ -18,6 +18,7 @@ @@ -115,7 +115,7 @@ index 4cb831441aed4..ed0092720b63f 100644 bool enabled = i < matching_plugins.size(); if (!enabled) { diff --git chrome/browser/plugins/plugin_utils.cc chrome/browser/plugins/plugin_utils.cc -index a0b3175223f3e..a1117001ad1fc 100644 +index a0b3175223f3..a1117001ad1f 100644 --- chrome/browser/plugins/plugin_utils.cc +++ chrome/browser/plugins/plugin_utils.cc @@ -5,6 +5,7 @@ @@ -151,7 +151,7 @@ index a0b3175223f3e..a1117001ad1fc 100644 Profile* profile = Profile::FromBrowserContext(browser_context); const std::vector& allowlist = diff --git chrome/common/google_url_loader_throttle.cc chrome/common/google_url_loader_throttle.cc -index 8c2547056ec26..2ab3252dca708 100644 +index 8c2547056ec2..2ab3252dca70 100644 --- chrome/common/google_url_loader_throttle.cc +++ chrome/common/google_url_loader_throttle.cc @@ -7,6 +7,7 @@ @@ -186,7 +186,7 @@ index 8c2547056ec26..2ab3252dca708 100644 // that the X-Frame-Options protection mechanism is set to either DENY or // SAMEORIGIN. diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc -index fc4ae8abac329..73083d8ba64d6 100644 +index fc4ae8abac32..73083d8ba64d 100644 --- chrome/renderer/chrome_content_renderer_client.cc +++ chrome/renderer/chrome_content_renderer_client.cc @@ -931,6 +931,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( @@ -238,7 +238,7 @@ index fc4ae8abac329..73083d8ba64d6 100644 } } diff --git content/browser/browser_plugin/browser_plugin_guest.h content/browser/browser_plugin/browser_plugin_guest.h -index bc13113e725e0..2bc15de23ec4a 100644 +index bc13113e725e..2bc15de23ec4 100644 --- content/browser/browser_plugin/browser_plugin_guest.h +++ content/browser/browser_plugin/browser_plugin_guest.h @@ -113,6 +113,8 @@ class CONTENT_EXPORT BrowserPluginGuest : public GuestHost, diff --git a/patch/patches/chrome_pref_watcher.patch b/patch/patches/chrome_pref_watcher.patch index 1a435c153..3a6e261fd 100644 --- a/patch/patches/chrome_pref_watcher.patch +++ b/patch/patches/chrome_pref_watcher.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/ui/prefs/pref_watcher.h chrome/browser/ui/prefs/pref_watcher.h -index 78d5b763970c2..de98bd0b325b1 100644 +index 78d5b763970c..de98bd0b325b 100644 --- chrome/browser/ui/prefs/pref_watcher.h +++ chrome/browser/ui/prefs/pref_watcher.h @@ -29,10 +29,10 @@ class PrefWatcher : public KeyedService { diff --git a/patch/patches/chrome_renderer.patch b/patch/patches/chrome_renderer.patch index 90bf56e29..104aa19b7 100644 --- a/patch/patches/chrome_renderer.patch +++ b/patch/patches/chrome_renderer.patch @@ -1,5 +1,5 @@ diff --git chrome/renderer/BUILD.gn chrome/renderer/BUILD.gn -index dd997e3ccdb03..c9076e263b403 100644 +index dd997e3ccdb0..c9076e263b40 100644 --- chrome/renderer/BUILD.gn +++ chrome/renderer/BUILD.gn @@ -5,6 +5,7 @@ diff --git a/patch/patches/chrome_runtime.patch b/patch/patches/chrome_runtime.patch index 07b1bfb36..2ef8498d1 100644 --- a/patch/patches/chrome_runtime.patch +++ b/patch/patches/chrome_runtime.patch @@ -1,5 +1,5 @@ diff --git chrome/app/chrome_main_delegate.cc chrome/app/chrome_main_delegate.cc -index 73d78a39dacfe..53e0a980ec8a4 100644 +index 73d78a39dacf..53e0a980ec8a 100644 --- chrome/app/chrome_main_delegate.cc +++ chrome/app/chrome_main_delegate.cc @@ -29,6 +29,7 @@ @@ -78,7 +78,7 @@ index 73d78a39dacfe..53e0a980ec8a4 100644 #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) diff --git chrome/browser/chrome_browser_main.cc chrome/browser/chrome_browser_main.cc -index e07aca88fdf9e..9aa092498c861 100644 +index e07aca88fdf9..9aa092498c86 100644 --- chrome/browser/chrome_browser_main.cc +++ chrome/browser/chrome_browser_main.cc @@ -50,6 +50,7 @@ @@ -118,7 +118,7 @@ index e07aca88fdf9e..9aa092498c861 100644 // of lacros-chrome is complete. #if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) diff --git chrome/browser/chrome_browser_main_mac.mm chrome/browser/chrome_browser_main_mac.mm -index 95d1ebc190910..13cdfa52db108 100644 +index 95d1ebc19091..13cdfa52db10 100644 --- chrome/browser/chrome_browser_main_mac.mm +++ chrome/browser/chrome_browser_main_mac.mm @@ -16,6 +16,7 @@ @@ -156,7 +156,7 @@ index 95d1ebc190910..13cdfa52db108 100644 +#endif } diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc -index ef7caebafd36e..d9708e25c9505 100644 +index ef7caebafd36..d9708e25c950 100644 --- chrome/browser/chrome_content_browser_client.cc +++ chrome/browser/chrome_content_browser_client.cc @@ -28,6 +28,7 @@ @@ -180,7 +180,7 @@ index ef7caebafd36e..d9708e25c9505 100644 base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() { diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc -index 8fadd3a4d4ebe..2fad4e8704410 100644 +index 8fadd3a4d4eb..2fad4e870441 100644 --- chrome/browser/prefs/browser_prefs.cc +++ chrome/browser/prefs/browser_prefs.cc @@ -10,6 +10,7 @@ diff --git a/patch/patches/chrome_runtime_views.patch b/patch/patches/chrome_runtime_views.patch index b35ea6dd3..8e38614a4 100644 --- a/patch/patches/chrome_runtime_views.patch +++ b/patch/patches/chrome_runtime_views.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/ui/browser_command_controller.cc chrome/browser/ui/browser_command_controller.cc -index 9188154824c4d..d01f610a64135 100644 +index 9188154824c4..d01f610a6413 100644 --- chrome/browser/ui/browser_command_controller.cc +++ chrome/browser/ui/browser_command_controller.cc @@ -351,8 +351,10 @@ bool BrowserCommandController::ExecuteCommandWithDisposition( @@ -31,7 +31,7 @@ index 9188154824c4d..d01f610a64135 100644 void BrowserCommandController::InitCommandState() { diff --git chrome/browser/ui/views/frame/browser_frame.cc chrome/browser/ui/views/frame/browser_frame.cc -index 2c4624fb0cd05..57c087dcbaaee 100644 +index 2c4624fb0cd0..57c087dcbaae 100644 --- chrome/browser/ui/views/frame/browser_frame.cc +++ chrome/browser/ui/views/frame/browser_frame.cc @@ -69,15 +69,23 @@ bool IsUsingGtkTheme(Profile* profile) { @@ -106,7 +106,7 @@ index 2c4624fb0cd05..57c087dcbaaee 100644 // or not we always use the dark ui instance. if (base::FeatureList::IsEnabled( diff --git chrome/browser/ui/views/frame/browser_frame.h chrome/browser/ui/views/frame/browser_frame.h -index 0ce7abdeb7d9f..8197a6bb7da98 100644 +index 0ce7abdeb7d9..8197a6bb7da9 100644 --- chrome/browser/ui/views/frame/browser_frame.h +++ chrome/browser/ui/views/frame/browser_frame.h @@ -54,7 +54,9 @@ enum class TabDragKind { @@ -120,7 +120,7 @@ index 0ce7abdeb7d9f..8197a6bb7da98 100644 // Initialize the frame (creates the underlying native window). diff --git chrome/browser/ui/views/frame/browser_view.cc chrome/browser/ui/views/frame/browser_view.cc -index f0b0bd645a3ce..0d8475b411512 100644 +index f0b0bd645a3c..0d8475b41151 100644 --- chrome/browser/ui/views/frame/browser_view.cc +++ chrome/browser/ui/views/frame/browser_view.cc @@ -593,11 +593,22 @@ class BrowserView::AccessibilityModeObserver : public ui::AXModeObserver { @@ -234,7 +234,7 @@ index f0b0bd645a3ce..0d8475b411512 100644 MaybeInitializeWebUITabStrip(); diff --git chrome/browser/ui/views/frame/browser_view.h chrome/browser/ui/views/frame/browser_view.h -index 021f04720e567..8c4f2cbf34f25 100644 +index 021f04720e56..8c4f2cbf34f2 100644 --- chrome/browser/ui/views/frame/browser_view.h +++ chrome/browser/ui/views/frame/browser_view.h @@ -114,7 +114,9 @@ class BrowserView : public BrowserWindow, @@ -261,7 +261,7 @@ index 021f04720e567..8c4f2cbf34f25 100644 // Do not friend BrowserViewLayout. Use the BrowserViewLayoutDelegate // interface to keep these two classes decoupled and testable. diff --git chrome/browser/ui/views/frame/browser_view_layout.cc chrome/browser/ui/views/frame/browser_view_layout.cc -index 18a85f436bd97..0d6e4c9f916e7 100644 +index 18a85f436bd9..0d6e4c9f916e 100644 --- chrome/browser/ui/views/frame/browser_view_layout.cc +++ chrome/browser/ui/views/frame/browser_view_layout.cc @@ -441,6 +441,12 @@ int BrowserViewLayout::LayoutWebUITabStrip(int top) { @@ -278,7 +278,7 @@ index 18a85f436bd97..0d6e4c9f916e7 100644 bool toolbar_visible = delegate_->IsToolbarVisible(); int height = toolbar_visible ? toolbar_->GetPreferredSize().height() : 0; diff --git chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc -index 5e516ea5873ca..b9890fbe050af 100644 +index 5e516ea5873c..b9890fbe050a 100644 --- chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc +++ chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc @@ -587,37 +587,53 @@ gfx::Range BrowserTabStripController::ListTabsInGroup( @@ -336,7 +336,7 @@ index 5e516ea5873ca..b9890fbe050af 100644 } diff --git chrome/browser/ui/views/toolbar/toolbar_view.cc chrome/browser/ui/views/toolbar/toolbar_view.cc -index 7bc5cd3dabf7d..ea706584db609 100644 +index 7bc5cd3dabf7..ea706584db60 100644 --- chrome/browser/ui/views/toolbar/toolbar_view.cc +++ chrome/browser/ui/views/toolbar/toolbar_view.cc @@ -162,12 +162,13 @@ auto& GetViewCommandMap() { @@ -365,7 +365,7 @@ index 7bc5cd3dabf7d..ea706584db609 100644 size_animation_.Reset(1); diff --git chrome/browser/ui/views/toolbar/toolbar_view.h chrome/browser/ui/views/toolbar/toolbar_view.h -index 8346b612cfbe6..d7fc5440af829 100644 +index 8346b612cfbe..d7fc5440af82 100644 --- chrome/browser/ui/views/toolbar/toolbar_view.h +++ chrome/browser/ui/views/toolbar/toolbar_view.h @@ -90,7 +90,8 @@ class ToolbarView : public views::AccessiblePaneView, diff --git a/patch/patches/component_build.patch b/patch/patches/component_build.patch index 87300a154..2546f37f0 100644 --- a/patch/patches/component_build.patch +++ b/patch/patches/component_build.patch @@ -1,5 +1,5 @@ diff --git content/browser/devtools/devtools_instrumentation.h content/browser/devtools/devtools_instrumentation.h -index 2619022a1d89c..572a495004def 100644 +index 2619022a1d89..572a495004de 100644 --- content/browser/devtools/devtools_instrumentation.h +++ content/browser/devtools/devtools_instrumentation.h @@ -89,7 +89,7 @@ bool ApplyUserAgentMetadataOverrides( @@ -12,7 +12,7 @@ index 2619022a1d89c..572a495004def 100644 bool is_navigation, bool is_download, diff --git content/browser/renderer_host/input/synthetic_gesture_target_base.h content/browser/renderer_host/input/synthetic_gesture_target_base.h -index eef661b3e0950..6c0dacfa4bc3a 100644 +index eef661b3e095..6c0dacfa4bc3 100644 --- content/browser/renderer_host/input/synthetic_gesture_target_base.h +++ content/browser/renderer_host/input/synthetic_gesture_target_base.h @@ -9,6 +9,7 @@ @@ -34,7 +34,7 @@ index eef661b3e0950..6c0dacfa4bc3a 100644 explicit SyntheticGestureTargetBase(RenderWidgetHostImpl* host); ~SyntheticGestureTargetBase() override; diff --git content/common/content_switches_internal.h content/common/content_switches_internal.h -index 57072bf1263ae..0a93446e4d21c 100644 +index 57072bf1263a..0a93446e4d21 100644 --- content/common/content_switches_internal.h +++ content/common/content_switches_internal.h @@ -15,7 +15,7 @@ class CommandLine; @@ -47,7 +47,7 @@ index 57072bf1263ae..0a93446e4d21c 100644 blink::mojom::V8CacheOptions GetV8CacheOptions(); diff --git third_party/blink/renderer/controller/BUILD.gn third_party/blink/renderer/controller/BUILD.gn -index 8003cd409ff37..8ac3fefade6de 100644 +index 8003cd409ff3..8ac3fefade6d 100644 --- third_party/blink/renderer/controller/BUILD.gn +++ third_party/blink/renderer/controller/BUILD.gn @@ -29,6 +29,7 @@ component("controller") { @@ -68,7 +68,7 @@ index 8003cd409ff37..8ac3fefade6de 100644 if (is_linux || is_chromeos) { diff --git ui/events/keycodes/BUILD.gn ui/events/keycodes/BUILD.gn -index 86bbf620ff0d9..6c06b461c6da1 100644 +index 86bbf620ff0d..6c06b461c6da 100644 --- ui/events/keycodes/BUILD.gn +++ ui/events/keycodes/BUILD.gn @@ -19,6 +19,8 @@ source_set("xkb") { @@ -81,7 +81,7 @@ index 86bbf620ff0d9..6c06b461c6da1 100644 "//base", "//build:chromeos_buildflags", diff --git ui/events/keycodes/keyboard_code_conversion_xkb.h ui/events/keycodes/keyboard_code_conversion_xkb.h -index e1fefa4cead9e..8213402ff263d 100644 +index e1fefa4cead9..8213402ff263 100644 --- ui/events/keycodes/keyboard_code_conversion_xkb.h +++ ui/events/keycodes/keyboard_code_conversion_xkb.h @@ -9,6 +9,7 @@ diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index 14ec68f6a..aa948466d 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 2e0bcdd47dea9..79cc0943c5dc9 100644 +index 2e0bcdd47dea..79cc0943c5dc 100644 --- chrome/browser/download/download_target_determiner.cc +++ chrome/browser/download/download_target_determiner.cc @@ -678,7 +678,7 @@ void IsHandledBySafePlugin(int render_process_id, @@ -12,7 +12,7 @@ index 2e0bcdd47dea9..79cc0943c5dc9 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 42f62ccb3830b..5471182793dee 100644 +index 42f62ccb3830..5471182793de 100644 --- content/browser/loader/navigation_url_loader_impl.cc +++ content/browser/loader/navigation_url_loader_impl.cc @@ -636,6 +636,13 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest( @@ -102,7 +102,7 @@ index 42f62ccb3830b..5471182793dee 100644 if (stale) { diff --git content/browser/plugin_service_impl.cc content/browser/plugin_service_impl.cc -index 493e9a31c983d..c468cb87a541f 100644 +index 493e9a31c983..c468cb87a541 100644 --- content/browser/plugin_service_impl.cc +++ content/browser/plugin_service_impl.cc @@ -269,6 +269,7 @@ bool PluginServiceImpl::GetPluginInfoArray( @@ -124,7 +124,7 @@ index 493e9a31c983d..c468cb87a541f 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,10 +188,10 @@ 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 3bfb10467c5c8..399f939fd32c6 100644 +index 98af6bf02266..d064da8c6ada 100644 --- content/browser/renderer_host/render_frame_host_impl.cc +++ content/browser/renderer_host/render_frame_host_impl.cc -@@ -12009,6 +12009,7 @@ void RenderFrameHostImpl::BindHungDetectorHost( +@@ -12031,6 +12031,7 @@ void RenderFrameHostImpl::BindHungDetectorHost( } void RenderFrameHostImpl::GetPluginInfo(const GURL& url, @@ -199,7 +199,7 @@ index 3bfb10467c5c8..399f939fd32c6 100644 const url::Origin& main_frame_origin, const std::string& mime_type, GetPluginInfoCallback callback) { -@@ -12016,7 +12017,8 @@ void RenderFrameHostImpl::GetPluginInfo(const GURL& url, +@@ -12038,7 +12039,8 @@ void RenderFrameHostImpl::GetPluginInfo(const GURL& url, WebPluginInfo info; std::string actual_mime_type; bool found = PluginServiceImpl::GetInstance()->GetPluginInfo( @@ -210,7 +210,7 @@ index 3bfb10467c5c8..399f939fd32c6 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 8b5fc66305083..efe1b8ebc0549 100644 +index 8b5fc6630508..efe1b8ebc054 100644 --- content/browser/renderer_host/render_frame_host_impl.h +++ content/browser/renderer_host/render_frame_host_impl.h @@ -2559,6 +2559,7 @@ class CONTENT_EXPORT RenderFrameHostImpl @@ -222,7 +222,7 @@ index 8b5fc66305083..efe1b8ebc0549 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 997125e855c0f..c74b5c7f0d3a8 100644 +index 997125e855c0..c74b5c7f0d3a 100644 --- content/public/browser/content_browser_client.cc +++ content/public/browser/content_browser_client.cc @@ -9,7 +9,7 @@ @@ -247,7 +247,7 @@ index 997125e855c0f..c74b5c7f0d3a8 100644 #include diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h -index 65638e207d6bf..b53028afd7809 100644 +index 65638e207d6b..b53028afd780 100644 --- content/public/browser/content_browser_client.h +++ content/public/browser/content_browser_client.h @@ -33,6 +33,7 @@ @@ -285,7 +285,7 @@ index 65638e207d6bf..b53028afd7809 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 9ba385b9f541d..859f9aa88f1e8 100644 +index 9ba385b9f541..859f9aa88f1e 100644 --- content/renderer/render_frame_impl.cc +++ content/renderer/render_frame_impl.cc @@ -3307,7 +3307,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin( @@ -348,7 +348,7 @@ index 9ba385b9f541d..859f9aa88f1e8 100644 &mime_type); if (!found) diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc -index 7e1d2199e024d..1a25e37314c8c 100644 +index 7e1d2199e024..1a25e37314c8 100644 --- content/renderer/render_thread_impl.cc +++ content/renderer/render_thread_impl.cc @@ -609,6 +609,8 @@ void RenderThreadImpl::Init() { @@ -361,7 +361,7 @@ index 7e1d2199e024d..1a25e37314c8c 100644 &RenderThreadImpl::OnRendererInterfaceReceiver, base::Unretained(this))); diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc -index 272d5c2d7aa76..08cc3b31c2c4a 100644 +index 272d5c2d7aa7..08cc3b31c2c4 100644 --- content/renderer/renderer_blink_platform_impl.cc +++ content/renderer/renderer_blink_platform_impl.cc @@ -1115,6 +1115,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() { @@ -381,7 +381,7 @@ index 272d5c2d7aa76..08cc3b31c2c4a 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 918400762b2bf..1a8f737074c61 100644 +index 918400762b2b..1a8f737074c6 100644 --- content/renderer/renderer_blink_platform_impl.h +++ content/renderer/renderer_blink_platform_impl.h @@ -259,6 +259,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { @@ -395,7 +395,7 @@ index 918400762b2bf..1a8f737074c61 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/content_main_654986.patch b/patch/patches/content_main_654986.patch index 3646741a3..41f0a9d06 100644 --- a/patch/patches/content_main_654986.patch +++ b/patch/patches/content_main_654986.patch @@ -1,5 +1,5 @@ diff --git content/app/content_main.cc content/app/content_main.cc -index a26c5c2e053ed..c88c4c1b81f9b 100644 +index a26c5c2e053e..c88c4c1b81f9 100644 --- content/app/content_main.cc +++ content/app/content_main.cc @@ -216,18 +216,10 @@ void InitializeMojo(mojo::core::Configuration* config) { @@ -123,7 +123,7 @@ index a26c5c2e053ed..c88c4c1b81f9b 100644 return RunContentProcess(params, runner.get()); } diff --git content/app/content_main_runner_impl.cc content/app/content_main_runner_impl.cc -index 095bc943529c3..a8c1febd913f8 100644 +index 095bc943529c..a8c1febd913f 100644 --- content/app/content_main_runner_impl.cc +++ content/app/content_main_runner_impl.cc @@ -45,6 +45,7 @@ @@ -147,7 +147,7 @@ index 095bc943529c3..a8c1febd913f8 100644 std::unique_ptr ContentMainRunner::Create() { return ContentMainRunnerImpl::Create(); diff --git content/app/content_main_runner_impl.h content/app/content_main_runner_impl.h -index 5dbc33d943de2..4238219a05773 100644 +index 5dbc33d943de..4238219a0577 100644 --- content/app/content_main_runner_impl.h +++ content/app/content_main_runner_impl.h @@ -39,7 +39,7 @@ class ContentMainDelegate; @@ -169,7 +169,7 @@ index 5dbc33d943de2..4238219a05773 100644 int RunBrowser(MainFunctionParams& main_function_params, bool start_minimal_browser); diff --git content/common/set_process_title.cc content/common/set_process_title.cc -index 8b829a4887739..a69a088697287 100644 +index 8b829a488773..a69a08869728 100644 --- content/common/set_process_title.cc +++ content/common/set_process_title.cc @@ -54,7 +54,7 @@ void SetProcessTitleFromCommandLine(const char** main_argv) { @@ -182,7 +182,7 @@ index 8b829a4887739..a69a088697287 100644 if (main_argv) setproctitle_init(main_argv); diff --git content/public/app/content_main.h content/public/app/content_main.h -index 97aac3d0c7584..fc795ae0287f9 100644 +index 97aac3d0c758..fc795ae0287f 100644 --- content/public/app/content_main.h +++ content/public/app/content_main.h @@ -68,7 +68,16 @@ struct ContentMainParams { diff --git a/patch/patches/content_mojo_3123.patch b/patch/patches/content_mojo_3123.patch index 0e9d47a89..bac6fc83a 100644 --- a/patch/patches/content_mojo_3123.patch +++ b/patch/patches/content_mojo_3123.patch @@ -1,5 +1,5 @@ diff --git content/public/browser/document_service_base.h content/public/browser/document_service_base.h -index e92c412a44c62..520338835afa8 100644 +index e92c412a44c6..520338835afa 100644 --- content/public/browser/document_service_base.h +++ content/public/browser/document_service_base.h @@ -80,6 +80,8 @@ class DocumentServiceBase : public Interface, public WebContentsObserver { diff --git a/patch/patches/crashpad_1995.patch b/patch/patches/crashpad_1995.patch index 7b3349bc4..33824768d 100644 --- a/patch/patches/crashpad_1995.patch +++ b/patch/patches/crashpad_1995.patch @@ -1,5 +1,5 @@ diff --git chrome/chrome_elf/BUILD.gn chrome/chrome_elf/BUILD.gn -index 9b08e23e921b0..49182504ae361 100644 +index 9b08e23e921b..49182504ae36 100644 --- chrome/chrome_elf/BUILD.gn +++ chrome/chrome_elf/BUILD.gn @@ -7,6 +7,7 @@ @@ -47,7 +47,7 @@ index 9b08e23e921b0..49182504ae361 100644 source_set("dll_hash") { diff --git chrome/chrome_elf/crash/crash_helper.cc chrome/chrome_elf/crash/crash_helper.cc -index 886372e114899..ad3bc2242883b 100644 +index 886372e11489..ad3bc2242883 100644 --- chrome/chrome_elf/crash/crash_helper.cc +++ chrome/chrome_elf/crash/crash_helper.cc @@ -11,12 +11,17 @@ @@ -81,7 +81,7 @@ index 886372e114899..ad3bc2242883b 100644 g_crash_helper_enabled = true; return true; diff --git chrome/common/crash_keys.cc chrome/common/crash_keys.cc -index 68ddd337e4dfa..687e869afd5c7 100644 +index 68ddd337e4df..687e869afd5c 100644 --- chrome/common/crash_keys.cc +++ chrome/common/crash_keys.cc @@ -4,6 +4,8 @@ @@ -121,7 +121,7 @@ index 68ddd337e4dfa..687e869afd5c7 100644 void SetActiveExtensions(const std::set& extensions) { diff --git chrome/common/crash_keys.h chrome/common/crash_keys.h -index bcf172e645a23..f879aa745adfc 100644 +index bcf172e645a2..f879aa745adf 100644 --- chrome/common/crash_keys.h +++ chrome/common/crash_keys.h @@ -17,6 +17,10 @@ class CommandLine; @@ -136,7 +136,7 @@ index bcf172e645a23..f879aa745adfc 100644 // on the given |command_line|. void SetCrashKeysFromCommandLine(const base::CommandLine& command_line); diff --git components/crash/core/app/breakpad_linux.cc components/crash/core/app/breakpad_linux.cc -index 00009dacdc2b0..e6454d5b1a23d 100644 +index 00009dacdc2b..e6454d5b1a23 100644 --- components/crash/core/app/breakpad_linux.cc +++ components/crash/core/app/breakpad_linux.cc @@ -28,6 +28,7 @@ @@ -212,7 +212,7 @@ index 00009dacdc2b0..e6454d5b1a23d 100644 writer.Flush(); } diff --git components/crash/core/app/breakpad_linux.h components/crash/core/app/breakpad_linux.h -index 9ea80370a842c..3043f7d32f33d 100644 +index 9ea80370a842..3043f7d32f33 100644 --- components/crash/core/app/breakpad_linux.h +++ components/crash/core/app/breakpad_linux.h @@ -20,6 +20,9 @@ extern void InitCrashReporter(const std::string& process_type); @@ -226,7 +226,7 @@ index 9ea80370a842c..3043f7d32f33d 100644 extern void InitCrashKeysForTesting(); diff --git components/crash/core/app/crash_reporter_client.cc components/crash/core/app/crash_reporter_client.cc -index 89b4bfccd5d32..7cb0a85470d2f 100644 +index 89b4bfccd5d3..7cb0a85470d2 100644 --- components/crash/core/app/crash_reporter_client.cc +++ components/crash/core/app/crash_reporter_client.cc @@ -87,7 +87,7 @@ int CrashReporterClient::GetResultCodeRespawnFailed() { @@ -299,7 +299,7 @@ index 89b4bfccd5d32..7cb0a85470d2f 100644 } // namespace crash_reporter diff --git components/crash/core/app/crash_reporter_client.h components/crash/core/app/crash_reporter_client.h -index 39557cce47443..236806090021a 100644 +index 39557cce4744..236806090021 100644 --- components/crash/core/app/crash_reporter_client.h +++ components/crash/core/app/crash_reporter_client.h @@ -5,7 +5,9 @@ @@ -366,7 +366,7 @@ index 39557cce47443..236806090021a 100644 } // namespace crash_reporter diff --git components/crash/core/app/crashpad.cc components/crash/core/app/crashpad.cc -index 42938c3994679..3e8eaeebd7b2b 100644 +index 42938c399467..3e8eaeebd7b2 100644 --- components/crash/core/app/crashpad.cc +++ components/crash/core/app/crashpad.cc @@ -152,7 +152,8 @@ void InitializeCrashpadImpl(bool initial_client, @@ -380,7 +380,7 @@ index 42938c3994679..3e8eaeebd7b2b 100644 ->set_system_crash_reporter_forwarding(crashpad::TriState::kDisabled); } diff --git components/crash/core/app/crashpad_mac.mm components/crash/core/app/crashpad_mac.mm -index e3fc1fb2bcab3..56395d7100f94 100644 +index e3fc1fb2bcab..56395d7100f9 100644 --- components/crash/core/app/crashpad_mac.mm +++ components/crash/core/app/crashpad_mac.mm @@ -16,11 +16,14 @@ @@ -483,7 +483,7 @@ index e3fc1fb2bcab3..56395d7100f94 100644 handler_path, database_path, metrics_path, url, GetProcessSimpleAnnotations(), arguments, true, false); diff --git components/crash/core/app/crashpad_win.cc components/crash/core/app/crashpad_win.cc -index 7dd251b2fdda8..3d358889ea6f2 100644 +index 7dd251b2fdda..3d358889ea6f 100644 --- components/crash/core/app/crashpad_win.cc +++ components/crash/core/app/crashpad_win.cc @@ -36,8 +36,8 @@ void GetPlatformCrashpadAnnotations( diff --git a/patch/patches/crashpad_tp_1995.patch b/patch/patches/crashpad_tp_1995.patch index 44a9282f4..72d4e3139 100644 --- a/patch/patches/crashpad_tp_1995.patch +++ b/patch/patches/crashpad_tp_1995.patch @@ -1,5 +1,5 @@ diff --git third_party/crashpad/crashpad/client/prune_crash_reports.cc third_party/crashpad/crashpad/client/prune_crash_reports.cc -index 492d466239d1a..a1df635870ede 100644 +index 492d466239d1..a1df635870ed 100644 --- third_party/crashpad/crashpad/client/prune_crash_reports.cc +++ third_party/crashpad/crashpad/client/prune_crash_reports.cc @@ -73,13 +73,19 @@ size_t PruneCrashReportDatabase(CrashReportDatabase* database, @@ -26,7 +26,7 @@ index 492d466239d1a..a1df635870ede 100644 static const time_t kSecondsInDay = 60 * 60 * 24; diff --git third_party/crashpad/crashpad/client/prune_crash_reports.h third_party/crashpad/crashpad/client/prune_crash_reports.h -index 07a70980f12af..ddf7f17325fed 100644 +index 07a70980f12a..ddf7f17325fe 100644 --- third_party/crashpad/crashpad/client/prune_crash_reports.h +++ third_party/crashpad/crashpad/client/prune_crash_reports.h @@ -59,7 +59,8 @@ class PruneCondition { @@ -40,7 +40,7 @@ index 07a70980f12af..ddf7f17325fed 100644 virtual ~PruneCondition() {} diff --git third_party/crashpad/crashpad/client/settings.cc third_party/crashpad/crashpad/client/settings.cc -index 3855b9b6a4b20..263f985043716 100644 +index 3855b9b6a4b2..263f98504371 100644 --- third_party/crashpad/crashpad/client/settings.cc +++ third_party/crashpad/crashpad/client/settings.cc @@ -86,7 +86,7 @@ void ScopedLockedFileHandleTraits::Free(FileHandle handle) { @@ -130,7 +130,7 @@ index 3855b9b6a4b20..263f985043716 100644 Settings::ScopedLockedFileHandle Settings::MakeScopedLockedFileHandle( FileHandle file, diff --git third_party/crashpad/crashpad/client/settings.h third_party/crashpad/crashpad/client/settings.h -index 5761c6b965b5c..aee4e6c96033e 100644 +index 5761c6b965b5..aee4e6c96033 100644 --- third_party/crashpad/crashpad/client/settings.h +++ third_party/crashpad/crashpad/client/settings.h @@ -115,6 +115,11 @@ class Settings { @@ -146,7 +146,7 @@ index 5761c6b965b5c..aee4e6c96033e 100644 struct Data; diff --git third_party/crashpad/crashpad/handler/BUILD.gn third_party/crashpad/crashpad/handler/BUILD.gn -index a697b338e8eeb..96d4b45c5aa51 100644 +index a697b338e8ee..96d4b45c5aa5 100644 --- third_party/crashpad/crashpad/handler/BUILD.gn +++ third_party/crashpad/crashpad/handler/BUILD.gn @@ -12,6 +12,7 @@ @@ -184,7 +184,7 @@ index a697b338e8eeb..96d4b45c5aa51 100644 if (crashpad_is_win) { diff --git third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc -index b7e445fd9f3ed..c5f1a3c3ceee7 100644 +index b7e445fd9f3e..c5f1a3c3ceee 100644 --- third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc +++ third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc @@ -263,6 +263,8 @@ CrashReportUploadThread::UploadResult CrashReportUploadThread::UploadReport( @@ -197,7 +197,7 @@ index b7e445fd9f3ed..c5f1a3c3ceee7 100644 if (!reader->SeekSet(start_offset)) { diff --git third_party/crashpad/crashpad/handler/crash_report_upload_thread.h third_party/crashpad/crashpad/handler/crash_report_upload_thread.h -index 2ec1147d2620d..8ff9a72e0bd79 100644 +index 2ec1147d2620..8ff9a72e0bd7 100644 --- third_party/crashpad/crashpad/handler/crash_report_upload_thread.h +++ third_party/crashpad/crashpad/handler/crash_report_upload_thread.h @@ -15,6 +15,7 @@ @@ -248,7 +248,7 @@ index 2ec1147d2620d..8ff9a72e0bd79 100644 //! \brief Calls ProcessPendingReports() in response to ReportPending() having //! been called on any thread, as well as periodically on a timer. diff --git third_party/crashpad/crashpad/handler/handler_main.cc third_party/crashpad/crashpad/handler/handler_main.cc -index 737ee4e09f676..f5a8727f7e6b1 100644 +index 737ee4e09f67..f5a8727f7e6b 100644 --- third_party/crashpad/crashpad/handler/handler_main.cc +++ third_party/crashpad/crashpad/handler/handler_main.cc @@ -39,6 +39,7 @@ diff --git a/patch/patches/embedder_product_override.patch b/patch/patches/embedder_product_override.patch index 173588b5c..e8d59c7aa 100644 --- a/patch/patches/embedder_product_override.patch +++ b/patch/patches/embedder_product_override.patch @@ -1,5 +1,5 @@ diff --git components/embedder_support/user_agent_utils.cc components/embedder_support/user_agent_utils.cc -index d9cd3f7c287ad..834c345710aaf 100644 +index d9cd3f7c287a..834c345710aa 100644 --- components/embedder_support/user_agent_utils.cc +++ components/embedder_support/user_agent_utils.cc @@ -10,6 +10,7 @@ diff --git a/patch/patches/extensions_1947.patch b/patch/patches/extensions_1947.patch index 4c4073f36..9790a7e36 100644 --- a/patch/patches/extensions_1947.patch +++ b/patch/patches/extensions_1947.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/extensions/api/streams_private/streams_private_api.cc chrome/browser/extensions/api/streams_private/streams_private_api.cc -index 5c903a13a14ed..c85964a7bab17 100644 +index 5c903a13a14e..c85964a7bab1 100644 --- chrome/browser/extensions/api/streams_private/streams_private_api.cc +++ chrome/browser/extensions/api/streams_private/streams_private_api.cc @@ -6,6 +6,7 @@ @@ -60,7 +60,7 @@ index 5c903a13a14ed..c85964a7bab17 100644 std::unique_ptr stream_container( new StreamContainer(tab_id, embedded, handler_url, extension_id, diff --git extensions/browser/extension_host.cc extensions/browser/extension_host.cc -index 3f78873130d14..07159e4524155 100644 +index 3f78873130d1..07159e452415 100644 --- extensions/browser/extension_host.cc +++ extensions/browser/extension_host.cc @@ -63,11 +63,12 @@ ExtensionHost::ExtensionHost(const Extension* extension, @@ -125,7 +125,7 @@ index 3f78873130d14..07159e4524155 100644 ExtensionRegistry::Get(browser_context_)->RemoveObserver(this); diff --git extensions/browser/extension_host.h extensions/browser/extension_host.h -index e8b4ce11bcd00..617de0d501fdd 100644 +index e8b4ce11bcd0..617de0d501fd 100644 --- extensions/browser/extension_host.h +++ extensions/browser/extension_host.h @@ -53,13 +53,19 @@ class ExtensionHost : public DeferredStartRenderHost, @@ -160,7 +160,7 @@ index e8b4ce11bcd00..617de0d501fdd 100644 // A pointer to the current or speculative main frame in `host_contents_`. We // can't access this frame through the `host_contents_` directly as it does diff --git extensions/browser/extensions_browser_client.h extensions/browser/extensions_browser_client.h -index 0d21ebc927042..a08ebcbafc252 100644 +index 0d21ebc92704..a08ebcbafc25 100644 --- extensions/browser/extensions_browser_client.h +++ extensions/browser/extensions_browser_client.h @@ -27,6 +27,7 @@ @@ -195,7 +195,7 @@ index 0d21ebc927042..a08ebcbafc252 100644 // once each time the extensions system is loaded per browser_context. The // implementation may wish to use the BrowserContext to record the current diff --git extensions/browser/process_manager.cc extensions/browser/process_manager.cc -index 0bf4809cb6f60..fccf3478b8669 100644 +index 0bf4809cb6f6..fccf3478b866 100644 --- extensions/browser/process_manager.cc +++ extensions/browser/process_manager.cc @@ -393,9 +393,17 @@ bool ProcessManager::CreateBackgroundHost(const Extension* extension, diff --git a/patch/patches/font_family_cache_1501.patch b/patch/patches/font_family_cache_1501.patch index 498802108..0d793f8be 100644 --- a/patch/patches/font_family_cache_1501.patch +++ b/patch/patches/font_family_cache_1501.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/font_family_cache.h chrome/browser/font_family_cache.h -index 0e5573a7326a2..28eb26fb7af55 100644 +index 0e5573a7326a..28eb26fb7af5 100644 --- chrome/browser/font_family_cache.h +++ chrome/browser/font_family_cache.h @@ -19,6 +19,8 @@ class Profile; diff --git a/patch/patches/gn_config.patch b/patch/patches/gn_config.patch index ddbc68e30..046778ac7 100644 --- a/patch/patches/gn_config.patch +++ b/patch/patches/gn_config.patch @@ -1,5 +1,5 @@ diff --git .gn .gn -index 64dbcb82086d9..2527fd74ed4b1 100644 +index 64dbcb82086d..2527fd74ed4b 100644 --- .gn +++ .gn @@ -144,6 +144,8 @@ exec_script_whitelist = @@ -12,7 +12,7 @@ index 64dbcb82086d9..2527fd74ed4b1 100644 # https://crbug.com/474506. "//clank/java/BUILD.gn", diff --git BUILD.gn BUILD.gn -index 3bb7c2579c19c..8562b4bb02806 100644 +index 3bb7c2579c19..8562b4bb0280 100644 --- BUILD.gn +++ BUILD.gn @@ -16,6 +16,7 @@ import("//build/config/sanitizers/sanitizers.gni") @@ -34,7 +34,7 @@ index 3bb7c2579c19c..8562b4bb02806 100644 deps += [ "//ios:all", diff --git build/config/win/visual_studio_version.gni build/config/win/visual_studio_version.gni -index 982fbe8d3f0d0..e757be4688f10 100644 +index 982fbe8d3f0d..e757be4688f1 100644 --- build/config/win/visual_studio_version.gni +++ build/config/win/visual_studio_version.gni @@ -12,9 +12,8 @@ declare_args() { @@ -66,7 +66,7 @@ index 982fbe8d3f0d0..e757be4688f10 100644 + "studio path") } diff --git chrome/app/framework.order chrome/app/framework.order -index d2266b28b33f8..a7ff6d9b68f38 100644 +index d2266b28b33f..a7ff6d9b68f3 100644 --- chrome/app/framework.order +++ chrome/app/framework.order @@ -72,3 +72,8 @@ _ChromeMain @@ -79,7 +79,7 @@ index d2266b28b33f8..a7ff6d9b68f38 100644 +_OBJC_METACLASS_$_UnderlayOpenGLHostingWindow + diff --git chrome/chrome_paks.gni chrome/chrome_paks.gni -index b9dce47a02f58..70b11f9312fc8 100644 +index b9dce47a02f5..70b11f9312fc 100644 --- chrome/chrome_paks.gni +++ chrome/chrome_paks.gni @@ -4,6 +4,7 @@ @@ -102,7 +102,7 @@ index b9dce47a02f58..70b11f9312fc8 100644 sources += [ "$root_gen_dir/extensions/extensions_browser_resources_${percent}_percent.pak" ] deps += [ "//extensions:extensions_browser_resources" ] diff --git chrome/chrome_repack_locales.gni chrome/chrome_repack_locales.gni -index e9dfe6bb49914..1d15880a0e8a9 100644 +index e9dfe6bb4991..1d15880a0e8a 100644 --- chrome/chrome_repack_locales.gni +++ chrome/chrome_repack_locales.gni @@ -6,6 +6,7 @@ import("//build/config/chrome_build.gni") @@ -125,7 +125,7 @@ index e9dfe6bb49914..1d15880a0e8a9 100644 source_patterns += [ "${root_gen_dir}/extensions/strings/extensions_strings_" ] diff --git chrome/installer/mini_installer/BUILD.gn chrome/installer/mini_installer/BUILD.gn -index 51fa0d7f4cf77..2ede68e9377eb 100644 +index 51fa0d7f4cf7..2ede68e9377e 100644 --- chrome/installer/mini_installer/BUILD.gn +++ chrome/installer/mini_installer/BUILD.gn @@ -6,6 +6,7 @@ import("//build/config/compiler/compiler.gni") @@ -152,7 +152,7 @@ index 51fa0d7f4cf77..2ede68e9377eb 100644 outputs = [ # See also chrome.packed.7z conditionally added below. diff --git tools/grit/grit_defines.gni tools/grit/grit_defines.gni -index 0039f04a75ef2..32beb70d1b99c 100644 +index 0039f04a75ef..32beb70d1b99 100644 --- tools/grit/grit_defines.gni +++ tools/grit/grit_defines.gni @@ -5,6 +5,7 @@ diff --git a/patch/patches/gritsettings.patch b/patch/patches/gritsettings.patch index df73ec9ec..1aedf582f 100644 --- a/patch/patches/gritsettings.patch +++ b/patch/patches/gritsettings.patch @@ -1,5 +1,5 @@ diff --git tools/gritsettings/resource_ids.spec tools/gritsettings/resource_ids.spec -index 628fa47e4f253..a4dd6e2acfe15 100644 +index 628fa47e4f25..a4dd6e2acfe1 100644 --- tools/gritsettings/resource_ids.spec +++ tools/gritsettings/resource_ids.spec @@ -840,4 +840,13 @@ diff --git a/patch/patches/ime_1610.patch b/patch/patches/ime_1610.patch index 492f30e59..6e731da16 100644 --- a/patch/patches/ime_1610.patch +++ b/patch/patches/ime_1610.patch @@ -1,5 +1,5 @@ diff --git ui/base/ime/win/input_method_win_base.cc ui/base/ime/win/input_method_win_base.cc -index de4e2f8fa1761..3a60044e871fb 100644 +index de4e2f8fa176..3a60044e871f 100644 --- ui/base/ime/win/input_method_win_base.cc +++ ui/base/ime/win/input_method_win_base.cc @@ -262,8 +262,9 @@ bool InputMethodWinBase::IsWindowFocused(const TextInputClient* client) const { diff --git a/patch/patches/libxml_visibility.patch b/patch/patches/libxml_visibility.patch index 748525abe..7dc03abae 100644 --- a/patch/patches/libxml_visibility.patch +++ b/patch/patches/libxml_visibility.patch @@ -1,5 +1,5 @@ diff --git third_party/libxml/BUILD.gn third_party/libxml/BUILD.gn -index 5ade3efc432df..3f313f9c30aed 100644 +index 5ade3efc432d..3f313f9c30ae 100644 --- third_party/libxml/BUILD.gn +++ third_party/libxml/BUILD.gn @@ -137,6 +137,7 @@ static_library("libxml") { diff --git a/patch/patches/linux_assets_path_1936.patch b/patch/patches/linux_assets_path_1936.patch index 826d104c8..f008a9e13 100644 --- a/patch/patches/linux_assets_path_1936.patch +++ b/patch/patches/linux_assets_path_1936.patch @@ -1,5 +1,5 @@ diff --git content/browser/child_process_launcher_helper_linux.cc content/browser/child_process_launcher_helper_linux.cc -index bbc1d4d057291..a7c7d75f61df6 100644 +index bbc1d4d05729..a7c7d75f61df 100644 --- content/browser/child_process_launcher_helper_linux.cc +++ content/browser/child_process_launcher_helper_linux.cc @@ -162,7 +162,7 @@ void ChildProcessLauncherHelper::SetProcessPriorityOnLauncherThread( @@ -12,7 +12,7 @@ index bbc1d4d057291..a7c7d75f61df6 100644 base::File file(exe_dir.Append(path), base::File::FLAG_OPEN | base::File::FLAG_READ); diff --git sandbox/linux/suid/client/setuid_sandbox_host.cc sandbox/linux/suid/client/setuid_sandbox_host.cc -index 7022a65e03578..c9aaf5d76e4a1 100644 +index 7022a65e0357..c9aaf5d76e4a 100644 --- sandbox/linux/suid/client/setuid_sandbox_host.cc +++ sandbox/linux/suid/client/setuid_sandbox_host.cc @@ -120,7 +120,7 @@ bool SetuidSandboxHost::IsDisabledViaEnvironment() { @@ -25,7 +25,7 @@ index 7022a65e03578..c9aaf5d76e4a1 100644 if (base::PathExists(sandbox_candidate)) sandbox_binary = sandbox_candidate; diff --git ui/gl/init/gl_initializer_linux_x11.cc ui/gl/init/gl_initializer_linux_x11.cc -index 016046d6caa4f..116e4919cda08 100644 +index 016046d6caa4..116e4919cda0 100644 --- ui/gl/init/gl_initializer_linux_x11.cc +++ ui/gl/init/gl_initializer_linux_x11.cc @@ -82,7 +82,7 @@ bool InitializeStaticEGLInternalFromLibrary(GLImplementation implementation) { diff --git a/patch/patches/linux_atk_1123214.patch b/patch/patches/linux_atk_1123214.patch index 77411627c..a47f3f66e 100644 --- a/patch/patches/linux_atk_1123214.patch +++ b/patch/patches/linux_atk_1123214.patch @@ -1,5 +1,5 @@ diff --git build/config/linux/atk/BUILD.gn build/config/linux/atk/BUILD.gn -index 92baff2a9b6ee..fdf40cd38ad3a 100644 +index 92baff2a9b6e..fdf40cd38ad3 100644 --- build/config/linux/atk/BUILD.gn +++ build/config/linux/atk/BUILD.gn @@ -11,7 +11,7 @@ import("//build/config/ui.gni") @@ -12,7 +12,7 @@ index 92baff2a9b6ee..fdf40cd38ad3a 100644 if (use_atk) { assert(use_glib, "use_atk=true requires that use_glib=true") diff --git build/config/linux/atspi2/BUILD.gn build/config/linux/atspi2/BUILD.gn -index 988a995681361..1791ea607550e 100644 +index 988a99568136..1791ea607550 100644 --- build/config/linux/atspi2/BUILD.gn +++ build/config/linux/atspi2/BUILD.gn @@ -6,7 +6,7 @@ import("//build/config/linux/pkg_config.gni") diff --git a/patch/patches/linux_blink_thread_local.patch b/patch/patches/linux_blink_thread_local.patch index bf681a247..99f49a248 100644 --- a/patch/patches/linux_blink_thread_local.patch +++ b/patch/patches/linux_blink_thread_local.patch @@ -1,5 +1,5 @@ diff --git third_party/blink/renderer/platform/heap/v8_wrapper/thread_local.h third_party/blink/renderer/platform/heap/v8_wrapper/thread_local.h -index 1a0c43b0eaf45..184155c81b08b 100644 +index 1a0c43b0eaf4..184155c81b08 100644 --- third_party/blink/renderer/platform/heap/v8_wrapper/thread_local.h +++ third_party/blink/renderer/platform/heap/v8_wrapper/thread_local.h @@ -36,7 +36,7 @@ diff --git a/patch/patches/linux_chrome_page_info_1099927.patch b/patch/patches/linux_chrome_page_info_1099927.patch index 3fc41f322..4688e9c68 100644 --- a/patch/patches/linux_chrome_page_info_1099927.patch +++ b/patch/patches/linux_chrome_page_info_1099927.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/ui/page_info/chrome_page_info_client.cc chrome/browser/ui/page_info/chrome_page_info_client.cc -index e2972da9e548d..2f356616ed97c 100644 +index e2972da9e548..2f356616ed97 100644 --- chrome/browser/ui/page_info/chrome_page_info_client.cc +++ chrome/browser/ui/page_info/chrome_page_info_client.cc @@ -17,5 +17,9 @@ std::unique_ptr ChromePageInfoClient::CreatePageInfoDelegate( diff --git a/patch/patches/linux_chrome_widevine_3149.patch b/patch/patches/linux_chrome_widevine_3149.patch index 65f801847..a308a1ce9 100644 --- a/patch/patches/linux_chrome_widevine_3149.patch +++ b/patch/patches/linux_chrome_widevine_3149.patch @@ -1,5 +1,5 @@ diff --git chrome/common/media/component_widevine_cdm_hint_file_linux.cc chrome/common/media/component_widevine_cdm_hint_file_linux.cc -index 44a89a2e7f6e4..447c1a635eadd 100644 +index 44a89a2e7f6e..447c1a635ead 100644 --- chrome/common/media/component_widevine_cdm_hint_file_linux.cc +++ chrome/common/media/component_widevine_cdm_hint_file_linux.cc @@ -16,6 +16,7 @@ diff --git a/patch/patches/linux_poll_2466.patch b/patch/patches/linux_poll_2466.patch index 68004b23c..63d09e1b4 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 0c37e08d78825..80a8d27d9733b 100644 +index 0c37e08d7882..80a8d27d9733 100644 --- base/files/file_path_watcher_linux.cc +++ base/files/file_path_watcher_linux.cc @@ -5,6 +5,7 @@ diff --git a/patch/patches/mac_event_observer_2539.patch b/patch/patches/mac_event_observer_2539.patch index dc3832a7f..a38408643 100644 --- a/patch/patches/mac_event_observer_2539.patch +++ b/patch/patches/mac_event_observer_2539.patch @@ -1,5 +1,5 @@ diff --git content/browser/scheduler/responsiveness/native_event_observer_mac.mm content/browser/scheduler/responsiveness/native_event_observer_mac.mm -index 7cb3238e97edb..ae800739b6863 100644 +index 7cb3238e97ed..ae800739b686 100644 --- content/browser/scheduler/responsiveness/native_event_observer_mac.mm +++ content/browser/scheduler/responsiveness/native_event_observer_mac.mm @@ -12,13 +12,15 @@ namespace content { diff --git a/patch/patches/mac_fling_scheduler_2540.patch b/patch/patches/mac_fling_scheduler_2540.patch index cfd64e2b1..8a7776a8b 100644 --- a/patch/patches/mac_fling_scheduler_2540.patch +++ b/patch/patches/mac_fling_scheduler_2540.patch @@ -1,5 +1,5 @@ diff --git content/browser/renderer_host/input/fling_scheduler_mac.mm content/browser/renderer_host/input/fling_scheduler_mac.mm -index f10c5d161dd13..92a751dd984e5 100644 +index f10c5d161dd1..92a751dd984e 100644 --- content/browser/renderer_host/input/fling_scheduler_mac.mm +++ content/browser/renderer_host/input/fling_scheduler_mac.mm @@ -26,6 +26,10 @@ ui::Compositor* FlingSchedulerMac::GetCompositor() { diff --git a/patch/patches/mac_gpu.patch b/patch/patches/mac_gpu.patch index dedd4d1b6..19683b566 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 98f3c5a43da3b..55bef97cfc336 100644 +index 98f3c5a43da3..55bef97cfc33 100644 --- ui/gl/init/gl_initializer_mac.cc +++ ui/gl/init/gl_initializer_mac.cc @@ -46,11 +46,8 @@ bool InitializeOneOffForSandbox() { diff --git a/patch/patches/message_loop.patch b/patch/patches/message_loop.patch index 72d8a5a79..8f9efd055 100644 --- a/patch/patches/message_loop.patch +++ b/patch/patches/message_loop.patch @@ -1,5 +1,5 @@ diff --git base/message_loop/message_pump_win.cc base/message_loop/message_pump_win.cc -index 2c8d83d2424d9..ae9f7229a51cf 100644 +index 2c8d83d2424d..ae9f7229a51c 100644 --- base/message_loop/message_pump_win.cc +++ base/message_loop/message_pump_win.cc @@ -2,6 +2,7 @@ @@ -30,7 +30,7 @@ index 2c8d83d2424d9..ae9f7229a51cf 100644 } if (has_msg) diff --git base/task/current_thread.cc base/task/current_thread.cc -index 9641285fde742..51cc852fcc165 100644 +index 9641285fde74..51cc852fcc16 100644 --- base/task/current_thread.cc +++ base/task/current_thread.cc @@ -48,6 +48,8 @@ void CurrentThread::AddDestructionObserver( @@ -43,7 +43,7 @@ index 9641285fde742..51cc852fcc165 100644 current_->RemoveDestructionObserver(destruction_observer); } diff --git base/task/current_thread.h base/task/current_thread.h -index bdcd661bfa282..823a1d02ca858 100644 +index bdcd661bfa28..823a1d02ca85 100644 --- base/task/current_thread.h +++ base/task/current_thread.h @@ -127,6 +127,12 @@ class BASE_EXPORT CurrentThread { diff --git a/patch/patches/message_pump_mac_2495.patch b/patch/patches/message_pump_mac_2495.patch index 94ed5d01b..9db9a154d 100644 --- a/patch/patches/message_pump_mac_2495.patch +++ b/patch/patches/message_pump_mac_2495.patch @@ -1,5 +1,5 @@ diff --git base/message_loop/message_pump_mac.mm base/message_loop/message_pump_mac.mm -index ebc9aa83a1a0e..a64b1f9d90c0c 100644 +index ebc9aa83a1a0..a64b1f9d90c0 100644 --- base/message_loop/message_pump_mac.mm +++ base/message_loop/message_pump_mac.mm @@ -692,7 +692,8 @@ void MessagePumpUIApplication::Detach() { diff --git a/patch/patches/mime_handler_view_guest_1565_2727.patch b/patch/patches/mime_handler_view_guest_1565_2727.patch index 5126d173d..393b839b4 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 cdbc0273838e5..ee2809a0bb98a 100644 +index cdbc0273838e..ee2809a0bb98 100644 --- content/browser/web_contents/web_contents_view.h +++ content/browser/web_contents/web_contents_view.h @@ -22,7 +22,7 @@ struct DropData; @@ -12,7 +12,7 @@ index cdbc0273838e5..ee2809a0bb98a 100644 virtual ~WebContentsView() {} diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc -index 2dc016e4be765..fb052a3a0bf21 100644 +index 2dc016e4be76..fb052a3a0bf2 100644 --- extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc +++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc @@ -211,6 +211,8 @@ void MimeHandlerViewGuest::CreateWebContents( @@ -48,7 +48,7 @@ index 2dc016e4be765..fb052a3a0bf21 100644 WebContents* source, const content::OpenURLParams& params) { diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h -index bb90319f768ed..b0ba7bfa08c03 100644 +index bb90319f768e..b0ba7bfa08c0 100644 --- extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h +++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h @@ -130,6 +130,7 @@ class MimeHandlerViewGuest @@ -68,7 +68,7 @@ index bb90319f768ed..b0ba7bfa08c03 100644 bool is_embedder_fullscreen_ = false; bool plugin_can_save_ = false; diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h -index 98689e2614604..a1b08274f4556 100644 +index 98689e261460..a1b08274f455 100644 --- extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h +++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h @@ -8,9 +8,9 @@ diff --git a/patch/patches/net_cookie_flags.patch b/patch/patches/net_cookie_flags.patch index 6980edac2..517b8dc1b 100644 --- a/patch/patches/net_cookie_flags.patch +++ b/patch/patches/net_cookie_flags.patch @@ -1,5 +1,5 @@ diff --git net/base/load_flags_list.h net/base/load_flags_list.h -index 96d1a51ec1078..e8120a818b1f2 100644 +index 96d1a51ec107..e8120a818b1f 100644 --- net/base/load_flags_list.h +++ net/base/load_flags_list.h @@ -101,3 +101,6 @@ LOAD_FLAG(RESTRICTED_PREFETCH, 1 << 15) @@ -10,7 +10,7 @@ index 96d1a51ec1078..e8120a818b1f2 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 a6cd1ef45ab03..4c947b9118e52 100644 +index a6cd1ef45ab0..4c947b9118e5 100644 --- net/url_request/url_request_http_job.cc +++ net/url_request/url_request_http_job.cc @@ -561,7 +561,8 @@ void URLRequestHttpJob::AddCookieHeaderAndStart() { @@ -24,7 +24,7 @@ index a6cd1ef45ab03..4c947b9118e52 100644 request_->force_ignore_site_for_cookies(); if (cookie_store->cookie_access_delegate() && diff --git services/network/public/cpp/resource_request.cc services/network/public/cpp/resource_request.cc -index e2e170ab85f39..0f4052dcd6767 100644 +index e2e170ab85f3..0f4052dcd676 100644 --- services/network/public/cpp/resource_request.cc +++ services/network/public/cpp/resource_request.cc @@ -253,7 +253,8 @@ bool ResourceRequest::EqualsForTesting(const ResourceRequest& request) const { diff --git a/patch/patches/osr_fling_2745.patch b/patch/patches/osr_fling_2745.patch index 81d2cc93d..7444913ea 100644 --- a/patch/patches/osr_fling_2745.patch +++ b/patch/patches/osr_fling_2745.patch @@ -1,5 +1,5 @@ diff --git content/browser/renderer_host/input/fling_scheduler.cc content/browser/renderer_host/input/fling_scheduler.cc -index c7a4f1f0c3d00..7e6e3b4e56d42 100644 +index c7a4f1f0c3d0..7e6e3b4e56d4 100644 --- content/browser/renderer_host/input/fling_scheduler.cc +++ content/browser/renderer_host/input/fling_scheduler.cc @@ -68,6 +68,9 @@ void FlingScheduler::ProgressFlingOnBeginFrameIfneeded( @@ -13,7 +13,7 @@ index c7a4f1f0c3d00..7e6e3b4e56d42 100644 if (host_->GetView() && host_->GetView()->GetNativeView() && host_->GetView()->GetNativeView()->GetHost() && diff --git content/browser/renderer_host/input/fling_scheduler_base.h content/browser/renderer_host/input/fling_scheduler_base.h -index cc4b13a7b9c67..84f3b9ed7cf49 100644 +index cc4b13a7b9c6..84f3b9ed7cf4 100644 --- content/browser/renderer_host/input/fling_scheduler_base.h +++ content/browser/renderer_host/input/fling_scheduler_base.h @@ -7,12 +7,23 @@ @@ -41,7 +41,7 @@ index cc4b13a7b9c67..84f3b9ed7cf49 100644 } // namespace content diff --git content/browser/renderer_host/render_widget_host_impl.cc content/browser/renderer_host/render_widget_host_impl.cc -index ebb771918923b..db13c44cd2738 100644 +index ebb771918923..db13c44cd273 100644 --- content/browser/renderer_host/render_widget_host_impl.cc +++ content/browser/renderer_host/render_widget_host_impl.cc @@ -3110,6 +3110,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() { @@ -57,7 +57,7 @@ index ebb771918923b..db13c44cd2738 100644 const WebInputEvent& event) { if ((base::FeatureList::IsEnabled( diff --git content/browser/renderer_host/render_widget_host_impl.h content/browser/renderer_host/render_widget_host_impl.h -index d082d920c4124..b588cb681c4e8 100644 +index d082d920c412..b588cb681c4e 100644 --- content/browser/renderer_host/render_widget_host_impl.h +++ content/browser/renderer_host/render_widget_host_impl.h @@ -762,6 +762,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl diff --git a/patch/patches/print_preview_123.patch b/patch/patches/print_preview_123.patch index 6a111c282..fe1f9f4d7 100644 --- a/patch/patches/print_preview_123.patch +++ b/patch/patches/print_preview_123.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/download/download_prefs.cc chrome/browser/download/download_prefs.cc -index 50aec56adb4b6..c36996e06ebee 100644 +index 50aec56adb4b..c36996e06ebe 100644 --- chrome/browser/download/download_prefs.cc +++ chrome/browser/download/download_prefs.cc @@ -24,6 +24,7 @@ @@ -34,7 +34,7 @@ index 50aec56adb4b6..c36996e06ebee 100644 } diff --git chrome/browser/printing/print_preview_dialog_controller.cc chrome/browser/printing/print_preview_dialog_controller.cc -index 4ff73fd2d9ec3..d56686d8284ba 100644 +index 4ff73fd2d9ec..d56686d8284b 100644 --- chrome/browser/printing/print_preview_dialog_controller.cc +++ chrome/browser/printing/print_preview_dialog_controller.cc @@ -15,6 +15,7 @@ @@ -58,7 +58,7 @@ index 4ff73fd2d9ec3..d56686d8284ba 100644 // Add an entry to the map. preview_dialog_map_[preview_dialog] = initiator; diff --git chrome/browser/printing/print_view_manager_base.cc chrome/browser/printing/print_view_manager_base.cc -index e4cacbf9a82da..3f137e18b8087 100644 +index e4cacbf9a82d..3f137e18b808 100644 --- chrome/browser/printing/print_view_manager_base.cc +++ chrome/browser/printing/print_view_manager_base.cc @@ -21,6 +21,7 @@ @@ -97,7 +97,7 @@ index e4cacbf9a82da..3f137e18b8087 100644 void NotifySystemDialogCancelled(int render_process_id, int routing_id) { diff --git chrome/browser/printing/print_view_manager_base.h chrome/browser/printing/print_view_manager_base.h -index eaa0e162a339b..8e030d2ab3995 100644 +index eaa0e162a339..8e030d2ab399 100644 --- chrome/browser/printing/print_view_manager_base.h +++ chrome/browser/printing/print_view_manager_base.h @@ -126,9 +126,6 @@ class PrintViewManagerBase : public content::NotificationObserver, @@ -111,7 +111,7 @@ index eaa0e162a339b..8e030d2ab3995 100644 void Observe(int type, const content::NotificationSource& source, diff --git chrome/browser/resources/print_preview/ui/destination_dialog.html chrome/browser/resources/print_preview/ui/destination_dialog.html -index 920f646f06484..76c0b5e5ee04b 100644 +index 920f646f0648..76c0b5e5ee04 100644 --- chrome/browser/resources/print_preview/ui/destination_dialog.html +++ chrome/browser/resources/print_preview/ui/destination_dialog.html @@ -25,10 +25,7 @@ @@ -127,7 +127,7 @@ index 920f646f06484..76c0b5e5ee04b 100644 $i18n{cancel} diff --git chrome/browser/ui/webui/constrained_web_dialog_ui.cc chrome/browser/ui/webui/constrained_web_dialog_ui.cc -index dd3512b303c40..0627aa331492c 100644 +index dd3512b303c4..0627aa331492 100644 --- chrome/browser/ui/webui/constrained_web_dialog_ui.cc +++ chrome/browser/ui/webui/constrained_web_dialog_ui.cc @@ -26,6 +26,8 @@ @@ -151,7 +151,7 @@ index dd3512b303c40..0627aa331492c 100644 ConstrainedWebDialogUI::~ConstrainedWebDialogUI() = default; diff --git chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc -index 1b18146a4ba8f..9094f488642fc 100644 +index 1b18146a4ba8..9094f488642f 100644 --- chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc +++ chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc @@ -21,6 +21,7 @@ @@ -270,7 +270,7 @@ index 1b18146a4ba8f..9094f488642fc 100644 #if BUILDFLAG(IS_CHROMEOS_ASH) drive::DriveIntegrationService* drive_service = diff --git chrome/browser/ui/webui/print_preview/pdf_printer_handler.h chrome/browser/ui/webui/print_preview/pdf_printer_handler.h -index e326047aef5e9..4fc8898e95b6f 100644 +index e326047aef5e..4fc8898e95b6 100644 --- chrome/browser/ui/webui/print_preview/pdf_printer_handler.h +++ chrome/browser/ui/webui/print_preview/pdf_printer_handler.h @@ -11,6 +11,7 @@ @@ -304,7 +304,7 @@ index e326047aef5e9..4fc8898e95b6f 100644 base::FilePath GetSaveLocation() const; diff --git chrome/browser/ui/webui/print_preview/print_preview_ui.cc chrome/browser/ui/webui/print_preview/print_preview_ui.cc -index 424ee9168d93a..aa6266ccf443c 100644 +index 424ee9168d93..aa6266ccf443 100644 --- chrome/browser/ui/webui/print_preview/print_preview_ui.cc +++ chrome/browser/ui/webui/print_preview/print_preview_ui.cc @@ -29,6 +29,7 @@ diff --git a/patch/patches/printing_context_2196.patch b/patch/patches/printing_context_2196.patch index 033800ba3..c35013a56 100644 --- a/patch/patches/printing_context_2196.patch +++ b/patch/patches/printing_context_2196.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/printing/print_job_worker.cc chrome/browser/printing/print_job_worker.cc -index 2824b97e715a4..7207b58654e49 100644 +index 2824b97e715a..7207b58654e4 100644 --- chrome/browser/printing/print_job_worker.cc +++ chrome/browser/printing/print_job_worker.cc @@ -135,6 +135,7 @@ PrintJobWorker::PrintJobWorker(int render_process_id, int render_frame_id) @@ -11,7 +11,7 @@ index 2824b97e715a4..7207b58654e49 100644 PrintJobWorker::~PrintJobWorker() { diff --git printing/printing_context.h printing/printing_context.h -index 5c300fa414fbb..84da337deeca4 100644 +index 5c300fa414fb..84da337deeca 100644 --- printing/printing_context.h +++ printing/printing_context.h @@ -133,6 +133,13 @@ class COMPONENT_EXPORT(PRINTING) PrintingContext { diff --git a/patch/patches/renderer_host_1070713.patch b/patch/patches/renderer_host_1070713.patch index e72feeb72..83a17c035 100644 --- a/patch/patches/renderer_host_1070713.patch +++ b/patch/patches/renderer_host_1070713.patch @@ -1,5 +1,5 @@ diff --git content/browser/renderer_host/render_view_host_impl.cc content/browser/renderer_host/render_view_host_impl.cc -index 9786cb8ef6633..33f8b8bffd127 100644 +index 9786cb8ef663..33f8b8bffd12 100644 --- content/browser/renderer_host/render_view_host_impl.cc +++ content/browser/renderer_host/render_view_host_impl.cc @@ -612,6 +612,8 @@ bool RenderViewHostImpl::IsRenderViewLive() { diff --git a/patch/patches/renderer_preferences_util_545103.patch b/patch/patches/renderer_preferences_util_545103.patch index 0c093fbed..d5e2397a2 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 f61123b6cf989..b2d3b3619b93c 100644 +index f61123b6cf98..b2d3b3619b93 100644 --- chrome/browser/renderer_preferences_util.cc +++ chrome/browser/renderer_preferences_util.cc @@ -42,7 +42,8 @@ diff --git a/patch/patches/resource_bundle_2512.patch b/patch/patches/resource_bundle_2512.patch index 38b1b708a..520c30bf5 100644 --- a/patch/patches/resource_bundle_2512.patch +++ b/patch/patches/resource_bundle_2512.patch @@ -1,5 +1,5 @@ diff --git ui/base/resource/resource_bundle.cc ui/base/resource/resource_bundle.cc -index 276ef65251647..bf2a3e07b98ce 100644 +index 276ef6525164..bf2a3e07b98c 100644 --- ui/base/resource/resource_bundle.cc +++ ui/base/resource/resource_bundle.cc @@ -838,6 +838,12 @@ ResourceBundle::ResourceBundle(Delegate* delegate) @@ -28,7 +28,7 @@ index 276ef65251647..bf2a3e07b98ce 100644 void ResourceBundle::InitSharedInstance(Delegate* delegate) { DCHECK(g_shared_instance_ == nullptr) << "ResourceBundle initialized twice"; diff --git ui/base/resource/resource_bundle.h ui/base/resource/resource_bundle.h -index c1aee3d5f8557..215073ae0e712 100644 +index c1aee3d5f855..215073ae0e71 100644 --- ui/base/resource/resource_bundle.h +++ ui/base/resource/resource_bundle.h @@ -191,6 +191,11 @@ class COMPONENT_EXPORT(UI_BASE) ResourceBundle { diff --git a/patch/patches/runhooks.patch b/patch/patches/runhooks.patch index 48810a544..4bf4cd63a 100644 --- a/patch/patches/runhooks.patch +++ b/patch/patches/runhooks.patch @@ -1,5 +1,5 @@ diff --git build/toolchain/win/setup_toolchain.py build/toolchain/win/setup_toolchain.py -index c1d2fa2ce0aa2..d1d215f35ac12 100644 +index c1d2fa2ce0aa..d1d215f35ac1 100644 --- build/toolchain/win/setup_toolchain.py +++ build/toolchain/win/setup_toolchain.py @@ -154,13 +154,17 @@ def _LoadToolchainEnv(cpu, toolchain_root, sdk_dir, target_store): @@ -26,7 +26,7 @@ index c1d2fa2ce0aa2..d1d215f35ac12 100644 if (cpu != 'x64'): # x64 is default target CPU thus any other CPU requires a target set diff --git build/vs_toolchain.py build/vs_toolchain.py -index ecf0971ab1349..bf90866524442 100755 +index ecf0971ab134..bf9086652444 100755 --- build/vs_toolchain.py +++ build/vs_toolchain.py @@ -102,9 +102,16 @@ def SetEnvironmentAndGetRuntimeDllDirs(): diff --git a/patch/patches/rwh_background_color_1984.patch b/patch/patches/rwh_background_color_1984.patch index 1e53abda0..bd6c9cdea 100644 --- a/patch/patches/rwh_background_color_1984.patch +++ b/patch/patches/rwh_background_color_1984.patch @@ -1,5 +1,5 @@ diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc -index 9ea3f7da129a0..d0e7f9ffcd10a 100644 +index 9ea3f7da129a..d0e7f9ffcd10 100644 --- content/browser/renderer_host/render_widget_host_view_aura.cc +++ content/browser/renderer_host/render_widget_host_view_aura.cc @@ -645,10 +645,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() { diff --git a/patch/patches/services_network_2622.patch b/patch/patches/services_network_2622.patch index 3c36cf440..cb809ce2b 100644 --- a/patch/patches/services_network_2622.patch +++ b/patch/patches/services_network_2622.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc -index 77573496f3548..2ac1f3ea101f9 100644 +index 77573496f354..2ac1f3ea101f 100644 --- chrome/browser/net/profile_network_context_service.cc +++ chrome/browser/net/profile_network_context_service.cc @@ -21,6 +21,7 @@ @@ -42,7 +42,7 @@ index 77573496f3548..2ac1f3ea101f9 100644 // change. network_context_params->http_server_properties_path = diff --git net/cookies/cookie_monster.cc net/cookies/cookie_monster.cc -index f13f2ce613379..729c48c808342 100644 +index f13f2ce61337..729c48c80834 100644 --- net/cookies/cookie_monster.cc +++ net/cookies/cookie_monster.cc @@ -506,6 +506,25 @@ void CookieMonster::SetCookieableSchemes( @@ -72,7 +72,7 @@ index f13f2ce613379..729c48c808342 100644 void CookieMonster::SetPersistSessionCookies(bool persist_session_cookies) { DCHECK(thread_checker_.CalledOnValidThread()); diff --git net/cookies/cookie_monster.h net/cookies/cookie_monster.h -index 8439ba30a162d..6170ffa6110ff 100644 +index 8439ba30a162..6170ffa6110f 100644 --- net/cookies/cookie_monster.h +++ net/cookies/cookie_monster.h @@ -181,6 +181,8 @@ class NET_EXPORT CookieMonster : public CookieStore { @@ -85,7 +85,7 @@ index 8439ba30a162d..6170ffa6110ff 100644 // Enables writing session cookies into the cookie database. If this this // method is called, it must be called before first use of the instance diff --git net/cookies/cookie_store.h net/cookies/cookie_store.h -index 0642e632dedce..1e8be4703de44 100644 +index 0642e632dedc..1e8be4703de4 100644 --- net/cookies/cookie_store.h +++ net/cookies/cookie_store.h @@ -155,6 +155,11 @@ class NET_EXPORT CookieStore { @@ -101,7 +101,7 @@ index 0642e632dedce..1e8be4703de44 100644 virtual void DumpMemoryStats(base::trace_event::ProcessMemoryDump* pmd, const std::string& parent_absolute_name) const; diff --git services/network/cookie_manager.cc services/network/cookie_manager.cc -index a397306372054..8a1bacea8d70c 100644 +index a39730637205..8a1bacea8d70 100644 --- services/network/cookie_manager.cc +++ services/network/cookie_manager.cc @@ -249,14 +249,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) { @@ -123,7 +123,7 @@ index a397306372054..8a1bacea8d70c 100644 void CookieManager::SetForceKeepSessionState() { diff --git services/network/network_context.cc services/network/network_context.cc -index 7c64f63ad0661..fc7c495dedd62 100644 +index 7c64f63ad066..fc7c495dedd6 100644 --- services/network/network_context.cc +++ services/network/network_context.cc @@ -2054,16 +2054,27 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( @@ -157,7 +157,7 @@ index 7c64f63ad0661..fc7c495dedd62 100644 trust_token_store_ = std::make_unique(); diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom -index 409b43c0bf005..fcc1a0a15a8f7 100644 +index 409b43c0bf00..fcc1a0a15a8f 100644 --- services/network/public/mojom/network_context.mojom +++ services/network/public/mojom/network_context.mojom @@ -250,6 +250,9 @@ struct NetworkContextParams { diff --git a/patch/patches/services_network_2718.patch b/patch/patches/services_network_2718.patch index d8b672076..0be8d058b 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 5edf24182bc5a..8fed55299bacf 100644 +index 5edf24182bc5..8fed55299bac 100644 --- content/browser/storage_partition_impl.cc +++ content/browser/storage_partition_impl.cc @@ -500,10 +500,6 @@ class LoginHandlerDelegate { diff --git a/patch/patches/set_resize_background_color.patch b/patch/patches/set_resize_background_color.patch index 7366bb33c..91325c669 100644 --- a/patch/patches/set_resize_background_color.patch +++ b/patch/patches/set_resize_background_color.patch @@ -1,5 +1,5 @@ diff --git ui/views/controls/native/native_view_host.cc ui/views/controls/native/native_view_host.cc -index 1a85a7b4a8305..66817eaecd86b 100644 +index 1a85a7b4a830..66817eaecd86 100644 --- ui/views/controls/native/native_view_host.cc +++ ui/views/controls/native/native_view_host.cc @@ -161,7 +161,7 @@ void NativeViewHost::OnPaint(gfx::Canvas* canvas) { @@ -12,7 +12,7 @@ index 1a85a7b4a8305..66817eaecd86b 100644 void NativeViewHost::VisibilityChanged(View* starting_from, bool is_visible) { diff --git ui/views/controls/native/native_view_host.h ui/views/controls/native/native_view_host.h -index 3ed75e4c9b11e..c4a7318de5dd7 100644 +index 3ed75e4c9b11..c4a7318de5dd 100644 --- ui/views/controls/native/native_view_host.h +++ ui/views/controls/native/native_view_host.h @@ -94,6 +94,12 @@ class VIEWS_EXPORT NativeViewHost : public View { @@ -39,7 +39,7 @@ index 3ed75e4c9b11e..c4a7318de5dd7 100644 }; diff --git ui/views/controls/webview/webview.cc ui/views/controls/webview/webview.cc -index 75c1f03c6efff..5ed55bb974958 100644 +index 75c1f03c6eff..5ed55bb97495 100644 --- ui/views/controls/webview/webview.cc +++ ui/views/controls/webview/webview.cc @@ -131,6 +131,10 @@ void WebView::EnableSizingFromWebContents(const gfx::Size& min_size, @@ -54,7 +54,7 @@ index 75c1f03c6efff..5ed55bb974958 100644 if (crashed_overlay_view_ == crashed_overlay_view) return; diff --git ui/views/controls/webview/webview.h ui/views/controls/webview/webview.h -index 71883873f5028..def24d95736fb 100644 +index 71883873f502..def24d95736f 100644 --- ui/views/controls/webview/webview.h +++ ui/views/controls/webview/webview.h @@ -78,6 +78,10 @@ class WEBVIEW_EXPORT WebView : public View, diff --git a/patch/patches/storage_incognito_2289.patch b/patch/patches/storage_incognito_2289.patch index ca35fe135..51753dd69 100644 --- a/patch/patches/storage_incognito_2289.patch +++ b/patch/patches/storage_incognito_2289.patch @@ -1,5 +1,5 @@ diff --git content/browser/blob_storage/chrome_blob_storage_context.cc content/browser/blob_storage/chrome_blob_storage_context.cc -index 4960b1067e1c4..2686fa5bc550b 100644 +index 4960b1067e1c..2686fa5bc550 100644 --- content/browser/blob_storage/chrome_blob_storage_context.cc +++ content/browser/blob_storage/chrome_blob_storage_context.cc @@ -120,7 +120,8 @@ ChromeBlobStorageContext* ChromeBlobStorageContext::GetFor( @@ -13,7 +13,7 @@ index 4960b1067e1c4..2686fa5bc550b 100644 {base::MayBlock(), base::TaskPriority::USER_VISIBLE, base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN}); diff --git content/browser/browser_context.cc content/browser/browser_context.cc -index f7a2f30d3748a..098ff6540d8ea 100644 +index f7a2f30d3748..098ff6540d8e 100644 --- content/browser/browser_context.cc +++ content/browser/browser_context.cc @@ -137,7 +137,7 @@ StoragePartition* BrowserContext::GetStoragePartition( @@ -36,7 +36,7 @@ index f7a2f30d3748a..098ff6540d8ea 100644 std::unique_ptr stats_db; if (use_in_memory_db) { diff --git content/public/browser/storage_partition_config.cc content/public/browser/storage_partition_config.cc -index b430ebb66bb5f..8fc54d2e7d713 100644 +index b430ebb66bb5..8fc54d2e7d71 100644 --- content/public/browser/storage_partition_config.cc +++ content/public/browser/storage_partition_config.cc @@ -7,6 +7,7 @@ @@ -58,7 +58,7 @@ index b430ebb66bb5f..8fc54d2e7d713 100644 // static diff --git storage/browser/database/database_tracker.cc storage/browser/database/database_tracker.cc -index c96e3fad1a70f..302b2be31d8dc 100644 +index c96e3fad1a70..302b2be31d8d 100644 --- storage/browser/database/database_tracker.cc +++ storage/browser/database/database_tracker.cc @@ -562,7 +562,7 @@ bool DatabaseTracker::LazyInit() { diff --git a/patch/patches/trace_event.patch b/patch/patches/trace_event.patch index 291c3ed13..12a505640 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 81dea0e4a02ae..01a63782f6713 100644 +index 81dea0e4a02a..01a63782f671 100644 --- base/trace_event/builtin_categories.h +++ base/trace_event/builtin_categories.h @@ -61,6 +61,8 @@ diff --git a/patch/patches/ui_dragdrop_355390.patch b/patch/patches/ui_dragdrop_355390.patch index 029ecd21f..f7bb5b067 100644 --- a/patch/patches/ui_dragdrop_355390.patch +++ b/patch/patches/ui_dragdrop_355390.patch @@ -1,5 +1,5 @@ diff --git ui/base/x/x11_os_exchange_data_provider.cc ui/base/x/x11_os_exchange_data_provider.cc -index d3f24a6dce7ad..901198a562e44 100644 +index d3f24a6dce7a..901198a562e4 100644 --- ui/base/x/x11_os_exchange_data_provider.cc +++ ui/base/x/x11_os_exchange_data_provider.cc @@ -123,7 +123,8 @@ void XOSExchangeDataProvider::SetURL(const GURL& url, diff --git a/patch/patches/underlay_1051.patch b/patch/patches/underlay_1051.patch index 634f7d1d7..864c7def1 100644 --- a/patch/patches/underlay_1051.patch +++ b/patch/patches/underlay_1051.patch @@ -1,5 +1,5 @@ diff --git ui/base/cocoa/underlay_opengl_hosting_window.h ui/base/cocoa/underlay_opengl_hosting_window.h -index ec1c6c972ee8d..9f73342051325 100644 +index ec1c6c972ee8..9f7334205132 100644 --- ui/base/cocoa/underlay_opengl_hosting_window.h +++ ui/base/cocoa/underlay_opengl_hosting_window.h @@ -12,7 +12,7 @@ diff --git a/patch/patches/views_1749_2102.patch b/patch/patches/views_1749_2102.patch index 5453b9e4d..2d71053c3 100644 --- a/patch/patches/views_1749_2102.patch +++ b/patch/patches/views_1749_2102.patch @@ -1,5 +1,5 @@ diff --git ui/base/models/menu_model.h ui/base/models/menu_model.h -index f095bfc301151..f4eab5e49b61c 100644 +index f095bfc30115..f4eab5e49b61 100644 --- ui/base/models/menu_model.h +++ ui/base/models/menu_model.h @@ -14,8 +14,11 @@ @@ -43,7 +43,7 @@ index f095bfc301151..f4eab5e49b61c 100644 virtual void MenuWillShow() {} diff --git ui/gfx/render_text.cc ui/gfx/render_text.cc -index 32efa9df61814..3b06181586935 100644 +index 32efa9df6181..3b0618158693 100644 --- ui/gfx/render_text.cc +++ ui/gfx/render_text.cc @@ -650,6 +650,14 @@ void RenderText::SetWhitespaceElision(absl::optional whitespace_elision) { @@ -82,10 +82,10 @@ index 32efa9df61814..3b06181586935 100644 } diff --git ui/gfx/render_text.h ui/gfx/render_text.h -index 78e0d9ca85c02..937e627edc00a 100644 +index 36811695d23a..db6b5f8bb08a 100644 --- ui/gfx/render_text.h +++ ui/gfx/render_text.h -@@ -343,6 +343,10 @@ class GFX_EXPORT RenderText { +@@ -342,6 +342,10 @@ class GFX_EXPORT RenderText { return whitespace_elision_; } @@ -96,7 +96,7 @@ index 78e0d9ca85c02..937e627edc00a 100644 const Rect& display_rect() const { return display_rect_; } void SetDisplayRect(const Rect& r); -@@ -1049,6 +1053,8 @@ class GFX_EXPORT RenderText { +@@ -1048,6 +1052,8 @@ class GFX_EXPORT RenderText { // Tell whether or not the |layout_text_| needs an update or is up to date. mutable bool layout_text_up_to_date_ = false; @@ -106,7 +106,7 @@ index 78e0d9ca85c02..937e627edc00a 100644 } // namespace gfx diff --git ui/views/animation/ink_drop_host_view.h ui/views/animation/ink_drop_host_view.h -index 7ff4204a36c35..6094f15b36470 100644 +index 7ff4204a36c3..6094f15b3647 100644 --- ui/views/animation/ink_drop_host_view.h +++ ui/views/animation/ink_drop_host_view.h @@ -174,6 +174,8 @@ class VIEWS_EXPORT InkDropHost { @@ -119,7 +119,7 @@ index 7ff4204a36c35..6094f15b36470 100644 friend class test::InkDropHostTestApi; diff --git ui/views/controls/button/label_button.cc ui/views/controls/button/label_button.cc -index dbc9ca7ccb3e4..5546dc83a2de9 100644 +index dbc9ca7ccb3e..5546dc83a2de 100644 --- ui/views/controls/button/label_button.cc +++ ui/views/controls/button/label_button.cc @@ -509,6 +509,12 @@ void LabelButton::OnThemeChanged() { @@ -136,7 +136,7 @@ index dbc9ca7ccb3e4..5546dc83a2de9 100644 Button::StateChanged(old_state); ResetLabelEnabledColor(); diff --git ui/views/controls/button/label_button.h ui/views/controls/button/label_button.h -index 9b5389139c2fb..6111c18533564 100644 +index 9b5389139c2f..6111c1853356 100644 --- ui/views/controls/button/label_button.h +++ ui/views/controls/button/label_button.h @@ -134,6 +134,9 @@ class VIEWS_EXPORT LabelButton : public Button, public NativeThemeDelegate { @@ -150,7 +150,7 @@ index 9b5389139c2fb..6111c18533564 100644 ImageView* image() const { return image_; } Label* label() const { return label_; } diff --git ui/views/controls/label.cc ui/views/controls/label.cc -index 79a26da93a4eb..e755a11efc658 100644 +index 79a26da93a4e..e755a11efc65 100644 --- ui/views/controls/label.cc +++ ui/views/controls/label.cc @@ -52,12 +52,27 @@ enum LabelPropertyKey { @@ -215,7 +215,7 @@ index 79a26da93a4eb..e755a11efc658 100644 } diff --git ui/views/controls/label.h ui/views/controls/label.h -index 5bad0a8cd8cbc..da57021f0cefa 100644 +index 5bad0a8cd8cb..da57021f0cef 100644 --- ui/views/controls/label.h +++ ui/views/controls/label.h @@ -230,6 +230,10 @@ class VIEWS_EXPORT Label : public View, @@ -238,7 +238,7 @@ index 5bad0a8cd8cbc..da57021f0cefa 100644 std::unique_ptr selection_controller_; diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc -index 84332b5e94401..cf92a29a823c9 100644 +index 84332b5e9440..cf92a29a823c 100644 --- ui/views/controls/menu/menu_controller.cc +++ ui/views/controls/menu/menu_controller.cc @@ -2804,8 +2804,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem( @@ -269,7 +269,7 @@ index 84332b5e94401..cf92a29a823c9 100644 SetSelection(item, SELECTION_UPDATE_IMMEDIATELY); else if (item->GetParentMenuItem()->GetParentMenuItem()) diff --git ui/views/controls/menu/menu_delegate.h ui/views/controls/menu/menu_delegate.h -index 9c1542e1f4f0f..548fc8e87d520 100644 +index 9c1542e1f4f0..548fc8e87d52 100644 --- ui/views/controls/menu/menu_delegate.h +++ ui/views/controls/menu/menu_delegate.h @@ -73,6 +73,22 @@ class VIEWS_EXPORT MenuDelegate { @@ -308,7 +308,7 @@ index 9c1542e1f4f0f..548fc8e87d520 100644 virtual int GetMaxWidthForMenu(MenuItemView* menu); diff --git ui/views/controls/menu/menu_item_view.cc ui/views/controls/menu/menu_item_view.cc -index 9e5fb8d852607..a0106ee33b1f3 100644 +index 9e5fb8d85260..a0106ee33b1f 100644 --- ui/views/controls/menu/menu_item_view.cc +++ ui/views/controls/menu/menu_item_view.cc @@ -1072,6 +1072,15 @@ void MenuItemView::PaintBackground(gfx::Canvas* canvas, @@ -342,7 +342,7 @@ index 9e5fb8d852607..a0106ee33b1f3 100644 GetMenuController() && GetMenuController()->use_touchable_layout() ? style::CONTEXT_TOUCH_MENU diff --git ui/views/controls/menu/menu_model_adapter.cc ui/views/controls/menu/menu_model_adapter.cc -index fb5d5e6a79a3f..a336b5a74d6a1 100644 +index fb5d5e6a79a3..a336b5a74d6a 100644 --- ui/views/controls/menu/menu_model_adapter.cc +++ ui/views/controls/menu/menu_model_adapter.cc @@ -245,6 +245,77 @@ bool MenuModelAdapter::IsItemChecked(int id) const { @@ -424,7 +424,7 @@ index fb5d5e6a79a3f..a336b5a74d6a1 100644 // Look up the menu model for this menu. const std::map::const_iterator map_iterator = diff --git ui/views/controls/menu/menu_model_adapter.h ui/views/controls/menu/menu_model_adapter.h -index 380794d989adf..b7c06c8a30102 100644 +index 380794d989ad..b7c06c8a3010 100644 --- ui/views/controls/menu/menu_model_adapter.h +++ ui/views/controls/menu/menu_model_adapter.h @@ -84,6 +84,20 @@ class VIEWS_EXPORT MenuModelAdapter : public MenuDelegate, @@ -449,7 +449,7 @@ index 380794d989adf..b7c06c8a30102 100644 void WillHideMenu(MenuItemView* menu) override; void OnMenuClosed(MenuItemView* menu) override; diff --git ui/views/controls/menu/menu_scroll_view_container.cc ui/views/controls/menu/menu_scroll_view_container.cc -index 713b41c83e923..6f5502a98ea65 100644 +index 713b41c83e92..6f5502a98ea6 100644 --- ui/views/controls/menu/menu_scroll_view_container.cc +++ ui/views/controls/menu/menu_scroll_view_container.cc @@ -240,6 +240,11 @@ MenuScrollViewContainer::MenuScrollViewContainer(SubmenuView* content_view) @@ -465,7 +465,7 @@ index 713b41c83e923..6f5502a98ea65 100644 content_view_->GetMenuItem()->GetMenuController()->GetAnchorPosition()); diff --git ui/views/test/ui_controls_factory_desktop_aurax11.cc ui/views/test/ui_controls_factory_desktop_aurax11.cc -index 64e09ff4359a8..714e8e9ff6610 100644 +index 64e09ff4359a..714e8e9ff661 100644 --- ui/views/test/ui_controls_factory_desktop_aurax11.cc +++ ui/views/test/ui_controls_factory_desktop_aurax11.cc @@ -89,10 +89,6 @@ class UIControlsDesktopX11 : public UIControlsAura { @@ -480,7 +480,7 @@ index 64e09ff4359a8..714e8e9ff6610 100644 x11_ui_controls_test_helper_.ButtonDownMask() == 0) { // Move the cursor because EnterNotify/LeaveNotify are generated with the diff --git ui/views/view.h ui/views/view.h -index e18f104b8c075..2f2e22dc97910 100644 +index e18f104b8c07..2f2e22dc9791 100644 --- ui/views/view.h +++ ui/views/view.h @@ -20,6 +20,7 @@ diff --git a/patch/patches/views_widget.patch b/patch/patches/views_widget.patch index 6bb19846d..922d9f363 100644 --- a/patch/patches/views_widget.patch +++ b/patch/patches/views_widget.patch @@ -1,5 +1,5 @@ diff --git content/browser/renderer_host/render_widget_host_view_base.cc content/browser/renderer_host/render_widget_host_view_base.cc -index beaa6476fe5d8..beb1179214223 100644 +index beaa6476fe5d..beb117921422 100644 --- content/browser/renderer_host/render_widget_host_view_base.cc +++ content/browser/renderer_host/render_widget_host_view_base.cc @@ -638,6 +638,14 @@ float RenderWidgetHostViewBase::GetDeviceScaleFactor() { @@ -18,7 +18,7 @@ index beaa6476fe5d8..beb1179214223 100644 if (!GetMouseWheelPhaseHandler()) return; diff --git content/browser/renderer_host/render_widget_host_view_base.h content/browser/renderer_host/render_widget_host_view_base.h -index 21669355ec8d1..e0dd842c5a69c 100644 +index 21669355ec8d..e0dd842c5a69 100644 --- content/browser/renderer_host/render_widget_host_view_base.h +++ content/browser/renderer_host/render_widget_host_view_base.h @@ -67,6 +67,7 @@ class CursorManager; @@ -63,7 +63,7 @@ index 21669355ec8d1..e0dd842c5a69c 100644 FRIEND_TEST_ALL_PREFIXES( BrowserSideFlingBrowserTest, diff --git content/browser/renderer_host/render_widget_host_view_event_handler.cc content/browser/renderer_host/render_widget_host_view_event_handler.cc -index 9043a181d4c04..a72a96e015e9d 100644 +index 9043a181d4c0..a72a96e015e9 100644 --- content/browser/renderer_host/render_widget_host_view_event_handler.cc +++ content/browser/renderer_host/render_widget_host_view_event_handler.cc @@ -49,6 +49,10 @@ namespace { @@ -111,7 +111,7 @@ index 9043a181d4c04..a72a96e015e9d 100644 if (host_ && set_focus_on_mouse_down_or_key_event_) { set_focus_on_mouse_down_or_key_event_ = false; diff --git content/public/browser/render_widget_host_view.h content/public/browser/render_widget_host_view.h -index 7a8ceb1916434..01d0ca9a19316 100644 +index 7a8ceb191643..01d0ca9a1931 100644 --- content/public/browser/render_widget_host_view.h +++ content/public/browser/render_widget_host_view.h @@ -249,6 +249,14 @@ class CONTENT_EXPORT RenderWidgetHostView { @@ -130,7 +130,7 @@ index 7a8ceb1916434..01d0ca9a19316 100644 // Set the view's active state (i.e., tint state of controls). virtual void SetActive(bool active) = 0; diff --git ui/platform_window/x11/x11_window.cc ui/platform_window/x11/x11_window.cc -index 9d0bc6966680f..152c6f01059b6 100644 +index 9d0bc6966680..152c6f01059b 100644 --- ui/platform_window/x11/x11_window.cc +++ ui/platform_window/x11/x11_window.cc @@ -1671,7 +1671,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) { @@ -144,7 +144,7 @@ index 9d0bc6966680f..152c6f01059b6 100644 req.y = bounds_in_pixels_.y(); req.width = bounds_in_pixels_.width(); diff --git ui/views/widget/desktop_aura/desktop_screen_win.cc ui/views/widget/desktop_aura/desktop_screen_win.cc -index 7c352dd0d992d..516623a91b0e1 100644 +index 7c352dd0d992..516623a91b0e 100644 --- ui/views/widget/desktop_aura/desktop_screen_win.cc +++ ui/views/widget/desktop_aura/desktop_screen_win.cc @@ -20,6 +20,8 @@ DesktopScreenWin::~DesktopScreenWin() { @@ -157,7 +157,7 @@ index 7c352dd0d992d..516623a91b0e1 100644 return host ? host->GetAcceleratedWidget() : nullptr; } diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc -index 6e09038a0fffa..0400f99c5de22 100644 +index 6e09038a0fff..0400f99c5de2 100644 --- ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc +++ ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc @@ -226,6 +226,18 @@ Widget::MoveLoopResult DesktopWindowTreeHostLinux::RunMoveLoop( @@ -189,7 +189,7 @@ index 6e09038a0fffa..0400f99c5de22 100644 properties->x11_extension_delegate = this; } diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h -index dec3dd21f77b2..5c22c512e002e 100644 +index dec3dd21f77b..5c22c512e002 100644 --- ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h +++ ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h @@ -77,6 +77,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux @@ -221,7 +221,7 @@ index dec3dd21f77b2..5c22c512e002e 100644 base::WeakPtrFactory weak_factory_{this}; diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc -index 042fb2b5d1653..5ee040b8c26f4 100644 +index 042fb2b5d165..5ee040b8c26f 100644 --- ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc +++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc @@ -180,8 +180,12 @@ void DesktopWindowTreeHostWin::Init(const Widget::InitParams& params) { @@ -257,7 +257,7 @@ index 042fb2b5d1653..5ee040b8c26f4 100644 bool DesktopWindowTreeHostWin::HandleMouseEvent(ui::MouseEvent* event) { diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_win.h ui/views/widget/desktop_aura/desktop_window_tree_host_win.h -index db1299089169f..a9c331c37b210 100644 +index db1299089169..a9c331c37b21 100644 --- ui/views/widget/desktop_aura/desktop_window_tree_host_win.h +++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.h @@ -317,6 +317,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin @@ -272,7 +272,7 @@ index db1299089169f..a9c331c37b210 100644 // a reference. corewm::TooltipWin* tooltip_; diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc -index 37047c631afc3..aafa6a6fd0b38 100644 +index 37047c631afc..aafa6a6fd0b3 100644 --- ui/views/widget/widget.cc +++ ui/views/widget/widget.cc @@ -359,7 +359,8 @@ void Widget::Init(InitParams params) { @@ -317,7 +317,7 @@ index 37047c631afc3..aafa6a6fd0b38 100644 } diff --git ui/views/widget/widget.h ui/views/widget/widget.h -index 6ab943e4b7319..4ab76edb1e39f 100644 +index 6ab943e4b731..4ab76edb1e39 100644 --- ui/views/widget/widget.h +++ ui/views/widget/widget.h @@ -327,6 +327,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate, @@ -330,7 +330,7 @@ index 6ab943e4b7319..4ab76edb1e39f 100644 // the NativeWidget may specify a default size. If the parent is specified, // |bounds| is in the parent's coordinate system. If the parent is not diff --git ui/views/widget/widget_delegate.h ui/views/widget/widget_delegate.h -index 16245ed7e0b44..99592a5359fbd 100644 +index 16245ed7e0b4..99592a5359fb 100644 --- ui/views/widget/widget_delegate.h +++ ui/views/widget/widget_delegate.h @@ -381,6 +381,10 @@ class VIEWS_EXPORT WidgetDelegate { @@ -345,7 +345,7 @@ index 16245ed7e0b44..99592a5359fbd 100644 bool enable_arrow_key_traversal() const { return params_.enable_arrow_key_traversal; diff --git ui/views/widget/widget_hwnd_utils.cc ui/views/widget/widget_hwnd_utils.cc -index c23259757d984..450b2610e34d1 100644 +index c23259757d98..450b2610e34d 100644 --- ui/views/widget/widget_hwnd_utils.cc +++ ui/views/widget/widget_hwnd_utils.cc @@ -67,7 +67,7 @@ void CalculateWindowStylesFromInitParams( @@ -358,7 +358,7 @@ index c23259757d984..450b2610e34d1 100644 if (native_widget_delegate->IsDialogBox()) { *style |= DS_MODALFRAME; diff --git ui/views/win/hwnd_message_handler.cc ui/views/win/hwnd_message_handler.cc -index c471f43c6da9e..251e2b2089bde 100644 +index c471f43c6da9..251e2b2089bd 100644 --- ui/views/win/hwnd_message_handler.cc +++ ui/views/win/hwnd_message_handler.cc @@ -3117,10 +3117,13 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message, diff --git a/patch/patches/viz_osr_2575.patch b/patch/patches/viz_osr_2575.patch index 52093bdd9..2c9e0072f 100644 --- a/patch/patches/viz_osr_2575.patch +++ b/patch/patches/viz_osr_2575.patch @@ -1,5 +1,5 @@ diff --git components/viz/host/host_display_client.cc components/viz/host/host_display_client.cc -index 3b00759e513dc..90fe332d59f5b 100644 +index 3b00759e513d..90fe332d59f5 100644 --- components/viz/host/host_display_client.cc +++ components/viz/host/host_display_client.cc @@ -45,9 +45,14 @@ void HostDisplayClient::OnDisplayReceivedCALayerParams( @@ -29,7 +29,7 @@ index 3b00759e513dc..90fe332d59f5b 100644 // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git components/viz/host/host_display_client.h components/viz/host/host_display_client.h -index 94c5293d528a6..d89a986ed0def 100644 +index 94c5293d528a..d89a986ed0de 100644 --- components/viz/host/host_display_client.h +++ components/viz/host/host_display_client.h @@ -31,17 +31,17 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom::DisplayClient { @@ -54,7 +54,7 @@ index 94c5293d528a6..d89a986ed0def 100644 // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git components/viz/host/layered_window_updater_impl.cc components/viz/host/layered_window_updater_impl.cc -index b04f654fe820f..131977a36591d 100644 +index b04f654fe820..131977a36591 100644 --- components/viz/host/layered_window_updater_impl.cc +++ components/viz/host/layered_window_updater_impl.cc @@ -44,7 +44,7 @@ void LayeredWindowUpdaterImpl::OnAllocatedSharedMemory( @@ -67,7 +67,7 @@ index b04f654fe820f..131977a36591d 100644 if (!canvas_) { diff --git components/viz/host/layered_window_updater_impl.h components/viz/host/layered_window_updater_impl.h -index 1026b739d283f..fe562ab60ce98 100644 +index 1026b739d283..fe562ab60ce9 100644 --- components/viz/host/layered_window_updater_impl.h +++ components/viz/host/layered_window_updater_impl.h @@ -35,7 +35,7 @@ class VIZ_HOST_EXPORT LayeredWindowUpdaterImpl @@ -80,7 +80,7 @@ index 1026b739d283f..fe562ab60ce98 100644 private: const HWND hwnd_; diff --git components/viz/service/BUILD.gn components/viz/service/BUILD.gn -index f0eb025056501..823b7fcb55efc 100644 +index f0eb02505650..823b7fcb55ef 100644 --- components/viz/service/BUILD.gn +++ components/viz/service/BUILD.gn @@ -208,6 +208,8 @@ viz_component("service") { @@ -93,7 +93,7 @@ index f0eb025056501..823b7fcb55efc 100644 defines = [ "VIZ_SERVICE_IMPLEMENTATION" ] diff --git components/viz/service/display_embedder/output_surface_provider_impl.cc components/viz/service/display_embedder/output_surface_provider_impl.cc -index 827084542417d..73f44ba997497 100644 +index 827084542417..73f44ba99749 100644 --- components/viz/service/display_embedder/output_surface_provider_impl.cc +++ components/viz/service/display_embedder/output_surface_provider_impl.cc @@ -16,6 +16,7 @@ @@ -126,7 +126,7 @@ index 827084542417d..73f44ba997497 100644 return CreateSoftwareOutputDeviceWin(surface_handle, &output_device_backing_, display_client); diff --git components/viz/service/display_embedder/software_output_device_win.cc components/viz/service/display_embedder/software_output_device_win.cc -index 599b06c1765ef..e8ae98b0b1320 100644 +index 599b06c1765e..e8ae98b0b132 100644 --- components/viz/service/display_embedder/software_output_device_win.cc +++ components/viz/service/display_embedder/software_output_device_win.cc @@ -191,8 +191,9 @@ void SoftwareOutputDeviceWinProxy::EndPaintDelegated( @@ -142,7 +142,7 @@ index 599b06c1765ef..e8ae98b0b1320 100644 TRACE_EVENT_ASYNC_BEGIN0("viz", "SoftwareOutputDeviceWinProxy::Draw", this); diff --git content/browser/compositor/viz_process_transport_factory.cc content/browser/compositor/viz_process_transport_factory.cc -index 50ff2c9facc2a..c34d1f28d2e90 100644 +index 50ff2c9facc2..c34d1f28d2e9 100644 --- content/browser/compositor/viz_process_transport_factory.cc +++ content/browser/compositor/viz_process_transport_factory.cc @@ -395,8 +395,13 @@ void VizProcessTransportFactory::OnEstablishedGpuChannel( @@ -162,7 +162,7 @@ index 50ff2c9facc2a..c34d1f28d2e90 100644 compositor_data.display_client->GetBoundRemote(resize_task_runner_); diff --git mojo/public/cpp/bindings/sync_call_restrictions.h mojo/public/cpp/bindings/sync_call_restrictions.h -index fc4142741f793..ae797aaeff5f2 100644 +index fc4142741f79..ae797aaeff5f 100644 --- mojo/public/cpp/bindings/sync_call_restrictions.h +++ mojo/public/cpp/bindings/sync_call_restrictions.h @@ -43,6 +43,7 @@ class Compositor; @@ -183,7 +183,7 @@ index fc4142741f793..ae797aaeff5f2 100644 // running in the same process, so it won't block anything. // TODO(159346933) Remove once the origin isolation logic is moved outside of diff --git services/viz/privileged/mojom/compositing/display_private.mojom services/viz/privileged/mojom/compositing/display_private.mojom -index 409115f95787e..278354c126a0c 100644 +index 409115f95787..278354c126a0 100644 --- services/viz/privileged/mojom/compositing/display_private.mojom +++ services/viz/privileged/mojom/compositing/display_private.mojom @@ -85,12 +85,14 @@ interface DisplayPrivate { @@ -203,7 +203,7 @@ index 409115f95787e..278354c126a0c 100644 // Notifies that a swap has occurred and provides information about the pixel diff --git services/viz/privileged/mojom/compositing/layered_window_updater.mojom services/viz/privileged/mojom/compositing/layered_window_updater.mojom -index 6b7fbb6cf13dc..e2af75168cb91 100644 +index 6b7fbb6cf13d..e2af75168cb9 100644 --- services/viz/privileged/mojom/compositing/layered_window_updater.mojom +++ services/viz/privileged/mojom/compositing/layered_window_updater.mojom @@ -26,5 +26,5 @@ interface LayeredWindowUpdater { @@ -214,7 +214,7 @@ index 6b7fbb6cf13dc..e2af75168cb91 100644 + Draw(gfx.mojom.Rect damage_rect) => (); }; diff --git ui/compositor/compositor.h ui/compositor/compositor.h -index dfb0c89dc7bd8..4b54ea85c0298 100644 +index dfb0c89dc7bd..4b54ea85c029 100644 --- ui/compositor/compositor.h +++ ui/compositor/compositor.h @@ -29,7 +29,9 @@ diff --git a/patch/patches/web_contents_1257_1565.patch b/patch/patches/web_contents_1257_1565.patch index edc00b55b..078a47fd9 100644 --- a/patch/patches/web_contents_1257_1565.patch +++ b/patch/patches/web_contents_1257_1565.patch @@ -1,5 +1,5 @@ diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc -index 3170d101acf0b..8a15712e741b8 100644 +index 3170d101acf0..8a15712e741b 100644 --- content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc @@ -2881,6 +2881,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { @@ -50,7 +50,7 @@ index 3170d101acf0b..8a15712e741b8 100644 void WebContentsImpl::DidCallFocus() { diff --git content/public/browser/web_contents.cc content/public/browser/web_contents.cc -index f1dcf53ea481b..192f7c0ddd04f 100644 +index f1dcf53ea481..192f7c0ddd04 100644 --- content/public/browser/web_contents.cc +++ content/public/browser/web_contents.cc @@ -29,6 +29,7 @@ WebContents::CreateParams::CreateParams(BrowserContext* context, @@ -62,7 +62,7 @@ index f1dcf53ea481b..192f7c0ddd04f 100644 WebContents::CreateParams::CreateParams(const CreateParams& other) = default; diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h -index 0ccd96cb9b840..26ba3f571e343 100644 +index 0ccd96cb9b84..26ba3f571e34 100644 --- content/public/browser/web_contents.h +++ content/public/browser/web_contents.h @@ -85,10 +85,12 @@ class BrowserContext; @@ -90,7 +90,7 @@ index 0ccd96cb9b840..26ba3f571e343 100644 // the value that'll be returned by GetLastActiveTime(). If this is left // default initialized then the value is not passed on to the WebContents diff --git content/public/browser/web_contents_delegate.h content/public/browser/web_contents_delegate.h -index a0da74d5cbe4a..1d6e4673a610f 100644 +index a0da74d5cbe4..1d6e4673a610 100644 --- content/public/browser/web_contents_delegate.h +++ content/public/browser/web_contents_delegate.h @@ -59,10 +59,12 @@ class EyeDropperListener; @@ -122,7 +122,7 @@ index a0da74d5cbe4a..1d6e4673a610f 100644 // typically happens when popups are created. virtual void WebContentsCreated(WebContents* source_contents, diff --git content/public/browser/web_contents_observer.h content/public/browser/web_contents_observer.h -index 264f4fa3ded25..d2e6e02f51727 100644 +index 264f4fa3ded2..d2e6e02f5172 100644 --- content/public/browser/web_contents_observer.h +++ content/public/browser/web_contents_observer.h @@ -705,6 +705,10 @@ class CONTENT_EXPORT WebContentsObserver { diff --git a/patch/patches/web_url_loader_cancel_1617042.patch b/patch/patches/web_url_loader_cancel_1617042.patch index d9481390a..a7c8bc746 100644 --- a/patch/patches/web_url_loader_cancel_1617042.patch +++ b/patch/patches/web_url_loader_cancel_1617042.patch @@ -1,5 +1,5 @@ diff --git third_party/blink/public/platform/web_url_loader.h third_party/blink/public/platform/web_url_loader.h -index 3894775930095..aef157bc50b79 100644 +index 389477593009..aef157bc50b7 100644 --- third_party/blink/public/platform/web_url_loader.h +++ third_party/blink/public/platform/web_url_loader.h @@ -152,12 +152,14 @@ class BLINK_PLATFORM_EXPORT WebURLLoader { diff --git a/patch/patches/webkit_plugin_info_2015.patch b/patch/patches/webkit_plugin_info_2015.patch index d11da9e25..872b70818 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 1fc4708c4ac12..db42867e8b130 100644 +index 1fc4708c4ac1..db42867e8b13 100644 --- third_party/blink/public/platform/platform.h +++ third_party/blink/public/platform/platform.h @@ -876,6 +876,11 @@ class BLINK_PLATFORM_EXPORT Platform { @@ -26,7 +26,7 @@ index 1fc4708c4ac12..db42867e8b130 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 a9c4d4efe4d66..c0c62cbbe60de 100644 +index a9c4d4efe4d6..c0c62cbbe60d 100644 --- third_party/blink/renderer/core/frame/local_frame.cc +++ third_party/blink/renderer/core/frame/local_frame.cc @@ -1853,7 +1853,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() { @@ -57,7 +57,7 @@ index a9c4d4efe4d66..c0c62cbbe60de 100644 } diff --git third_party/blink/renderer/core/inspector/devtools_session.cc third_party/blink/renderer/core/inspector/devtools_session.cc -index b28a69f901a56..7a04bd07b6b16 100644 +index b28a69f901a5..7a04bd07b6b1 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 b28a69f901a56..7a04bd07b6b16 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 c5f0d9c55c56b..83949238bd4dd 100644 +index c5f0d9c55c56..83949238bd4d 100644 --- third_party/blink/renderer/core/page/plugin_data.cc +++ third_party/blink/renderer/core/page/plugin_data.cc @@ -96,10 +96,12 @@ void PluginData::RefreshBrowserSidePluginCache() { @@ -212,7 +212,7 @@ index c5f0d9c55c56b..83949238bd4dd 100644 auto* plugin_info = MakeGarbageCollected( std::move(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 0d5439e9238aa..89478997bd808 100644 +index 0d5439e9238a..89478997bd80 100644 --- third_party/blink/renderer/core/page/plugin_data.h +++ third_party/blink/renderer/core/page/plugin_data.h @@ -101,7 +101,8 @@ class CORE_EXPORT PluginData final : public GarbageCollected { diff --git a/patch/patches/webkit_popups.patch b/patch/patches/webkit_popups.patch index aebc1601e..b00ff9f97 100644 --- a/patch/patches/webkit_popups.patch +++ b/patch/patches/webkit_popups.patch @@ -1,5 +1,5 @@ diff --git third_party/blink/public/web/web_view.h third_party/blink/public/web/web_view.h -index f54b993e9fb9f..ec081f68adddb 100644 +index f54b993e9fb9..ec081f68addd 100644 --- third_party/blink/public/web/web_view.h +++ third_party/blink/public/web/web_view.h @@ -338,6 +338,7 @@ class WebView { @@ -11,7 +11,7 @@ index f54b993e9fb9f..ec081f68adddb 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 7995eb16a7cf6..1c007cbf08f32 100644 +index 7995eb16a7cf..1c007cbf08f3 100644 --- third_party/blink/renderer/core/exported/web_view_impl.cc +++ third_party/blink/renderer/core/exported/web_view_impl.cc @@ -244,8 +244,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) { @@ -39,7 +39,7 @@ index 7995eb16a7cf6..1c007cbf08f32 100644 fullscreen_controller_(std::make_unique(this)), page_base_background_color_( diff --git third_party/blink/renderer/core/exported/web_view_impl.h third_party/blink/renderer/core/exported/web_view_impl.h -index e7b0409bd60df..445b9eee5fd71 100644 +index e7b0409bd60d..445b9eee5fd7 100644 --- third_party/blink/renderer/core/exported/web_view_impl.h +++ third_party/blink/renderer/core/exported/web_view_impl.h @@ -131,7 +131,8 @@ class CORE_EXPORT WebViewImpl final : public WebView, @@ -62,7 +62,7 @@ index e7b0409bd60df..445b9eee5fd71 100644 TransformationMatrix device_emulation_transform_; diff --git third_party/blink/renderer/core/page/chrome_client_impl.cc third_party/blink/renderer/core/page/chrome_client_impl.cc -index fdeb0ffd7c5f5..cc03daf4f705a 100644 +index fdeb0ffd7c5f..cc03daf4f705 100644 --- third_party/blink/renderer/core/page/chrome_client_impl.cc +++ third_party/blink/renderer/core/page/chrome_client_impl.cc @@ -842,7 +842,7 @@ bool ChromeClientImpl::HasOpenedPopup() const { diff --git a/patch/patches/webkit_runtime_enabled_features.patch b/patch/patches/webkit_runtime_enabled_features.patch index 690cba7b8..4a38589bb 100644 --- a/patch/patches/webkit_runtime_enabled_features.patch +++ b/patch/patches/webkit_runtime_enabled_features.patch @@ -1,5 +1,5 @@ diff --git third_party/blink/renderer/build/scripts/templates/runtime_enabled_features.h.tmpl third_party/blink/renderer/build/scripts/templates/runtime_enabled_features.h.tmpl -index 0325bd26a5058..8fec0a124a55c 100644 +index 0325bd26a505..8fec0a124a55 100644 --- third_party/blink/renderer/build/scripts/templates/runtime_enabled_features.h.tmpl +++ third_party/blink/renderer/build/scripts/templates/runtime_enabled_features.h.tmpl @@ -12,6 +12,8 @@ diff --git a/patch/patches/webui_2037.patch b/patch/patches/webui_2037.patch index 7d64a7b46..9088c7e42 100644 --- a/patch/patches/webui_2037.patch +++ b/patch/patches/webui_2037.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc -index 462eb546fbd94..f75ea77326f33 100644 +index 462eb546fbd9..f75ea77326f3 100644 --- chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc +++ chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc @@ -10,6 +10,7 @@ @@ -62,7 +62,7 @@ index 462eb546fbd94..f75ea77326f33 100644 bool result = base::win::IsKeyboardPresentOnSlate(ui::GetHiddenWindow(), &reason); diff --git chrome/browser/memory_details.cc chrome/browser/memory_details.cc -index 77538809e177d..256ab01bf7704 100644 +index 77538809e177..256ab01bf770 100644 --- chrome/browser/memory_details.cc +++ chrome/browser/memory_details.cc @@ -17,6 +17,7 @@ diff --git a/patch/patches/webview_plugin_2020.patch b/patch/patches/webview_plugin_2020.patch index a0b556acb..b50c2188f 100644 --- a/patch/patches/webview_plugin_2020.patch +++ b/patch/patches/webview_plugin_2020.patch @@ -1,5 +1,5 @@ diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd -index 37364a4d11644..d9657aa938ec4 100644 +index 9a68af9b6d5b..442c69b30589 100644 --- chrome/app/generated_resources.grd +++ chrome/app/generated_resources.grd @@ -5306,7 +5306,7 @@ Keep your key file in a safe place. You will need it to create new versions of y diff --git a/patch/patches/win_cpp17_msvc_sandbox_2819.patch b/patch/patches/win_cpp17_msvc_sandbox_2819.patch index 1cb641eba..5b541d8de 100644 --- a/patch/patches/win_cpp17_msvc_sandbox_2819.patch +++ b/patch/patches/win_cpp17_msvc_sandbox_2819.patch @@ -1,5 +1,5 @@ diff --git base/third_party/double_conversion/BUILD.gn base/third_party/double_conversion/BUILD.gn -index 0083efdcd9c85..6f647c31e28aa 100644 +index 0083efdcd9c8..6f647c31e28a 100644 --- base/third_party/double_conversion/BUILD.gn +++ base/third_party/double_conversion/BUILD.gn @@ -9,6 +9,11 @@ config("config") { @@ -15,7 +15,7 @@ index 0083efdcd9c85..6f647c31e28aa 100644 static_library("double_conversion") { diff --git base/win/BUILD.gn base/win/BUILD.gn -index eb5dca74bcea3..be10cc59b39c7 100644 +index eb5dca74bcea..be10cc59b39c 100644 --- base/win/BUILD.gn +++ base/win/BUILD.gn @@ -33,4 +33,7 @@ static_library("pe_image") {