mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
build: remove render_widget_host_view_base patch
This commit is contained in:
@@ -4,7 +4,6 @@ blink_local_frame.patch
|
||||
can_create_window.patch
|
||||
disable_hidden.patch
|
||||
dom_storage_limits.patch
|
||||
render_widget_host_view_base.patch
|
||||
render_widget_host_view_mac.patch
|
||||
webview_cross_drag.patch
|
||||
gin_enable_disable_v8_platform.patch
|
||||
|
||||
@@ -1,73 +0,0 @@
|
||||
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 30ec1b5e2688b94bfe6a9c6cf55a839580e81e68..e9ee463b37ebc61d01fe1ceccbb6a280e33fd268 100644
|
||||
--- a/content/browser/renderer_host/render_widget_host_view_base.cc
|
||||
+++ b/content/browser/renderer_host/render_widget_host_view_base.cc
|
||||
@@ -654,6 +654,13 @@ void RenderWidgetHostViewBase::OnFrameTokenChangedForView(
|
||||
host()->DidProcessFrame(frame_token, activation_time);
|
||||
}
|
||||
|
||||
+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 c93e93d13f1013641709f5808bc1c66ea772d082..db5234cd13819d14b737aec3315e77e420e01603 100644
|
||||
--- a/content/browser/renderer_host/render_widget_host_view_base.h
|
||||
+++ b/content/browser/renderer_host/render_widget_host_view_base.h
|
||||
@@ -30,6 +30,8 @@
|
||||
#include "components/viz/common/surfaces/scoped_surface_id_allocator.h"
|
||||
#include "components/viz/common/surfaces/surface_id.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/public/browser/render_frame_metadata_provider.h"
|
||||
#include "content/public/browser/render_widget_host.h"
|
||||
@@ -73,11 +75,13 @@ namespace content {
|
||||
class DevicePosturePlatformProvider;
|
||||
class MouseWheelPhaseHandler;
|
||||
class RenderWidgetHostImpl;
|
||||
+class RenderWidgetHostViewGuest;
|
||||
class ScopedViewTransitionResources;
|
||||
class TextInputManager;
|
||||
class TouchSelectionControllerClientManager;
|
||||
class TouchSelectionControllerInputObserver;
|
||||
class WebContentsAccessibility;
|
||||
+class WebContentsView;
|
||||
class DelegatedFrameHost;
|
||||
class SyntheticGestureTarget;
|
||||
|
||||
@@ -151,6 +155,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
|
||||
void ProcessGestureEvent(const blink::WebGestureEvent& event,
|
||||
const ui::LatencyInfo& latency) override;
|
||||
RenderWidgetHostViewBase* GetRootView() override;
|
||||
+ virtual RenderWidgetHostViewBase* CreateViewForWidget(
|
||||
+ RenderWidgetHost* render_widget_host,
|
||||
+ RenderWidgetHost* embedder_render_widget_host,
|
||||
+ WebContentsView* web_contents_view);
|
||||
void OnAutoscrollStart() override;
|
||||
const viz::DisplayHitTestQueryMap& GetDisplayHitTestQuery() const override;
|
||||
|
||||
@@ -199,6 +207,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
|
||||
void NotifyContextMenuInsetsObservers(const gfx::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(
|
||||
Reference in New Issue
Block a user