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

Updated from Chromium 87.0.4280.67 to Chromium 87.0.4280.88 (1.17.x). #7324

Merged
merged 1 commit into from
Dec 3, 2020
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
8 changes: 3 additions & 5 deletions app/generated_resources.grd
Original file line number Diff line number Diff line change
Expand Up @@ -4924,6 +4924,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_PLUGIN_PREFER_HTML_BY_DEFAULT" desc="The placeholder text for a plugin with no fallback content when Prefer HTML5 By Default is on.">
Click to enable <ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph>
</message>
<message name="IDS_PLUGIN_DEPRECATED" desc="The placeholder text for a deprecated plugin.">
<ph name="PLUGIN_NAME">$1<ex>Adobe Flash Player</ex></ph> is no longer supported
</message>

<!-- Session Crashed Infobar/Bubble-->
<message name="IDS_SESSION_CRASHED_BUBBLE_TITLE" desc="Title of the session crashed bubble view.">
Expand Down Expand Up @@ -7785,11 +7788,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_PLUGIN_OUTDATED_PROMPT" desc="Infobar message when an outdated plugin was disabled">
<ph name="PLUGIN_NAME">$1<ex>Flash</ex></ph> was blocked because it is out of date
</message>
<message name="IDS_PLUGIN_DEPRECATED_PROMPT" desc="Infobar message when an deprecated plugin was disabled">
<ph name="PLUGIN_NAME">
$1<ex>Flash</ex>
</ph> was blocked because it is deprecated
</message>
<message name="IDS_PLUGIN_ENABLE_TEMPORARILY" desc="Infobar button to run a blocked outdated plugin">
Run this time
</message>
Expand Down
4 changes: 2 additions & 2 deletions patches/chrome-VERSION.patch
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
diff --git a/chrome/VERSION b/chrome/VERSION
index 2c4514a701725958eed9feacc7a43c46ef1f2fba..205283ea59b247e3aa5ac69d0d81f2c05133c5b8 100644
index b2816ea7b221cf12ba19fed3532f0fd1ac96a8b2..f1a6aeb7a31abfa5ea8c97bd03332548dd7d87cd 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=87
-MINOR=0
-BUILD=4280
-PATCH=67
-PATCH=88
+MINOR=1
+BUILD=17
+PATCH=74
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
index 91e4df543160aaec5cd89943cd51a403c13d3e9a..982fb668ea30d7259ca70870779a6158ba6179c2 100644
index 6fd7de739e70cd7a184d8cbdf994fe38d58aa549..15875a821fecd158c55b2195f9de9266ee99aa7b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java
@@ -59,7 +59,7 @@ import org.chromium.ui.vr.VrModeObserver;
Expand Down
4 changes: 2 additions & 2 deletions 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 78bf907f995cf7ee8e2bf3b6d40a30ebed658ab9..efda7e0096ff5ecbdd4c00ffb6015d3d8f938438 100644
index 89914fee86b0a87bb446d36e99aa0c1e75da7056..b1e390f2f3f82c9ddd07d45f100577b9a8876871 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -294,14 +294,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = {
Expand All @@ -21,7 +21,7 @@ index 78bf907f995cf7ee8e2bf3b6d40a30ebed658ab9..efda7e0096ff5ecbdd4c00ffb6015d3d

const FeatureEntry::Choice kPassiveListenersChoices[] = {
{flags_ui::kGenericExperimentChoiceDefault, "", ""},
@@ -6727,6 +6727,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -6733,6 +6733,7 @@ const FeatureEntry kFeatureEntries[] = {
// "LoginCustomFlags" in tools/metrics/histograms/enums.xml. See "Flag
// Histograms" in tools/metrics/histograms/README.md (run the
// AboutFlagsHistogramTest unit test to verify this process).
Expand Down
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 4077ac522067bc03a5316c3f0c1184135eaf2d1a..bb1a6914db5e85f57499df9be1caf21433cc2645 100644
index 457d9eee22f05a9b5009edcfcfb9d1baed58c442..73ee495feb9277337098c9a1021301a573062ce7 100644
--- a/chrome/browser/chrome_content_browser_client.h
+++ b/chrome/browser/chrome_content_browser_client.h
@@ -721,6 +721,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
@@ -722,6 +722,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
}

private:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
index 4842820f87afc037044b62f6e7b0fe11cccc74ff..8dba7a8ce64abd59311e4d76370d1450c8d9a7f0 100644
index ae82444496c1049881503e498944c3db3ca61d69..57f9a54e2d2695a9ccbab47a436d0968920438fe 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -1627,6 +1627,7 @@ void RenderViewContextMenu::AppendSearchProvider() {
@@ -1629,6 +1629,7 @@ void RenderViewContextMenu::AppendSearchProvider() {
selection_navigation_url_ = match.destination_url;
if (!selection_navigation_url_.is_valid())
return;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index c9852764a59cb37f312978d8aa14ec51c308502b..e38fb9970fb6a931c96bdc6e5bafc9c73f0adb42 100644
index ce09634902a5937af110ab5453c9ae1f18b8d987..dbd1450c5659ed5930dcf32fa115ec1a1323a156 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -487,7 +487,7 @@ void ChromeContentRendererClient::RenderFrameCreated(
Expand Down
2 changes: 1 addition & 1 deletion patches/third_party-blink-renderer-core-BUILD.gn.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn
index 7a14170592c8e587696c6ec7aaa4811d8f900a99..45edffc6512f07f4bd86af1ba43cd1271684ea31 100644
index 5bc0a30d400737c26d91767a01e567f2165fe8b9..c859eff371d307152f6592c53c7a573771e7f1da 100644
--- a/third_party/blink/renderer/core/BUILD.gn
+++ b/third_party/blink/renderer/core/BUILD.gn
@@ -126,6 +126,7 @@ component("core") {
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/canvas_async_blob_creator.cc b/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc
index ca17f562601b8fd8bf0c7a06a1af131ddb921e9d..df419f33fc623d7193345c5b58dfe3c87a2c8423 100644
index 02462b60d63e7c4ceaf2a1476e7564f1706321d8..255fa0ccfd0d491b16853742857b86d1c96709be 100644
--- a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc
+++ b/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc
@@ -195,6 +195,7 @@ CanvasAsyncBlobCreator::CanvasAsyncBlobCreator(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
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 b8e22fa0d72dee59cd41130ae8c23b51959d8023..c3f5ced91eef0058aa1ad5d1d0b5cb4571813434 100644
index 54501100353c49c5ff3bb8e49a658cef21078c17..f75e899c8722724c808f0f8e166bb75bd73ecb8b 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
@@ -942,6 +942,7 @@ String HTMLCanvasElement::ToDataURLInternal(
@@ -945,6 +945,7 @@ String HTMLCanvasElement::ToDataURLInternal(

scoped_refptr<StaticBitmapImage> image_bitmap = Snapshot(source_buffer);
if (image_bitmap) {
Expand Down
2 changes: 1 addition & 1 deletion patches/ui-native_theme-native_theme_win.cc.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc
index 950956142148d2127135386dd2b9d0076b7aa148..fcc3dcaf5c3e8badff59b27354b6c4873603b520 100644
index 28acb663886b4f192ed188770deaa0f5095aca0f..5854d8799a2a62a6227967a3d66cdfcfec127267 100644
--- a/ui/native_theme/native_theme_win.cc
+++ b/ui/native_theme/native_theme_win.cc
@@ -1644,6 +1644,7 @@ void NativeThemeWin::UpdateDarkModeStatus() {
Expand Down