chore: bump chromium to 4563763ef26ad940d4e988d7245dd (master) (#23219)

* chore: bump chromium in DEPS to 461ecae368fd0832f18e0b13e61f3561d83f0031

* update patches

* update patches

* Remove both vs browser/child split in content gn files.

2157965

* chore: bump chromium in DEPS to 7ff3897f3104563763ef26ad940d4e988d7245dd

* update patches

* update patches

* Add ElectronKioskDelegate for extensions

2159760

Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
Co-authored-by: Electron Bot <anonymous@electronjs.org>
This commit is contained in:
Electron Bot 2020-04-23 18:55:17 -07:00 committed by GitHub
parent 176a120ec2
commit 37db307153
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
46 changed files with 226 additions and 174 deletions

View file

@ -6,10 +6,10 @@ Subject: render_widget_host_view_base.patch
... something to do with OSR? and maybe <webview> as well? terrifying.
diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc
index f432ed3b53b8d5e1b365bf3e3223e95f05ccf13d..7998a818013dbd03a20bcd636221ccc567ecdfa9 100644
index f97342f99b9fb3d00761f6d4d27181a0f0edfdc7..a8c2ee219e16f4cd404f1e1d078416452a93e17a 100644
--- a/content/browser/renderer_host/render_widget_host_view_base.cc
+++ b/content/browser/renderer_host/render_widget_host_view_base.cc
@@ -605,6 +605,13 @@ bool RenderWidgetHostViewBase::ScreenRectIsUnstableFor(
@@ -603,6 +603,13 @@ bool RenderWidgetHostViewBase::ScreenRectIsUnstableFor(
return false;
}
@ -24,7 +24,7 @@ index f432ed3b53b8d5e1b365bf3e3223e95f05ccf13d..7998a818013dbd03a20bcd636221ccc5
const blink::WebMouseEvent& event,
const ui::LatencyInfo& latency) {
diff --git a/content/browser/renderer_host/render_widget_host_view_base.h b/content/browser/renderer_host/render_widget_host_view_base.h
index c27df0fe5497d0d7bde6d0c76508856a39ccb5c0..4be0ac35acadd38adba1d16162ff6590bb5eab36 100644
index 30736d62881ba8e7515465b880556f6179077e96..d1bca5b1ac4a06bbc64ccef0d6310591da37908a 100644
--- a/content/browser/renderer_host/render_widget_host_view_base.h
+++ b/content/browser/renderer_host/render_widget_host_view_base.h
@@ -23,9 +23,11 @@
@ -37,8 +37,8 @@ index c27df0fe5497d0d7bde6d0c76508856a39ccb5c0..4be0ac35acadd38adba1d16162ff6590
#include "content/public/browser/render_frame_metadata_provider.h"
+#include "content/public/browser/render_widget_host.h"
#include "content/public/browser/render_widget_host_view.h"
#include "content/public/common/input_event_ack_state.h"
#include "content/public/common/screen_info.h"
#include "content/public/common/widget_type.h"
@@ -65,9 +67,11 @@ class CursorManager;
class MouseWheelPhaseHandler;
class RenderWidgetHostImpl;
@ -61,7 +61,7 @@ index c27df0fe5497d0d7bde6d0c76508856a39ccb5c0..4be0ac35acadd38adba1d16162ff6590
// This only needs to be overridden by RenderWidgetHostViewBase subclasses
// that handle content embedded within other RenderWidgetHostViews.
gfx::PointF TransformPointToRootCoordSpaceF(
@@ -308,6 +315,11 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
@@ -310,6 +317,11 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
virtual void ProcessGestureEvent(const blink::WebGestureEvent& event,
const ui::LatencyInfo& latency);