From ba98cb6a32d2645fb2952005f57293a2937dfecd Mon Sep 17 00:00:00 2001 From: Brian Clifton Date: Thu, 2 May 2019 12:36:29 -0500 Subject: [PATCH] Merge pull request #2353 from brave/74.0.3729.131_master_22 Upgrade patches from Chromium "74.0.3729.108" to Chromium 74.0.3729.131 --- patches/chrome-VERSION.patch | 4 ++-- ...browser-renderer_host-chrome_navigation_ui_data.cc.patch | 6 +++--- patches/chrome-browser-ui-browser_navigator.cc.patch | 6 +++--- ...omponents-search_engines-prepopulated_engines.json.patch | 6 +++--- ...k-renderer-core-html-canvas-html_canvas_element.cc.patch | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 38ff2d1ba018..48d0ee2b4c13 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,11 +1,11 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index fcacfd1cd275f0c5b3dd484ff1bd432cbfd62d8e..ef8f6b60fd575ff61276541f8e36bf5c5d5a9307 100644 +index a9d23f5e048eea2a794ed5e51524fa51c326f611..83ede5bb865fdbda42deef9475617d09da99ba26 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=74 MINOR=0 -BUILD=3729 --PATCH=108 +-PATCH=131 +BUILD=64 +PATCH=68 diff --git a/patches/chrome-browser-renderer_host-chrome_navigation_ui_data.cc.patch b/patches/chrome-browser-renderer_host-chrome_navigation_ui_data.cc.patch index 165084ecf168..89dc05079006 100644 --- a/patches/chrome-browser-renderer_host-chrome_navigation_ui_data.cc.patch +++ b/patches/chrome-browser-renderer_host-chrome_navigation_ui_data.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/renderer_host/chrome_navigation_ui_data.cc b/chrome/browser/renderer_host/chrome_navigation_ui_data.cc -index cc451467f27f2f5054697281ff01d56b2937c5e5..c5cdc0fc623fb6bbe498430ffa8399534ccb1032 100644 +index 299a44a55eede0e318241c8885f00546e3f99ae1..ff079c76c3d76d53e16cdc28e81420ec2f35e56a 100644 --- a/chrome/browser/renderer_host/chrome_navigation_ui_data.cc +++ b/chrome/browser/renderer_host/chrome_navigation_ui_data.cc -@@ -49,7 +49,7 @@ ChromeNavigationUIData::CreateForMainFrameNavigation( +@@ -52,7 +52,7 @@ ChromeNavigationUIData::CreateForMainFrameNavigation( content::WebContents* web_contents, WindowOpenDisposition disposition, int64_t data_reduction_proxy_page_id) { @@ -11,7 +11,7 @@ index cc451467f27f2f5054697281ff01d56b2937c5e5..c5cdc0fc623fb6bbe498430ffa839953 navigation_ui_data->disposition_ = disposition; navigation_ui_data->data_reduction_proxy_page_id_ = data_reduction_proxy_page_id; -@@ -70,7 +70,7 @@ ChromeNavigationUIData::CreateForMainFrameNavigation( +@@ -73,7 +73,7 @@ ChromeNavigationUIData::CreateForMainFrameNavigation( std::unique_ptr ChromeNavigationUIData::Clone() const { diff --git a/patches/chrome-browser-ui-browser_navigator.cc.patch b/patches/chrome-browser-ui-browser_navigator.cc.patch index 85b3a51fae8d..6ab3afeaf2f3 100644 --- a/patches/chrome-browser-ui-browser_navigator.cc.patch +++ b/patches/chrome-browser-ui-browser_navigator.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc -index cd2ade8119331caa626270056a1863165afd3fb4..f3691ded29969615dd7225246467da8a62d0b8fe 100644 +index 923eb172b0fcfd9f396f30cce4dc91593960056e..10d6e15e608927bf0c88ba034e3180fd0679acb6 100644 --- a/chrome/browser/ui/browser_navigator.cc +++ b/chrome/browser/ui/browser_navigator.cc -@@ -106,6 +106,7 @@ Browser* GetOrCreateBrowser(Profile* profile, bool user_gesture) { +@@ -104,6 +104,7 @@ Browser* GetOrCreateBrowser(Profile* profile, bool user_gesture) { // Returns true on success. Otherwise, if changing params leads the browser into // an erroneous state, returns false. bool AdjustNavigateParamsForURL(NavigateParams* params) { @@ -10,7 +10,7 @@ index cd2ade8119331caa626270056a1863165afd3fb4..f3691ded29969615dd7225246467da8a if (params->contents_to_insert || params->switch_to_singleton_tab || IsURLAllowedInIncognito(params->url, params->initiating_profile) || params->initiating_profile->IsGuestSession()) { -@@ -723,6 +724,7 @@ void Navigate(NavigateParams* params) { +@@ -717,6 +718,7 @@ void Navigate(NavigateParams* params) { bool IsHostAllowedInIncognito(const GURL& url) { std::string scheme = url.scheme(); base::StringPiece host = url.host_piece(); diff --git a/patches/components-search_engines-prepopulated_engines.json.patch b/patches/components-search_engines-prepopulated_engines.json.patch index 8e2ce6578a4e..c95c82d21547 100644 --- a/patches/components-search_engines-prepopulated_engines.json.patch +++ b/patches/components-search_engines-prepopulated_engines.json.patch @@ -1,5 +1,5 @@ diff --git a/components/search_engines/prepopulated_engines.json b/components/search_engines/prepopulated_engines.json -index 9d7af2b2cf2c6b57f84bc2b29093a1eccaa7d386..52e449a8560411baa0c1c561f73f6ab08bd49ef2 100644 +index cabb7597170b39b26ae5743807cb92a26262c96a..796d7510a55ecdc4e9d7a79d93d311328b083c3a 100644 --- a/components/search_engines/prepopulated_engines.json +++ b/components/search_engines/prepopulated_engines.json @@ -95,16 +95,6 @@ @@ -19,8 +19,8 @@ index 9d7af2b2cf2c6b57f84bc2b29093a1eccaa7d386..52e449a8560411baa0c1c561f73f6ab0 "google": { "name": "Google", "keyword": "google.com", -@@ -159,16 +149,6 @@ - "id": 93 +@@ -150,16 +140,6 @@ + "id": 67 }, - "qwant": { diff --git a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch index d04e03f25251..b056946a6d1b 100644 --- a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch +++ b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc -index 6d5991f6abec0e6d12f144f8ac6cfa6d2718ed2e..bfc2602918651a3cd4eaea839a9d1d7c56884163 100644 +index 13df5ff91a4d4711a229aa5df80c424ef5450c7b..a7d1f63042ccfaf76a2f35449c94cdf518d47fa1 100644 --- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc +++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc @@ -37,6 +37,7 @@ @@ -10,7 +10,7 @@ index 6d5991f6abec0e6d12f144f8ac6cfa6d2718ed2e..bfc2602918651a3cd4eaea839a9d1d7c #include "build/build_config.h" #include "third_party/blink/public/common/features.h" #include "third_party/blink/public/platform/task_type.h" -@@ -891,6 +892,8 @@ String HTMLCanvasElement::ToDataURLInternal( +@@ -904,6 +905,8 @@ String HTMLCanvasElement::ToDataURLInternal( String HTMLCanvasElement::toDataURL(const String& mime_type, const ScriptValue& quality_argument, ExceptionState& exception_state) const { @@ -19,7 +19,7 @@ index 6d5991f6abec0e6d12f144f8ac6cfa6d2718ed2e..bfc2602918651a3cd4eaea839a9d1d7c if (!OriginClean()) { exception_state.ThrowSecurityError("Tainted canvases may not be exported."); return String(); -@@ -909,6 +912,8 @@ void HTMLCanvasElement::toBlob(V8BlobCallback* callback, +@@ -922,6 +925,8 @@ void HTMLCanvasElement::toBlob(V8BlobCallback* callback, const String& mime_type, const ScriptValue& quality_argument, ExceptionState& exception_state) {