From 584e11cf2bb7eb1b184f49877d3d92ad099fbd1f Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Wed, 2 Oct 2019 17:07:12 +0300 Subject: [PATCH] Update to Chromium version 78.0.3904.34 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +- libcef/browser/prefs/browser_prefs.cc | 1 + patch/patch.cfg | 3 --- patch/patches/base_sandbox_2743.patch | 4 ++-- patch/patches/build.patch | 4 ++-- patch/patches/chrome_browser.patch | 2 +- patch/patches/chrome_browser_net_export.patch | 2 +- .../chrome_browser_product_override.patch | 2 +- patch/patches/chrome_widevine.patch | 13 ++----------- patch/patches/content_2015.patch | 4 ++-- patch/patches/gn_config.patch | 4 ++-- patch/patches/linux_gtk_2014.patch | 6 +++--- patch/patches/prefs_content_1161.patch | 10 +++++----- patch/patches/print_preview_123.patch | 2 +- patch/patches/services_network_2622.patch | 18 +++++++++--------- .../views_widget_180_1481_1565_1677_1749.patch | 2 +- patch/patches/webkit_plugin_info_2015.patch | 2 +- patch/patches/webkit_popups.patch | 2 +- patch/patches/webview_plugin_2020.patch | 2 +- 19 files changed, 37 insertions(+), 48 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 101567440..61a669689 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,5 +7,5 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': 'refs/tags/78.0.3904.0' + 'chromium_checkout': 'refs/tags/78.0.3904.34' } diff --git a/libcef/browser/prefs/browser_prefs.cc b/libcef/browser/prefs/browser_prefs.cc index 0fd506a46..3f17159bb 100644 --- a/libcef/browser/prefs/browser_prefs.cc +++ b/libcef/browser/prefs/browser_prefs.cc @@ -179,6 +179,7 @@ std::unique_ptr CreatePrefService(Profile* profile, flags_ui::PrefServiceFlagsStorage::RegisterPrefs(registry.get()); PluginInfoHostImpl::RegisterUserPrefs(registry.get()); PrefProxyConfigTrackerImpl::RegisterPrefs(registry.get()); + ProfileNetworkContextService::RegisterLocalStatePrefs(registry.get()); SSLConfigServiceManager::RegisterPrefs(registry.get()); update_client::RegisterPrefs(registry.get()); diff --git a/patch/patch.cfg b/patch/patch.cfg index ee9101901..b3b5ae88e 100644 --- a/patch/patch.cfg +++ b/patch/patch.cfg @@ -184,9 +184,6 @@ patches = [ }, { # Fix chrome Widevine build on Linux. - # - # Remove incorrect assertion on Windows/macOS by cherry-picking this commit: - # https://chromium.googlesource.com/chromium/src/+/ec992a43e7 'name': 'chrome_widevine', }, { diff --git a/patch/patches/base_sandbox_2743.patch b/patch/patches/base_sandbox_2743.patch index 32e0062ab..3af23ba79 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 2a50cd207695..b0e64eef29a5 100644 +index c093596dba09..5642c52d9f6b 100644 --- base/BUILD.gn +++ base/BUILD.gn @@ -32,6 +32,7 @@ import("//build/config/sysroot.gni") @@ -10,7 +10,7 @@ index 2a50cd207695..b0e64eef29a5 100644 import("//testing/libfuzzer/fuzzer_test.gni") import("//testing/test.gni") -@@ -1604,7 +1605,11 @@ jumbo_component("base") { +@@ -1602,7 +1603,11 @@ jumbo_component("base") { "hash/md5_constexpr_internal.h", "hash/sha1.h", ] diff --git a/patch/patches/build.patch b/patch/patches/build.patch index fb3d1616a..54089bdca 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 d1a9bfa30cb2..3c74d4acdda2 100644 +index 352cb646dd51..44bc70c9d876 100644 --- build/config/compiler/BUILD.gn +++ build/config/compiler/BUILD.gn @@ -152,7 +152,7 @@ declare_args() { @@ -11,7 +11,7 @@ index d1a9bfa30cb2..3c74d4acdda2 100644 !(current_cpu == "x86" || current_cpu == "x64")))) } -@@ -1728,8 +1728,6 @@ config("thin_archive") { +@@ -1724,8 +1724,6 @@ config("thin_archive") { # archive names to 16 characters, which is not what we want). if ((is_posix && !is_nacl && !is_mac && !is_ios) || is_fuchsia) { arflags = [ "-T" ] diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index 6b6e78916..e75b21a30 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 0bc6da647d95..aa57c4d046d5 100644 +index 38c89002e6bb..4666d214063f 100644 --- chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn @@ -10,6 +10,7 @@ import("//build/config/jumbo.gni") diff --git a/patch/patches/chrome_browser_net_export.patch b/patch/patches/chrome_browser_net_export.patch index c21107935..cfcf99ff3 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 3b387d754736..2c537f9c15c1 100644 +index 1826b714b2ee..e27010f5826d 100644 --- chrome/browser/ui/BUILD.gn +++ chrome/browser/ui/BUILD.gn @@ -10,6 +10,7 @@ import("//build/config/jumbo.gni") diff --git a/patch/patches/chrome_browser_product_override.patch b/patch/patches/chrome_browser_product_override.patch index 8119f22b4..a17c99324 100644 --- a/patch/patches/chrome_browser_product_override.patch +++ b/patch/patches/chrome_browser_product_override.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc -index b1d5ac049933..cfb78bb97597 100644 +index 65decf0c243a..65fa0fca385c 100644 --- chrome/browser/chrome_content_browser_client.cc +++ chrome/browser/chrome_content_browser_client.cc @@ -1013,10 +1013,6 @@ void LaunchURL(const GURL& url, diff --git a/patch/patches/chrome_widevine.patch b/patch/patches/chrome_widevine.patch index 9ecf30b0d..3cee291f6 100644 --- a/patch/patches/chrome_widevine.patch +++ b/patch/patches/chrome_widevine.patch @@ -1,5 +1,5 @@ diff --git chrome/common/chrome_content_client.cc chrome/common/chrome_content_client.cc -index fb0059b3e652..452f58ab4a0a 100644 +index 82d08c6114a1..bcecd13a417d 100644 --- chrome/common/chrome_content_client.cc +++ chrome/common/chrome_content_client.cc @@ -93,7 +93,8 @@ @@ -13,7 +13,7 @@ index fb0059b3e652..452f58ab4a0a 100644 #include "third_party/widevine/cdm/widevine_cdm_common.h" // nogncheck // TODO(crbug.com/663554): Needed for WIDEVINE_CDM_VERSION_STRING. Support diff --git third_party/widevine/cdm/BUILD.gn third_party/widevine/cdm/BUILD.gn -index 18177ec2e536..dca927a726b9 100644 +index ed0e2f5208b0..dca927a726b9 100644 --- third_party/widevine/cdm/BUILD.gn +++ third_party/widevine/cdm/BUILD.gn @@ -5,6 +5,7 @@ @@ -24,12 +24,3 @@ index 18177ec2e536..dca927a726b9 100644 import("//media/cdm/library_cdm/cdm_paths.gni") import("//media/media_options.gni") import("//third_party/widevine/cdm/widevine.gni") -@@ -106,8 +107,6 @@ if (widevine_cdm_manifest_and_license_files != []) { - ] - } - } else { -- assert(!enable_widevine_cdm_component, -- "Widevine as a component requires a manifest.") - group("widevine_cdm_manifest_and_license") { - # NOP - } diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index ef48841b7..2e5d3950f 100644 --- a/patch/patches/content_2015.patch +++ b/patch/patches/content_2015.patch @@ -229,10 +229,10 @@ index 632ae86c6fd6..55b749ec1242 100644 const std::vector& all_plugins); diff --git content/common/frame_messages.h content/common/frame_messages.h -index 318e199de304..2baed51cc931 100644 +index c67d0cc01562..bf318a8dd294 100644 --- content/common/frame_messages.h +++ content/common/frame_messages.h -@@ -1146,9 +1146,10 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback, +@@ -1147,9 +1147,10 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback, // type. If there is no matching plugin, |found| is false. // |actual_mime_type| is the actual mime type supported by the // found plugin. diff --git a/patch/patches/gn_config.patch b/patch/patches/gn_config.patch index 45eda4fce..1e141f1f5 100644 --- a/patch/patches/gn_config.patch +++ b/patch/patches/gn_config.patch @@ -56,10 +56,10 @@ index 982fbe8d3f0d..e757be4688f1 100644 + "studio path") } diff --git build/toolchain/win/setup_toolchain.py build/toolchain/win/setup_toolchain.py -index ef8aeda56458..5b7f057311b9 100644 +index 9ee69df7d210..00ad4b3be81a 100644 --- build/toolchain/win/setup_toolchain.py +++ build/toolchain/win/setup_toolchain.py -@@ -136,22 +136,25 @@ def _LoadToolchainEnv(cpu, sdk_dir, target_store): +@@ -142,22 +142,25 @@ def _LoadToolchainEnv(cpu, sdk_dir, target_store): # variable. if 'VSINSTALLDIR' in os.environ: del os.environ['VSINSTALLDIR'] diff --git a/patch/patches/linux_gtk_2014.patch b/patch/patches/linux_gtk_2014.patch index 44171a82c..f100507c8 100644 --- a/patch/patches/linux_gtk_2014.patch +++ b/patch/patches/linux_gtk_2014.patch @@ -39,10 +39,10 @@ index 07f06ac694f5..831fd9f82dbe 100644 void ChromeBrowserMainExtraPartsViewsLinux::ToolkitInitialized() { diff --git chrome/test/BUILD.gn chrome/test/BUILD.gn -index 9e12dd26146d..4748af4b1cc8 100644 +index a08aa22bb990..34839174b64d 100644 --- chrome/test/BUILD.gn +++ chrome/test/BUILD.gn -@@ -4545,7 +4545,7 @@ test("unit_tests") { +@@ -4549,7 +4549,7 @@ test("unit_tests") { if (use_gio) { configs += [ "//build/linux:gio_config" ] } @@ -51,7 +51,7 @@ index 9e12dd26146d..4748af4b1cc8 100644 deps += [ "//chrome/browser/ui/libgtkui" ] } -@@ -5599,7 +5599,7 @@ if (!is_android) { +@@ -5603,7 +5603,7 @@ if (!is_android) { # suites, it seems like one or another starts timing out too. "../browser/ui/views/keyboard_access_browsertest.cc", ] diff --git a/patch/patches/prefs_content_1161.patch b/patch/patches/prefs_content_1161.patch index 05a97a0f7..0a98c55c6 100644 --- a/patch/patches/prefs_content_1161.patch +++ b/patch/patches/prefs_content_1161.patch @@ -1,5 +1,5 @@ diff --git content/public/common/common_param_traits_macros.h content/public/common/common_param_traits_macros.h -index dd1363a6b295..b69c7895c0e3 100644 +index 30e6e9de1c8d..527c77fa51fe 100644 --- content/public/common/common_param_traits_macros.h +++ content/public/common/common_param_traits_macros.h @@ -189,6 +189,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences) @@ -11,7 +11,7 @@ index dd1363a6b295..b69c7895c0e3 100644 IPC_STRUCT_TRAITS_MEMBER(navigate_on_drag_drop) IPC_STRUCT_TRAITS_MEMBER(spatial_navigation_enabled) diff --git content/public/common/web_preferences.cc content/public/common/web_preferences.cc -index 114b0f7d04cd..adce9ab8c3b5 100644 +index 8c04e3b6d53d..8ba0b3f94ca9 100644 --- content/public/common/web_preferences.cc +++ content/public/common/web_preferences.cc @@ -167,6 +167,7 @@ WebPreferences::WebPreferences() @@ -23,7 +23,7 @@ index 114b0f7d04cd..adce9ab8c3b5 100644 record_whole_document(false), cookie_enabled(true), diff --git content/public/common/web_preferences.h content/public/common/web_preferences.h -index e47b250f52bd..dfa18577d402 100644 +index 7079cc86dca6..6176e50261ea 100644 --- content/public/common/web_preferences.h +++ content/public/common/web_preferences.h @@ -184,6 +184,7 @@ struct CONTENT_EXPORT WebPreferences { @@ -35,10 +35,10 @@ index e47b250f52bd..dfa18577d402 100644 bool record_whole_document; diff --git content/renderer/render_view_impl.cc content/renderer/render_view_impl.cc -index f780c653d6e5..4b07220bac8c 100644 +index 23d8e4994252..b1a7ecf56e19 100644 --- content/renderer/render_view_impl.cc +++ content/renderer/render_view_impl.cc -@@ -998,6 +998,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs, +@@ -1000,6 +1000,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs, #endif WebRuntimeFeatures::EnableTranslateService(prefs.translate_service_available); diff --git a/patch/patches/print_preview_123.patch b/patch/patches/print_preview_123.patch index 6363bef35..df7575432 100644 --- a/patch/patches/print_preview_123.patch +++ b/patch/patches/print_preview_123.patch @@ -262,7 +262,7 @@ index 06f5799efbb9..6119691b2700 100644 Profile* const profile_; StickySettings* const sticky_settings_; diff --git chrome/browser/ui/webui/print_preview/print_preview_handler.cc chrome/browser/ui/webui/print_preview/print_preview_handler.cc -index 0a6c4d4de3aa..a22377a02343 100644 +index 977fa0091ffb..84644e143866 100644 --- chrome/browser/ui/webui/print_preview/print_preview_handler.cc +++ chrome/browser/ui/webui/print_preview/print_preview_handler.cc @@ -26,6 +26,7 @@ diff --git a/patch/patches/services_network_2622.patch b/patch/patches/services_network_2622.patch index 92cd1e6bb..f6da8a006 100644 --- a/patch/patches/services_network_2622.patch +++ b/patch/patches/services_network_2622.patch @@ -1,16 +1,16 @@ diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc -index 35302d90a73f..73424c925e13 100644 +index a7c5ee5f7542..f79ba8454f95 100644 --- chrome/browser/net/profile_network_context_service.cc +++ chrome/browser/net/profile_network_context_service.cc -@@ -14,6 +14,7 @@ - #include "base/logging.h" +@@ -16,6 +16,7 @@ #include "base/metrics/histogram_macros.h" + #include "base/strings/string_split.h" #include "base/task/post_task.h" +#include "cef/libcef/features/features.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/content_settings/cookie_settings_factory.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" -@@ -463,9 +464,22 @@ ProfileNetworkContextService::CreateNetworkContextParams( +@@ -479,9 +480,22 @@ ProfileNetworkContextService::CreateNetworkContextParams( network_context_params->cookie_manager_params = CreateCookieManagerParams(profile_, *cookie_settings_); @@ -33,7 +33,7 @@ index 35302d90a73f..73424c925e13 100644 PrefService* local_state = g_browser_process->local_state(); // Configure the HTTP cache path and size. base::FilePath base_cache_path; -@@ -478,6 +492,7 @@ ProfileNetworkContextService::CreateNetworkContextParams( +@@ -494,6 +508,7 @@ ProfileNetworkContextService::CreateNetworkContextParams( base_cache_path.Append(chrome::kCacheDirname); network_context_params->http_cache_max_size = local_state->GetInteger(prefs::kDiskCacheSize); @@ -139,10 +139,10 @@ index c0f105aec142..6afd5f9e25fc 100644 void CookieManager::SetForceKeepSessionState() { diff --git services/network/network_context.cc services/network/network_context.cc -index 8e848688225a..cbbf5de461d6 100644 +index 74cb411eb848..0a5b4ed5e91c 100644 --- services/network/network_context.cc +++ services/network/network_context.cc -@@ -1762,6 +1762,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext() { +@@ -1765,6 +1765,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext() { } scoped_refptr session_cleanup_cookie_store; @@ -150,7 +150,7 @@ index 8e848688225a..cbbf5de461d6 100644 if (params_->cookie_path) { scoped_refptr client_task_runner = base::ThreadTaskRunnerHandle::Get(); -@@ -1789,18 +1790,27 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext() { +@@ -1792,18 +1793,27 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext() { session_cleanup_cookie_store = base::MakeRefCounted(sqlite_store); @@ -182,7 +182,7 @@ index 8e848688225a..cbbf5de461d6 100644 std::make_unique( params_->accept_language, params_->user_agent); diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom -index 873bce449b63..3189e268d950 100644 +index 05418052345a..39877a966de9 100644 --- services/network/public/mojom/network_context.mojom +++ services/network/public/mojom/network_context.mojom @@ -210,6 +210,9 @@ struct NetworkContextParams { diff --git a/patch/patches/views_widget_180_1481_1565_1677_1749.patch b/patch/patches/views_widget_180_1481_1565_1677_1749.patch index 85a483e47..12bf0728c 100644 --- a/patch/patches/views_widget_180_1481_1565_1677_1749.patch +++ b/patch/patches/views_widget_180_1481_1565_1677_1749.patch @@ -197,7 +197,7 @@ index da401532ffbe..e878204e71db 100644 } // namespace views 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 0eedc2665313..1bbc2abc7514 100644 +index dc6acb1c1600..be0ad74e3fa6 100644 --- ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc +++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc @@ -128,8 +128,12 @@ void DesktopWindowTreeHostWin::Init(const Widget::InitParams& params) { diff --git a/patch/patches/webkit_plugin_info_2015.patch b/patch/patches/webkit_plugin_info_2015.patch index 08bd6d333..a426c4bde 100644 --- a/patch/patches/webkit_plugin_info_2015.patch +++ b/patch/patches/webkit_plugin_info_2015.patch @@ -44,7 +44,7 @@ index 80a9ec9bc75b..13cbb056cdfa 100644 .Top() .GetSecurityContext() diff --git third_party/blink/renderer/core/frame/local_frame.cc third_party/blink/renderer/core/frame/local_frame.cc -index 52f56794f2ed..9bbef168e262 100644 +index 6e2fc4a7dd2f..eba455341d32 100644 --- third_party/blink/renderer/core/frame/local_frame.cc +++ third_party/blink/renderer/core/frame/local_frame.cc @@ -1236,7 +1236,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() { diff --git a/patch/patches/webkit_popups.patch b/patch/patches/webkit_popups.patch index b3dc8efe6..b70d590bf 100644 --- a/patch/patches/webkit_popups.patch +++ b/patch/patches/webkit_popups.patch @@ -11,7 +11,7 @@ index db7d7c87686a..a7c6beb6a6f1 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 58e4fbcf6ee2..51f2645e6154 100644 +index b286951e399b..b8997bcbf861 100644 --- third_party/blink/renderer/core/exported/web_view_impl.cc +++ third_party/blink/renderer/core/exported/web_view_impl.cc @@ -219,8 +219,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) { diff --git a/patch/patches/webview_plugin_2020.patch b/patch/patches/webview_plugin_2020.patch index 5a9940a13..2ed53457e 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 7ba7a4d37f83..b2ca5edc150c 100644 +index 44ff074cffaa..995c10b2be9e 100644 --- chrome/app/generated_resources.grd +++ chrome/app/generated_resources.grd @@ -4732,7 +4732,7 @@ Keep your key file in a safe place. You will need it to create new versions of y