github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: bump chromium to 85.0.4183.84 (10-x-y) (#25093)

Browse Source 
* chore: bump chromium in DEPS to 85.0.4183.82

* chore: bump chromium in DEPS to 85.0.4183.83

* chore: bump chromium in DEPS to 85.0.4183.84

* update patches

Co-authored-by: Electron Bot <anonymous@electronjs.org>
This commit is contained in:
Electron Bot
2020-08-24 09:02:20 -07:00
committed by GitHub
parent a799860d7e
commit 4a43487b39
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@@ -14,7 +14,7 @@ gclient_gn_args = [
vars = {
'chromium_version':
'85.0.4183.80',
'85.0.4183.84',
'node_version':
'v12.16.3',
'nan_version':

4
patches/chromium/can_create_window.patch
View File

@@ -21,10 +21,10 @@ index 0e54861c260ecfa1635ee56c1c9e931914afe901..948e3e5cf64f74ae560c64d0490c22a8
&no_javascript_access);
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index c8ba444365d3391056ff58c0e513bb0ad0a5f9b6..4b72590b9ae6994ca6fd2e56d46b3b5c5178aeb6 100644
index 1db46cd9bee49617a045753340d35e0e74ebf1ed..b62a639e51886ddc500d7aa78aa2f9c2efc75514 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3087,9 +3087,9 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
@@ -3091,9 +3091,9 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
}
if (delegate_) {

4
patches/chromium/fix_route_mouse_event_navigations_through_the_web_contents_delegate.patch
View File

@@ -13,10 +13,10 @@ This patch can be removed once app.allowRendererProcessReuse is forced
to true as then Chromiums assumptions around processes become correct.
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 4b72590b9ae6994ca6fd2e56d46b3b5c5178aeb6..960564056447f18eb629db2e03e05393ffc539f8 100644
index b62a639e51886ddc500d7aa78aa2f9c2efc75514..fbbfba66e5cbd242484fd95897ad08209b390d1f 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -2492,11 +2492,13 @@ bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) {
@@ -2496,11 +2496,13 @@ bool WebContentsImpl::HandleMouseEvent(const blink::WebMouseEvent& event) {
WebContentsImpl* outermost = GetOutermostWebContents();
if (event.button == blink::WebPointerProperties::Button::kBack &&
outermost->controller_.CanGoBack()) {

8
patches/chromium/refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
View File

@@ -43,10 +43,10 @@ index bf6baff690af930acf19c2a544c8f00ab492bb8e..8d205a1b052c6d670c0c2e38852734c5
void RenderWidgetHostImpl::OnCursorVisibilityStateChanged(bool is_visible) {
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 7c527fc81a07c7060c78b8e95dc3b79313cc38b5..a7e9ee78ecb5bd9a7e0bf37d24d526de60f8a55a 100644
index 00a4ebd2b57747ebb7a66d626541dd3888060f56..279875a1c109568ec8e658d51a55efdea998dd7d 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -3588,6 +3588,11 @@ bool WebContentsImpl::OnUpdateDragCursor() {
@@ -3592,6 +3592,11 @@ bool WebContentsImpl::OnUpdateDragCursor() {
browser_plugin_embedder_->OnUpdateDragCursor();
}
@@ -59,10 +59,10 @@ index 7c527fc81a07c7060c78b8e95dc3b79313cc38b5..a7e9ee78ecb5bd9a7e0bf37d24d526de
RenderWidgetHostImpl* render_widget_host) {
return render_widget_host == GetMainFrame()->GetRenderWidgetHost();
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index b58cd9a57001be622849b992b22c196c76c40ac8..d57e3f2dd258a29de7c737228d80d377e50f036a 100644
index a52e45b40c8e846e4b68a2f5b0bf688a5f698d44..14586316aedab1e99f1b700ecc0e092c86414ee3 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -920,6 +920,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
@@ -921,6 +921,7 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
void SendScreenRects() override;
TextInputManager* GetTextInputManager() override;
bool OnUpdateDragCursor() override;

8
patches/chromium/web_contents.patch
View File

@@ -9,10 +9,10 @@ is needed for OSR.
Originally landed in https://github.com/electron/libchromiumcontent/pull/226.
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 960564056447f18eb629db2e03e05393ffc539f8..7c527fc81a07c7060c78b8e95dc3b79313cc38b5 100644
index fbbfba66e5cbd242484fd95897ad08209b390d1f..00a4ebd2b57747ebb7a66d626541dd3888060f56 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -2225,6 +2225,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -2229,6 +2229,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
std::string unique_name;
frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name);
@@ -25,7 +25,7 @@ index 960564056447f18eb629db2e03e05393ffc539f8..7c527fc81a07c7060c78b8e95dc3b793
WebContentsViewDelegate* delegate =
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
@@ -2235,6 +2241,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -2239,6 +2245,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
view_.reset(CreateWebContentsView(this, delegate,
&render_view_host_delegate_view_));
}
@@ -34,7 +34,7 @@ index 960564056447f18eb629db2e03e05393ffc539f8..7c527fc81a07c7060c78b8e95dc3b793
CHECK(view_.get());
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
index 40b5d17d9c73370bc128f5305aaf6ed6711d338a..f2bef5bd135825639201a88c98b68c044618473c 100644
index c5d3d6a2004f8c714187659e003aa5044aaa0d1a..ca7651246f812259e43d5dbc429ae4a95ed60e94 100644
--- a/content/public/browser/web_contents.h
+++ b/content/public/browser/web_contents.h
@@ -82,8 +82,11 @@ class BrowserContext;