mirror of https://github.com/electron/electron
87 lines
3.9 KiB
Diff
87 lines
3.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Anonymous <anonymous@electronjs.org>
|
|
Date: Thu, 20 Sep 2018 17:46:21 -0700
|
|
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 6b51fa563b1b796e60197fd3d4223c844d5fbef2..47783dcd82d1a256f14d69fde66063dea9cde564 100644
|
|
--- a/content/browser/renderer_host/render_widget_host_view_base.cc
|
|
+++ b/content/browser/renderer_host/render_widget_host_view_base.cc
|
|
@@ -700,6 +700,13 @@ bool RenderWidgetHostViewBase::ScreenRectIsUnstableForIOv2For(
|
|
return false;
|
|
}
|
|
|
|
+RenderWidgetHostViewBase* RenderWidgetHostViewBase::CreateViewForWidget(
|
|
+ RenderWidgetHost* render_widget_host,
|
|
+ RenderWidgetHost* embedder_render_widget_host,
|
|
+ WebContentsView* web_contents_view) {
|
|
+ return web_contents_view->CreateViewForWidget(render_widget_host);
|
|
+}
|
|
+
|
|
void RenderWidgetHostViewBase::ProcessMouseEvent(
|
|
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 cc3738cade39af393c651cbfb8a6cce87d7f770d..482e8abc5fa65b1f04f7549f087b7bc4450152af 100644
|
|
--- a/content/browser/renderer_host/render_widget_host_view_base.h
|
|
+++ b/content/browser/renderer_host/render_widget_host_view_base.h
|
|
@@ -25,10 +25,13 @@
|
|
#include "components/viz/common/surfaces/surface_id.h"
|
|
#include "components/viz/host/hit_test/hit_test_query.h"
|
|
#include "content/browser/renderer_host/display_feature.h"
|
|
+#include "content/browser/renderer_host/visible_time_request_trigger.h"
|
|
+#include "content/browser/web_contents/web_contents_view.h"
|
|
#include "content/common/content_export.h"
|
|
#include "content/common/input/event_with_latency_info.h"
|
|
#include "content/common/input/input_router_impl.h"
|
|
#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/page_visibility_state.h"
|
|
#include "content/public/common/widget_type.h"
|
|
@@ -54,7 +57,7 @@
|
|
namespace blink {
|
|
class WebMouseEvent;
|
|
class WebMouseWheelEvent;
|
|
-}
|
|
+} // namespace blink
|
|
|
|
namespace ui {
|
|
class Compositor;
|
|
@@ -71,9 +74,11 @@ class CursorManager;
|
|
class MouseWheelPhaseHandler;
|
|
class RenderWidgetHostImpl;
|
|
class RenderWidgetHostViewBaseObserver;
|
|
+class RenderWidgetHostViewGuest;
|
|
class SyntheticGestureTarget;
|
|
class TextInputManager;
|
|
class TouchSelectionControllerClientManager;
|
|
+class WebContentsView;
|
|
class WebContentsAccessibility;
|
|
class DelegatedFrameHost;
|
|
|
|
@@ -158,6 +163,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView,
|
|
const gfx::Rect& keyboard_rect) override {}
|
|
bool IsHTMLFormPopup() const override;
|
|
|
|
+ virtual void InitAsGuest(RenderWidgetHostView* parent_host_view,
|
|
+ RenderWidgetHostViewGuest* guest_view) {}
|
|
+
|
|
// This only needs to be overridden by RenderWidgetHostViewBase subclasses
|
|
// that handle content embedded within other RenderWidgetHostViews.
|
|
gfx::PointF TransformPointToRootCoordSpaceF(
|
|
@@ -335,6 +343,11 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView,
|
|
virtual void ProcessGestureEvent(const blink::WebGestureEvent& event,
|
|
const ui::LatencyInfo& latency);
|
|
|
|
+ virtual RenderWidgetHostViewBase* CreateViewForWidget(
|
|
+ RenderWidgetHost* render_widget_host,
|
|
+ RenderWidgetHost* embedder_render_widget_host,
|
|
+ WebContentsView* web_contents_view);
|
|
+
|
|
// Transform a point that is in the coordinate space of a Surface that is
|
|
// embedded within the RenderWidgetHostViewBase's Surface to the
|
|
// coordinate space of an embedding, or embedded, Surface. Typically this
|