From e63b35763907304089d961bc3e284178d36c69a3 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 17 Oct 2018 17:51:50 +0200 Subject: Adaptations for Chromium 70 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8bb77784dbc8a0b9debd96a4c49421bd34e6a0df Reviewed-by: Michael Brüning Reviewed-by: Peter Varga Reviewed-by: Jüri Valdmann --- src/core/compositor/compositor.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/core/compositor/compositor.h') diff --git a/src/core/compositor/compositor.h b/src/core/compositor/compositor.h index b025f901d..5efe419cc 100644 --- a/src/core/compositor/compositor.h +++ b/src/core/compositor/compositor.h @@ -54,6 +54,9 @@ QT_BEGIN_NAMESPACE class QSGNode; QT_END_NAMESPACE +namespace content { +class RenderWidgetHost; +} namespace viz { struct ReturnedResource; namespace mojom { @@ -64,7 +67,6 @@ class CompositorFrameSinkClient; namespace QtWebEngineCore { class CompositorResourceTracker; -class RenderWidgetHostViewQt; class RenderWidgetHostViewQtDelegate; // Receives viz::CompositorFrames from child compositors and provides QSGNodes @@ -88,7 +90,7 @@ class RenderWidgetHostViewQtDelegate; class Compositor final : private viz::BeginFrameObserverBase { public: - explicit Compositor(RenderWidgetHostViewQt *hostView); + explicit Compositor(content::RenderWidgetHost *host); ~Compositor() override; void setFrameSinkClient(viz::mojom::CompositorFrameSinkClient *frameSinkClient); @@ -110,7 +112,7 @@ private: viz::CompositorFrame m_pendingFrame; base::OnceClosure m_submitCallback; std::unique_ptr m_resourceTracker; - RenderWidgetHostViewQt *m_view; + content::RenderWidgetHost *m_host; std::unique_ptr m_beginFrameSource; viz::mojom::CompositorFrameSinkClient *m_frameSinkClient = nullptr; bool m_updatePaintNodeShouldCommit = false; -- cgit v1.2.3