260933601e
* chore: remove check_for_unit_to_activate_before_notifying_about_success.patch
This is already in 134.0.6998.23, we do not need to cherry-pick it
Xref: 6110782
* chore: e patches all
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 fc70d927f9692334607c178510c6181136c22a8c..04ac54d309e076124a672bbeace285626a0a56e4 100644
|
|
--- a/content/browser/renderer_host/render_widget_host_view_base.cc
|
|
+++ b/content/browser/renderer_host/render_widget_host_view_base.cc
|
|
@@ -643,6 +643,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 deb5325b14ef849be118f0e82a9d1fedc9f1541a..c5c22e6266436d992f7fc67f930f17052ac5b6df 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;
|
|
|
|
@@ -146,6 +151,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;
|
|
|
|
@@ -183,6 +192,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(
|