From b672bd9235c4dba2bd9c78faecf14383888efac3 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Fri, 17 Jul 2020 19:31:28 -0400 Subject: [PATCH] Update to Chromium version 85.0.4183.26 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 3 ++- patch/patches/chrome_browser.patch | 6 +++--- patch/patches/chrome_browser_net_export.patch | 8 ++++---- patch/patches/chrome_browser_profiles.patch | 4 ++-- patch/patches/content_2015.patch | 2 +- patch/patches/print_preview_123.patch | 4 ++-- patch/patches/views_1749_2102.patch | 6 +++--- patch/patches/viz_osr_2575.patch | 2 +- patch/patches/webkit_plugin_info_2015.patch | 4 ++-- patch/patches/webui_2037.patch | 8 ++++---- 10 files changed, 24 insertions(+), 23 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index f4da2f260..d10982ae6 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,5 +7,6 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': 'refs/tags/85.0.4183.0' + 'chromium_checkout': 'refs/tags/85.0.4183.26', + 'depot_tools_checkout': '233589f2e7' } diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index a3a2bb023..6d388dad9 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 9fe789540c05..a2646c13e5d5 100644 +index 3a18c70b25a7..a61f10db6379 100644 --- chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn @@ -12,6 +12,7 @@ import("//build/config/crypto.gni") @@ -10,7 +10,7 @@ index 9fe789540c05..a2646c13e5d5 100644 import("//chrome/browser/buildflags.gni") import("//chrome/browser/downgrade/buildflags.gni") import("//chrome/common/features.gni") -@@ -1824,6 +1825,7 @@ static_library("browser") { +@@ -1834,6 +1835,7 @@ static_library("browser") { "//base/util/values:values_util", "//build:branding_buildflags", "//cc", @@ -18,7 +18,7 @@ index 9fe789540c05..a2646c13e5d5 100644 "//chrome:extra_resources", "//chrome:resources", "//chrome:strings", -@@ -2156,6 +2158,10 @@ static_library("browser") { +@@ -2166,6 +2168,10 @@ static_library("browser") { ] } diff --git a/patch/patches/chrome_browser_net_export.patch b/patch/patches/chrome_browser_net_export.patch index f28e196f5..8cbdbfb6a 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 7f8d13d8c4c2..ab5688900991 100644 +index ccee1e9634b9..76d46431a200 100644 --- chrome/browser/ui/BUILD.gn +++ chrome/browser/ui/BUILD.gn @@ -9,6 +9,7 @@ import("//build/config/crypto.gni") @@ -10,7 +10,7 @@ index 7f8d13d8c4c2..ab5688900991 100644 import("//chrome/browser/buildflags.gni") import("//chrome/common/features.gni") import("//chromeos/assistant/assistant.gni") -@@ -335,6 +336,10 @@ static_library("ui") { +@@ -337,6 +338,10 @@ static_library("ui") { "//build/config/compiler:wexit_time_destructors", ] @@ -21,7 +21,7 @@ index 7f8d13d8c4c2..ab5688900991 100644 # Since browser and browser_ui actually depend on each other, # we must omit the dependency from browser_ui to browser. # However, this means browser_ui and browser should more or less -@@ -356,6 +361,7 @@ static_library("ui") { +@@ -358,6 +363,7 @@ static_library("ui") { "//base/allocator:buildflags", "//build:branding_buildflags", "//cc/paint", @@ -29,7 +29,7 @@ index 7f8d13d8c4c2..ab5688900991 100644 "//chrome:extra_resources", "//chrome:resources", "//chrome:strings", -@@ -1473,6 +1479,7 @@ static_library("ui") { +@@ -1476,6 +1482,7 @@ static_library("ui") { "//components/keep_alive_registry", "//components/network_session_configurator/common", "//components/page_load_metrics/browser", diff --git a/patch/patches/chrome_browser_profiles.patch b/patch/patches/chrome_browser_profiles.patch index e513b12d4..87ff9a74f 100644 --- a/patch/patches/chrome_browser_profiles.patch +++ b/patch/patches/chrome_browser_profiles.patch @@ -1,8 +1,8 @@ diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc -index f81028b5cda7..9b934d020ce6 100644 +index b6d1198fbf0f..2ef9e7835b3d 100644 --- chrome/browser/profiles/profile_manager.cc +++ chrome/browser/profiles/profile_manager.cc -@@ -377,7 +377,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir) +@@ -379,7 +379,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir) registrar_.Add(this, chrome::NOTIFICATION_BROWSER_CLOSE_CANCELLED, content::NotificationService::AllSources()); diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index 24cb5a47c..4b438d5cb 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 b5bb5e01d7db..f2e23f9fffef 100644 +index cdeecb35a998..1615185f2a65 100644 --- chrome/browser/download/download_target_determiner.cc +++ chrome/browser/download/download_target_determiner.cc @@ -660,7 +660,7 @@ void IsHandledBySafePlugin(int render_process_id, diff --git a/patch/patches/print_preview_123.patch b/patch/patches/print_preview_123.patch index 8dfa61ad4..88cfe9984 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 b4c6ef8fec23..1e2586810d7c 100644 +index 19f5cb8025bb..a53efc315de8 100644 --- chrome/browser/download/download_prefs.cc +++ chrome/browser/download/download_prefs.cc @@ -23,6 +23,7 @@ @@ -21,7 +21,7 @@ index b4c6ef8fec23..1e2586810d7c 100644 using content::BrowserContext; using content::BrowserThread; using content::DownloadManager; -@@ -349,6 +354,11 @@ DownloadPrefs* DownloadPrefs::FromDownloadManager( +@@ -352,6 +357,11 @@ DownloadPrefs* DownloadPrefs::FromDownloadManager( // static DownloadPrefs* DownloadPrefs::FromBrowserContext( content::BrowserContext* context) { diff --git a/patch/patches/views_1749_2102.patch b/patch/patches/views_1749_2102.patch index 80a69f30d..810d23360 100644 --- a/patch/patches/views_1749_2102.patch +++ b/patch/patches/views_1749_2102.patch @@ -234,10 +234,10 @@ index 5a45ef3cbf00..597d5f1e8767 100644 std::unique_ptr selection_controller_; diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc -index a039303e8b9a..60d429d88aa5 100644 +index 7d60e21f3a44..998f5e114253 100644 --- ui/views/controls/menu/menu_controller.cc +++ ui/views/controls/menu/menu_controller.cc -@@ -2652,8 +2652,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem( +@@ -2657,8 +2657,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem( void MenuController::OpenSubmenuChangeSelectionIfCan() { MenuItemView* item = pending_state_.item; @@ -252,7 +252,7 @@ index a039303e8b9a..60d429d88aa5 100644 MenuItemView* to_select = nullptr; if (!item->GetSubmenu()->GetMenuItems().empty()) to_select = FindInitialSelectableMenuItem(item, INCREMENT_SELECTION_DOWN); -@@ -2672,8 +2677,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() { +@@ -2677,8 +2682,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() { void MenuController::CloseSubmenu() { MenuItemView* item = state_.item; DCHECK(item); diff --git a/patch/patches/viz_osr_2575.patch b/patch/patches/viz_osr_2575.patch index 86b85003b..6322a9276 100644 --- a/patch/patches/viz_osr_2575.patch +++ b/patch/patches/viz_osr_2575.patch @@ -80,7 +80,7 @@ index 1026b739d283..fe562ab60ce9 100644 private: const HWND hwnd_; diff --git components/viz/service/BUILD.gn components/viz/service/BUILD.gn -index 7b6f69e3dcce..b04d7984d855 100644 +index 097977040913..34412823b09b 100644 --- components/viz/service/BUILD.gn +++ components/viz/service/BUILD.gn @@ -13,7 +13,10 @@ config("viz_service_implementation") { diff --git a/patch/patches/webkit_plugin_info_2015.patch b/patch/patches/webkit_plugin_info_2015.patch index 841ca02bc..7cdbb90aa 100644 --- a/patch/patches/webkit_plugin_info_2015.patch +++ b/patch/patches/webkit_plugin_info_2015.patch @@ -44,10 +44,10 @@ index bab98605009b..92709eee4924 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 81585d785de9..726ee5466d21 100644 +index 0c862d2c081d..0ee94c96018b 100644 --- third_party/blink/renderer/core/frame/local_frame.cc +++ third_party/blink/renderer/core/frame/local_frame.cc -@@ -1483,7 +1483,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() { +@@ -1484,7 +1484,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() { PluginData* LocalFrame::GetPluginData() const { if (!Loader().AllowPlugins(kNotAboutToInstantiatePlugin)) return nullptr; diff --git a/patch/patches/webui_2037.patch b/patch/patches/webui_2037.patch index 73c779f19..2c965cce5 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 29953fdc7c55..89dd4e61f66f 100644 +index 0a144a99349f..1c277b590814 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 @@ -21,6 +21,7 @@ @@ -18,7 +18,7 @@ index 29953fdc7c55..89dd4e61f66f 100644 #include "components/prefs/pref_service.h" #include "components/sync/driver/about_sync_util.h" #include "components/sync/driver/sync_service.h" -@@ -274,7 +276,11 @@ void ChromeInternalLogSource::Fetch(SysLogsSourceCallback callback) { +@@ -277,7 +279,11 @@ void ChromeInternalLogSource::Fetch(SysLogsSourceCallback callback) { response->emplace(kOsVersionTag, os_version); #endif @@ -30,7 +30,7 @@ index 29953fdc7c55..89dd4e61f66f 100644 PopulateExtensionInfoLogs(response.get()); PopulatePowerApiLogs(response.get()); PopulateDataReductionProxyLogs(response.get()); -@@ -364,6 +370,12 @@ void ChromeInternalLogSource::PopulateExtensionInfoLogs( +@@ -368,6 +374,12 @@ void ChromeInternalLogSource::PopulateExtensionInfoLogs( if (!profile) return; @@ -43,7 +43,7 @@ index 29953fdc7c55..89dd4e61f66f 100644 extensions::ExtensionRegistry* extension_registry = extensions::ExtensionRegistry::Get(profile); std::string extensions_list; -@@ -453,6 +465,8 @@ void ChromeInternalLogSource::PopulateArcPolicyStatus( +@@ -474,6 +486,8 @@ void ChromeInternalLogSource::PopulateOnboardingTime( #if defined(OS_WIN) void ChromeInternalLogSource::PopulateUsbKeyboardDetected( SystemLogsResponse* response) {