From 433d6e1fa46e79d0c4d3ebf221ca7730533ca91d Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Tue, 8 Dec 2020 15:19:14 -0500 Subject: [PATCH] Update to Chromium version 88.0.4324.27 --- CHROMIUM_BUILD_COMPATIBILITY.txt | 3 ++- include/cef_api_hash.h | 8 ++++---- include/internal/cef_types.h | 3 ++- .../browser_security_policy_1081397.patch | 4 ++-- patch/patches/chrome_browser.patch | 4 ++-- patch/patches/chrome_browser_net_export.patch | 4 ++-- .../chrome_browser_product_override.patch | 6 +++--- patch/patches/content_2015.patch | 4 ++-- patch/patches/linux_poll_2466.patch | 2 +- patch/patches/osr_fling_2745.patch | 8 ++++---- patch/patches/services_network_2622.patch | 16 ++++++++-------- patch/patches/set_resize_background_color.patch | 14 +++++++------- patch/patches/views_1749_2102.patch | 2 +- patch/patches/web_contents_1257_1565.patch | 2 +- patch/patches/webkit_popups_and_background.patch | 4 ++-- patch/patches/webview_plugin_2020.patch | 2 +- 16 files changed, 44 insertions(+), 42 deletions(-) diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 5c7956cd1..189285761 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/88.0.4324.0' + 'chromium_checkout': 'refs/tags/88.0.4324.27', + 'depot_tools_checkout': '55e9ddf219' } diff --git a/include/cef_api_hash.h b/include/cef_api_hash.h index 64b79a42f..e36519d45 100644 --- a/include/cef_api_hash.h +++ b/include/cef_api_hash.h @@ -42,13 +42,13 @@ // way that may cause binary incompatibility with other builds. The universal // hash value will change if any platform is affected whereas the platform hash // values will change only if that particular platform is affected. -#define CEF_API_HASH_UNIVERSAL "7f349b7262bfe13bda037370004f56a6081e543b" +#define CEF_API_HASH_UNIVERSAL "89715b43c948313782d2546131f510eab1975844" #if defined(OS_WIN) -#define CEF_API_HASH_PLATFORM "8a5523fec15255e2fb1de64deaa15dc3554b91e5" +#define CEF_API_HASH_PLATFORM "80648a2c5a87db1581fdb994b7154ed77d74a3c5" #elif defined(OS_MAC) -#define CEF_API_HASH_PLATFORM "f572c8f7d3aee3cd3b85bd398b0ba43eb7fe79a0" +#define CEF_API_HASH_PLATFORM "3af393a2bf165edd934c5a59f6e6fce8a4bb579c" #elif defined(OS_LINUX) -#define CEF_API_HASH_PLATFORM "abf4cc6ff102e5cd019aaf51f13eb30f9bfeae45" +#define CEF_API_HASH_PLATFORM "8049cab9a43c1d554ccdd4dd3d5e38ecebce42af" #endif #ifdef __cplusplus diff --git a/include/internal/cef_types.h b/include/internal/cef_types.h index f00b9b5ca..6b60f2ebe 100644 --- a/include/internal/cef_types.h +++ b/include/internal/cef_types.h @@ -3139,8 +3139,9 @@ typedef enum { CEF_MRCR_NO_SUPPORTED_PROVIDER = 7, CEF_MRCR_CANCELLED = 8, CEF_MRCR_ROUTE_ALREADY_EXISTS = 9, + CEF_MRCR_ROUTE_ALREADY_TERMINATED = 11, - CEF_MRCR_TOTAL_COUNT = 11 // The total number of values. + CEF_MRCR_TOTAL_COUNT = 12 // The total number of values. } cef_media_route_create_result_t; /// diff --git a/patch/patches/browser_security_policy_1081397.patch b/patch/patches/browser_security_policy_1081397.patch index 93465c6d3..790837732 100644 --- a/patch/patches/browser_security_policy_1081397.patch +++ b/patch/patches/browser_security_policy_1081397.patch @@ -1,8 +1,8 @@ diff --git content/browser/child_process_security_policy_impl.cc content/browser/child_process_security_policy_impl.cc -index fed61eb62d74..af8ae804c1ff 100644 +index f4efb7329132..de16a7771365 100644 --- content/browser/child_process_security_policy_impl.cc +++ content/browser/child_process_security_policy_impl.cc -@@ -1704,6 +1704,16 @@ bool ChildProcessSecurityPolicyImpl::CanAccessDataForOrigin( +@@ -1698,6 +1698,16 @@ bool ChildProcessSecurityPolicyImpl::CanAccessDataForOrigin( // DeclarativeApiTest.PersistRules. if (actual_process_lock.matches_scheme(url::kDataScheme)) return true; diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index b6987c8f9..5cd47990e 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 16bd4c2717ee..65e309d23866 100644 +index a7b0f89b47a0..0e39be05a667 100644 --- chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn @@ -12,6 +12,7 @@ import("//build/config/crypto.gni") @@ -29,7 +29,7 @@ index 16bd4c2717ee..65e309d23866 100644 if (is_android) { sources += [ "after_startup_task_utils_android.cc", -@@ -4975,7 +4981,7 @@ static_library("browser") { +@@ -4981,7 +4987,7 @@ static_library("browser") { ] } diff --git a/patch/patches/chrome_browser_net_export.patch b/patch/patches/chrome_browser_net_export.patch index dd4899ce2..1c775368a 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 d4de7dc10b2a..f5b030de54f0 100644 +index 91bb3832b7ef..bdd87a3c09f8 100644 --- chrome/browser/ui/BUILD.gn +++ chrome/browser/ui/BUILD.gn @@ -11,6 +11,7 @@ import("//build/config/features.gni") @@ -37,7 +37,7 @@ index d4de7dc10b2a..f5b030de54f0 100644 "//components/profile_metrics", "//components/reading_list/features:flags", "//components/safe_browsing/core/common:safe_browsing_policy_handler", -@@ -3299,7 +3306,9 @@ static_library("ui") { +@@ -3296,7 +3303,9 @@ static_library("ui") { "views/frame/browser_desktop_window_tree_host_platform.h", ] } diff --git a/patch/patches/chrome_browser_product_override.patch b/patch/patches/chrome_browser_product_override.patch index ae604cfb5..bef5f77b9 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 957a3e09113f..1d8a5bdac349 100644 +index e277c7f6674e..a23a921b5192 100644 --- chrome/browser/chrome_content_browser_client.cc +++ chrome/browser/chrome_content_browser_client.cc @@ -1052,10 +1052,6 @@ void LaunchURL(const GURL& url, @@ -13,7 +13,7 @@ index 957a3e09113f..1d8a5bdac349 100644 void MaybeAppendSecureOriginsAllowlistSwitch(base::CommandLine* cmdline) { // |allowlist| combines pref/policy + cmdline switch in the browser process. // For renderer and utility (e.g. NetworkService) processes the switch is the -@@ -1234,6 +1230,14 @@ const blink::UserAgentBrandList& GetBrandVersionList() { +@@ -1244,6 +1240,14 @@ const blink::UserAgentBrandList& GetBrandVersionList() { return *greased_brand_version_list; } @@ -29,7 +29,7 @@ index 957a3e09113f..1d8a5bdac349 100644 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); if (command_line->HasSwitch(switches::kUserAgent)) { diff --git chrome/browser/chrome_content_browser_client.h chrome/browser/chrome_content_browser_client.h -index c6f87c148d16..bdc93db224d0 100644 +index dea633771818..39dc0cba50c9 100644 --- chrome/browser/chrome_content_browser_client.h +++ chrome/browser/chrome_content_browser_client.h @@ -101,7 +101,8 @@ class ChromeXrIntegrationClient; diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index 1643fc3e8..a7a18f844 100644 --- a/patch/patches/content_2015.patch +++ b/patch/patches/content_2015.patch @@ -340,10 +340,10 @@ index e9def973e93c..1fe148c4f429 100644 // started. virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {} diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc -index 340642fd854c..c031facf8897 100644 +index 1ad0de94d7f7..0d3a60d996aa 100644 --- content/renderer/render_frame_impl.cc +++ content/renderer/render_frame_impl.cc -@@ -3737,7 +3737,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin( +@@ -3739,7 +3739,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin( std::string mime_type; bool found = false; Send(new FrameHostMsg_GetPluginInfo( diff --git a/patch/patches/linux_poll_2466.patch b/patch/patches/linux_poll_2466.patch index 4db4f2b48..341681d63 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 4e231b615e8f..ffb027ebb0a3 100644 +index 0271c05c112a..de82a62866bc 100644 --- base/files/file_path_watcher_linux.cc +++ base/files/file_path_watcher_linux.cc @@ -5,6 +5,7 @@ diff --git a/patch/patches/osr_fling_2745.patch b/patch/patches/osr_fling_2745.patch index 587d640b3..97710e8c9 100644 --- a/patch/patches/osr_fling_2745.patch +++ b/patch/patches/osr_fling_2745.patch @@ -41,10 +41,10 @@ index cc4b13a7b9c6..84f3b9ed7cf4 100644 } // namespace content diff --git content/browser/renderer_host/render_widget_host_impl.cc content/browser/renderer_host/render_widget_host_impl.cc -index 19f90228473a..46e86591c898 100644 +index dd1340db422d..e643ecc57fe1 100644 --- content/browser/renderer_host/render_widget_host_impl.cc +++ content/browser/renderer_host/render_widget_host_impl.cc -@@ -2814,6 +2814,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() { +@@ -2831,6 +2831,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() { GetProcess(), bad_message::INPUT_ROUTER_INVALID_EVENT_SOURCE); } @@ -57,10 +57,10 @@ index 19f90228473a..46e86591c898 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 aef170316a5e..2e1a0d1245c9 100644 +index fba8cc575912..89dff04a4377 100644 --- content/browser/renderer_host/render_widget_host_impl.h +++ content/browser/renderer_host/render_widget_host_impl.h -@@ -725,6 +725,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl +@@ -726,6 +726,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl void ProgressFlingIfNeeded(base::TimeTicks current_time); void StopFling(); diff --git a/patch/patches/services_network_2622.patch b/patch/patches/services_network_2622.patch index adeb4569d..2b6531b5d 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 ed1b0c3bad29..5ed2c290fd2b 100644 +index eba28717a988..88e91c0fe01a 100644 --- chrome/browser/net/profile_network_context_service.cc +++ chrome/browser/net/profile_network_context_service.cc @@ -19,6 +19,7 @@ @@ -10,7 +10,7 @@ index ed1b0c3bad29..5ed2c290fd2b 100644 #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" -@@ -661,7 +662,19 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( +@@ -662,7 +663,19 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( // Configure on-disk storage for non-OTR profiles. OTR profiles just use // default behavior (in memory storage, default sizes). @@ -31,7 +31,7 @@ index ed1b0c3bad29..5ed2c290fd2b 100644 PrefService* local_state = g_browser_process->local_state(); // Configure the HTTP cache path and size. base::FilePath base_cache_path; -@@ -674,7 +687,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( +@@ -675,7 +688,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( base_cache_path.Append(chrome::kCacheDirname); network_context_params->http_cache_max_size = local_state->GetInteger(prefs::kDiskCacheSize); @@ -42,10 +42,10 @@ index ed1b0c3bad29..5ed2c290fd2b 100644 // change. network_context_params->http_server_properties_path = diff --git net/cookies/cookie_monster.cc net/cookies/cookie_monster.cc -index 796d855211d9..5fac1444b3d5 100644 +index 77b0d86b38c9..44e2b4668f45 100644 --- net/cookies/cookie_monster.cc +++ net/cookies/cookie_monster.cc -@@ -469,6 +469,25 @@ void CookieMonster::SetCookieableSchemes( +@@ -472,6 +472,25 @@ void CookieMonster::SetCookieableSchemes( MaybeRunCookieCallback(std::move(callback), true); } @@ -72,7 +72,7 @@ index 796d855211d9..5fac1444b3d5 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 2d45b2b113fd..fe0369aad18a 100644 +index 1c798ba1c784..b5ef44d5a9bd 100644 --- net/cookies/cookie_monster.h +++ net/cookies/cookie_monster.h @@ -184,6 +184,8 @@ class NET_EXPORT CookieMonster : public CookieStore { @@ -123,10 +123,10 @@ index 526ccf16da81..96ca62fbed3a 100644 void CookieManager::SetForceKeepSessionState() { diff --git services/network/network_context.cc services/network/network_context.cc -index 3773583bedd0..31157bbf388a 100644 +index 55ab00254624..f04ef95ed3ab 100644 --- services/network/network_context.cc +++ services/network/network_context.cc -@@ -1936,16 +1936,27 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( +@@ -1938,16 +1938,27 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( network_service_->network_quality_estimator()); } diff --git a/patch/patches/set_resize_background_color.patch b/patch/patches/set_resize_background_color.patch index c2ff52981..919d10a57 100644 --- a/patch/patches/set_resize_background_color.patch +++ b/patch/patches/set_resize_background_color.patch @@ -1,8 +1,8 @@ diff --git ui/views/controls/native/native_view_host.cc ui/views/controls/native/native_view_host.cc -index f9e1aa1b455a..5795eca10540 100644 +index a5a09b31bd8d..673da74e75aa 100644 --- ui/views/controls/native/native_view_host.cc +++ ui/views/controls/native/native_view_host.cc -@@ -153,7 +153,7 @@ void NativeViewHost::OnPaint(gfx::Canvas* canvas) { +@@ -157,7 +157,7 @@ void NativeViewHost::OnPaint(gfx::Canvas* canvas) { // It would be nice if this used some approximation of the page's // current background color. if (native_wrapper_->HasInstalledClip()) @@ -12,10 +12,10 @@ index f9e1aa1b455a..5795eca10540 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 71cba0d714bd..82d3d6baa909 100644 +index ab2371857a00..8dccc190fa89 100644 --- ui/views/controls/native/native_view_host.h +++ ui/views/controls/native/native_view_host.h -@@ -92,6 +92,12 @@ class VIEWS_EXPORT NativeViewHost : public View { +@@ -95,6 +95,12 @@ class VIEWS_EXPORT NativeViewHost : public View { void set_fast_resize(bool fast_resize) { fast_resize_ = fast_resize; } bool fast_resize() const { return fast_resize_; } @@ -28,7 +28,7 @@ index 71cba0d714bd..82d3d6baa909 100644 gfx::NativeView native_view() const { return native_view_; } void NativeViewDestroyed(); -@@ -138,6 +144,9 @@ class VIEWS_EXPORT NativeViewHost : public View { +@@ -141,6 +147,9 @@ class VIEWS_EXPORT NativeViewHost : public View { // in the setter/accessor above. bool fast_resize_ = false; @@ -39,7 +39,7 @@ index 71cba0d714bd..82d3d6baa909 100644 }; diff --git ui/views/controls/webview/webview.cc ui/views/controls/webview/webview.cc -index 0168540929dd..5853796d9ef3 100644 +index 44a8fc6ef9d0..4718e6bb94ff 100644 --- ui/views/controls/webview/webview.cc +++ ui/views/controls/webview/webview.cc @@ -127,6 +127,10 @@ void WebView::EnableSizingFromWebContents(const gfx::Size& min_size, @@ -54,7 +54,7 @@ index 0168540929dd..5853796d9ef3 100644 if (crashed_overlay_view_ == crashed_overlay_view) return; diff --git ui/views/controls/webview/webview.h ui/views/controls/webview/webview.h -index 1d4d5cd5e5bb..d6c405d5f6ab 100644 +index 9604515c2d5c..e51421694752 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/views_1749_2102.patch b/patch/patches/views_1749_2102.patch index 13fb1ff8b..1aa6f9fd2 100644 --- a/patch/patches/views_1749_2102.patch +++ b/patch/patches/views_1749_2102.patch @@ -484,7 +484,7 @@ index 64e09ff4359a..714e8e9ff661 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 6fb298b16599..e2c0bdb1fcb3 100644 +index 758e7d17bea4..66710f9f8d1d 100644 --- ui/views/view.h +++ ui/views/view.h @@ -24,6 +24,7 @@ diff --git a/patch/patches/web_contents_1257_1565.patch b/patch/patches/web_contents_1257_1565.patch index 89118bf71..1e87bf27f 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 cef3171a9987..7819fd0cafbe 100644 +index a5fb571b38e1..4eab48d77b2e 100644 --- content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc @@ -2744,7 +2744,13 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { diff --git a/patch/patches/webkit_popups_and_background.patch b/patch/patches/webkit_popups_and_background.patch index c9a128ab3..f23714a9b 100644 --- a/patch/patches/webkit_popups_and_background.patch +++ b/patch/patches/webkit_popups_and_background.patch @@ -137,10 +137,10 @@ index 165699ca8d92..d0db1ed1869a 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 4eddfdf0921a..555fb3a95139 100644 +index 318a8eb24c3d..e2d2b6aeaafb 100644 --- third_party/blink/renderer/core/page/chrome_client_impl.cc +++ third_party/blink/renderer/core/page/chrome_client_impl.cc -@@ -805,7 +805,7 @@ bool ChromeClientImpl::HasOpenedPopup() const { +@@ -806,7 +806,7 @@ bool ChromeClientImpl::HasOpenedPopup() const { PopupMenu* ChromeClientImpl::OpenPopupMenu(LocalFrame& frame, HTMLSelectElement& select) { NotifyPopupOpeningObservers(); diff --git a/patch/patches/webview_plugin_2020.patch b/patch/patches/webview_plugin_2020.patch index 79769f17f..b0a5838c1 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 8adfdcf49184..4bd1f967575c 100644 +index b428727e3195..7115ed56125a 100644 --- chrome/app/generated_resources.grd +++ chrome/app/generated_resources.grd @@ -5085,7 +5085,7 @@ Keep your key file in a safe place. You will need it to create new versions of y