Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade from Chromium 73.0.3683.56 to Chromium 73.0.3683.67 #1884

Merged
merged 1 commit into from
Mar 7, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions patches/chrome-VERSION.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
diff --git a/chrome/VERSION b/chrome/VERSION
index 2814aa1b6dba75aed4a1c9155901990df680a726..93974c79aab3d1c0b53362f6dd46313e767a62db 100644
index 0b0f053f95e78e205a8e7703e4300492de06306c..93974c79aab3d1c0b53362f6dd46313e767a62db 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=73
MINOR=0
-BUILD=3683
-PATCH=56
-PATCH=67
+BUILD=62
+PATCH=18
2 changes: 1 addition & 1 deletion patches/chrome-browser-about_flags.cc.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 7e97ad285a3619ca74dfa0b19fd38da1722a068b..9ac5cfab1701a16137390d8a1cd3fa77fc41790b 100644
index 7074857d8beceb958f6368ccbcce0d97488b27af..ca0a58ea857176230d6fed6869afb238eb112bae 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -262,14 +262,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = {
Expand Down
4 changes: 2 additions & 2 deletions patches/chrome-browser-chrome_content_browser_client.h.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
index e03cec20ed2ef2dc5063f5bc948259683450557e..46198a1f899185b7252c18a669f2ae08b2eb6fc8 100644
index 2f67ad90815dc05c412f2ec9fce68f59667bc368..bf737b0dec8f835dde26a58df17f132aee8d2bbd 100644
--- a/chrome/browser/chrome_content_browser_client.h
+++ b/chrome/browser/chrome_content_browser_client.h
@@ -572,6 +572,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
@@ -573,6 +573,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
content::BrowserContext* browser_context);

private:
Expand Down
4 changes: 2 additions & 2 deletions patches/chrome-browser-prefs-browser_prefs.cc.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index a72aa39ae183c400a1d52a2f51e2e317e9c29fb8..886598ae5aabed9bf6a15340b5cb2a6cf065cac5 100644
index a521153d3d2081f4969aa653190519c4ad262d81..9e56a5d988221b94758159629337d7c8126f0476 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -562,6 +562,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
@@ -564,6 +564,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
#if defined(TOOLKIT_VIEWS)
RegisterBrowserViewLocalPrefs(registry);
#endif
Expand Down
2 changes: 1 addition & 1 deletion patches/chrome-install_static-install_util.cc.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/install_static/install_util.cc b/chrome/install_static/install_util.cc
index df87bd9b472eeccc7c0824f660dfadb257e26dc2..57aabe653783cb68554bde2032fdec4ea7ad8435 100644
index 7c7b6c5343bb05ebea63212a0c00fdfbd675efc7..55228955fe9b5dbb475f2c4e8164fa64bd7d4b51 100644
--- a/chrome/install_static/install_util.cc
+++ b/chrome/install_static/install_util.cc
@@ -664,7 +664,7 @@ void GetExecutableVersionDetails(const std::wstring& exe_path,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc
index 559d0959cbf9d45f2115aa6cc0c6ca0e0147a678..789a77dc568f4c1618c25d1377d803b6c24bf320 100644
index bbb2ba40ecaa0157a9dcb30e714f0b9bbeafbf66..ca159bed2beca50498d2a50c4caa96e62f7c4c2a 100644
--- a/content/browser/frame_host/navigation_request.cc
+++ b/content/browser/frame_host/navigation_request.cc
@@ -1536,6 +1536,11 @@ void NavigationRequest::OnStartChecksComplete(
@@ -1546,6 +1546,11 @@ void NavigationRequest::OnStartChecksComplete(
headers.MergeFrom(navigation_handle_->TakeModifiedRequestHeaders());
begin_params_->headers = headers.ToString();

Expand Down
4 changes: 2 additions & 2 deletions patches/content-public-browser-content_browser_client.h.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index eaa7d8b25141f8f2d461f0b37054c772c8df6297..81b4540f090d25c11fbb05f5bba4b42635ffe3d5 100644
index b40ca1e3be824f4e2f782d36a89fef1a33148779..ba446ed3d2da710495e2d5d63e26b5c0cabeb152 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -1473,6 +1473,12 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1479,6 +1479,12 @@ class CONTENT_EXPORT ContentBrowserClient {
// blacklist policies are applied there.
virtual bool IsRendererDebugURLBlacklisted(const GURL& url,
BrowserContext* context);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/extensions/browser/api/web_request/web_request_api.cc b/extensions/browser/api/web_request/web_request_api.cc
index 7a2c83535e09a3e54094eb48b10ea33ae9de602d..72fed8d097f75e283a66b3dbe71bc91174e8f2bd 100644
index 6b15b0e32f664538eba2da9890efe4cb9f918fff..870359ce85f7770a7eb3ae6de38592a4f3add6c2 100644
--- a/extensions/browser/api/web_request/web_request_api.cc
+++ b/extensions/browser/api/web_request/web_request_api.cc
@@ -1218,6 +1218,9 @@ ExtensionWebRequestEventRouter::OnAuthRequired(
@@ -1219,6 +1219,9 @@ ExtensionWebRequestEventRouter::OnAuthRequired(
const net::AuthChallengeInfo& auth_info,
net::NetworkDelegate::AuthCallback callback,
net::AuthCredentials* credentials) {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 2ef7a11feae1e6fd1cb3158004d172117351ee0c..7d5f42858437d54707227ac1cdac4f6745fcea0c 100644
index 8d6ec61bf2ad7d937d6f3da76558ff2b17315754..2d1c13fe2ee6b3da4826bc5c72b1b2ce518573b2 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
@@ -36,6 +36,7 @@
Expand All @@ -10,7 +10,7 @@ index 2ef7a11feae1e6fd1cb3158004d172117351ee0c..7d5f42858437d54707227ac1cdac4f67
#include "build/build_config.h"
#include "third_party/blink/public/common/features.h"
#include "third_party/blink/public/platform/task_type.h"
@@ -877,6 +878,8 @@ String HTMLCanvasElement::ToDataURLInternal(
@@ -880,6 +881,8 @@ String HTMLCanvasElement::ToDataURLInternal(
String HTMLCanvasElement::toDataURL(const String& mime_type,
const ScriptValue& quality_argument,
ExceptionState& exception_state) const {
Expand All @@ -19,7 +19,7 @@ index 2ef7a11feae1e6fd1cb3158004d172117351ee0c..7d5f42858437d54707227ac1cdac4f67
if (!OriginClean()) {
exception_state.ThrowSecurityError("Tainted canvases may not be exported.");
return String();
@@ -895,6 +898,8 @@ void HTMLCanvasElement::toBlob(V8BlobCallback* callback,
@@ -898,6 +901,8 @@ void HTMLCanvasElement::toBlob(V8BlobCallback* callback,
const String& mime_type,
const ScriptValue& quality_argument,
ExceptionState& exception_state) {
Expand Down