49078100f4
* chore: bump chromium in DEPS to 133.0.6943.16 * chore: bump chromium in DEPS to 133.0.6943.27 * chore: bump chromium in DEPS to 133.0.6943.35 * chore: bump chromium to 134.0.6968.0 cherry picked from 75eac86506da4fd87aa7ec36478d5c196b988d4f --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
76 lines
3.7 KiB
Diff
76 lines
3.7 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 51f836176bf924de5fc26081d8b968f918181947..641a9c7fa68328e868167cf2fcdfec01643fea18 100644
|
|
--- a/content/browser/renderer_host/render_widget_host_view_base.cc
|
|
+++ b/content/browser/renderer_host/render_widget_host_view_base.cc
|
|
@@ -639,6 +639,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 2a2edc6063b49a313fb359e99b39cf608c6233d1..96e6777899154e73661fb17184b9727cce2eb0a3 100644
|
|
--- a/content/browser/renderer_host/render_widget_host_view_base.h
|
|
+++ b/content/browser/renderer_host/render_widget_host_view_base.h
|
|
@@ -29,8 +29,11 @@
|
|
#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"
|
|
#include "content/public/browser/render_widget_host_view.h"
|
|
#include "content/public/common/page_visibility_state.h"
|
|
#include "content/public/common/widget_type.h"
|
|
@@ -70,11 +73,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;
|
|
|
|
@@ -145,6 +150,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;
|
|
|
|
@@ -182,6 +191,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
|
|
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(
|