Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6905 from brave/86.0.4240.111_master_72

Browse Source 
Updated patches from Chromium 86.0.4240.99 to Chromium 86.0.4240.111.
This commit is contained in:
Brian Clifton
2020-10-20 19:29:11 -07:00
committed by GitHub
parent 4b9ac7cadf ae36397442
commit 3407bfbda1
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patches/chrome-VERSION.patch
+2 -2
View File
@@ -1,12 +1,12 @@
diff --git a/chrome/VERSION b/chrome/VERSION
index ac87191617ace72bed5efb7231d36525800196fb..0a5207c00b80be4af990ff68a02d992ba875b232 100644
index bb9a694c062d57f0328c30adbf8c378984e41d59..66a71641a95259a6bd786ba63636b70a66719a6b 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=86
-MINOR=0
-BUILD=4240
-PATCH=99
-PATCH=111
+MINOR=1
+BUILD=18
+PATCH=1
patches/chrome-browser-ui-views-bookmarks-bookmark_bubble_view.cc.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
index 8c04e080a6465dbfde11d379b8db5e49393e99d6..86b023b2e4df3f13343725266c244bd404434303 100644
index 71cd964ce9c9968410426e033f70bb5169f97824..4433726b4a5bfef828317963e53f0027ff0dadd7 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
@@ -226,6 +226,7 @@ void BookmarkBubbleView::ShowBubble(
@@ -229,6 +229,7 @@ void BookmarkBubbleView::ShowBubble(
bookmark_bubble_ = bubble.get();
bubble->SetAnchorView(anchor_view);
bubble->SetArrow(views::BubbleBorder::TOP_RIGHT);
patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
index ed7ae523c40203425f6b08cd6308e1debac24d18..461da464c787af81c822a6bbcffcdfadfe7731b3 100644
index f7874b0f6944521c0a083375321f01709e2b4d08..43c0c78d69537a27f8bc5692cb1891bb1efc65be 100644
--- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
+++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
@@ -2919,6 +2919,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib(
patches/tools-metrics-histograms-histograms.xml.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index 1716fae7b243084772001e1f52ed90a14ae3ecc2..82c40c5fdc3d69120914047016764859b990973d 100644
index 0d562d5f2b079b657dfe76c395ed09eaa509e2e3..ba864b2a4f5175e482b6eb8e5c8a04dfb85b2074 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -212620,6 +212620,7 @@ regressions. -->
@@ -212662,6 +212662,7 @@ regressions. -->
<suffix name="ProtectedMedia" label="Protected media permission"/>
<suffix name="PushMessaging" label="Push messaging permission"/>
<suffix name="Quota" label="Quota permission"/>