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.

Sign up for GitHub

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

Update patches from Chromium 76.0.3809.100 to Chromium 76.0.3809.132 (uplift to 0.70.x) #3263

Merged
merged 1 commit into from
Aug 27, 2019
Merged

Update patches from Chromium 76.0.3809.100 to Chromium 76.0.3809.132 (uplift to 0.70.x) #3263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
diff --git a/chrome/VERSION b/chrome/VERSION
index 0f9c2987c0599cb48f0f52d4ffc542b2beeb7fb5..c10be37d87f8c96db079b952d7a7523c5e85977a 100644
index 36f2781c0fca0d01ba636fc8b1f1dfa3a55f500e..34a721bdf884f3773a67db1efe07d02389ffae15 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=76
MINOR=0
-BUILD=3809
-PATCH=100
-PATCH=132
+BUILD=70
+PATCH=75
4 changes: 2 additions & 2 deletions ...s/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch
View file
Open in desktop
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/toolbar/top/ToolbarPhone.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
index 7da0ae65235d35e1b36cd9c313a072e4b891ea95..5653441053f0c23dd7c5113fe58af48eb925138b 100644
index a89b91492e39563c09629a6cd27dd70d685927eb..ddb6ba9ae2bb6a60b82a37d336a8d00fdb8480bc 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
@@ -88,7 +88,7 @@ import java.util.List;
Expand Down Expand Up @@ -42,7 +42,7 @@ index 7da0ae65235d35e1b36cd9c313a072e4b891ea95..5653441053f0c23dd7c5113fe58af48e
}

private void updateToolbarBackground(int color) {
@@ -2121,6 +2124,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
@@ -2129,6 +2132,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
} else {
populateUrlClearFocusingAnimatorSet(animators);
}
Expand Down
6 changes: 3 additions & 3 deletions patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch
View file
Open in desktop
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 e18b337318aeb832732acb7fb2ba22e0a4dcbdfa..8834f0b0c3a81ca022b4a8904ab5b695e499b1ae 100644
index 0cd1651751f11714e3e9183a4f439ce18e9ef372..17410a463c44db067a670eb209edb54d2f5bbf7e 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 @@
Expand All @@ -10,7 +10,7 @@ index e18b337318aeb832732acb7fb2ba22e0a4dcbdfa..8834f0b0c3a81ca022b4a8904ab5b695
#include "build/build_config.h"
#include "third_party/blink/public/common/features.h"
#include "third_party/blink/public/platform/task_type.h"
@@ -911,6 +912,8 @@ String HTMLCanvasElement::ToDataURLInternal(
@@ -913,6 +914,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 e18b337318aeb832732acb7fb2ba22e0a4dcbdfa..8834f0b0c3a81ca022b4a8904ab5b695
if (!OriginClean()) {
exception_state.ThrowSecurityError("Tainted canvases may not be exported.");
return String();
@@ -929,6 +932,8 @@ void HTMLCanvasElement::toBlob(V8BlobCallback* callback,
@@ -931,6 +934,8 @@ void HTMLCanvasElement::toBlob(V8BlobCallback* callback,
const String& mime_type,
const ScriptValue& quality_argument,
ExceptionState& exception_state) {
Expand Down