From 2e0653699ca849714cfe1481068b02539df46cd5 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 19 Sep 2017 13:43:03 +0200 Subject: Adaptations to 61-based Change-Id: I5cb198445f283c6cea8187a1a2883896df0ee918 Reviewed-by: Michal Klocek --- src/core/render_widget_host_view_qt.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src/core/render_widget_host_view_qt.h') diff --git a/src/core/render_widget_host_view_qt.h b/src/core/render_widget_host_view_qt.h index 0db5df862..59e21b853 100644 --- a/src/core/render_widget_host_view_qt.h +++ b/src/core/render_widget_host_view_qt.h @@ -150,15 +150,14 @@ public: void Destroy() override; void SetTooltipText(const base::string16 &tooltip_text) override; bool HasAcceleratedSurface(const gfx::Size&) override; - void DidCreateNewRendererCompositorFrameSink(cc::mojom::MojoCompositorFrameSinkClient*) override; - void SubmitCompositorFrame(const cc::LocalSurfaceId&, cc::CompositorFrame) override; + void DidCreateNewRendererCompositorFrameSink(cc::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink) override; + void SubmitCompositorFrame(const viz::LocalSurfaceId&, cc::CompositorFrame) override; void GetScreenInfo(content::ScreenInfo* results); gfx::Rect GetBoundsInRootWindow() override; void ProcessAckedTouchEvent(const content::TouchEventWithLatencyInfo &touch, content::InputEventAckState ack_result) override; void ClearCompositorFrame() override; void SetNeedsBeginFrames(bool needs_begin_frames) override; - void OnSetNeedsFlushInput() override; // Overridden from ui::GestureProviderClient. void OnGestureEvent(const ui::GestureEventData& gesture) override; @@ -239,14 +238,14 @@ private: std::unique_ptr m_delegate; QExplicitlySharedDataPointer m_chromiumCompositorData; - cc::ReturnedResourceArray m_resourcesToRelease; + std::vector m_resourcesToRelease; bool m_needsDelegatedFrameAck; LoadVisuallyCommittedState m_loadVisuallyCommittedState; QMetaObject::Connection m_adapterClientDestroyedConnection; WebContentsAdapterClient *m_adapterClient; MultipleMouseClickHelper m_clickHelper; - cc::mojom::MojoCompositorFrameSinkClient *m_rendererCompositorFrameSink; + cc::mojom::CompositorFrameSinkClient *m_rendererCompositorFrameSink; bool m_imeInProgress; bool m_receivedEmptyImeText; @@ -256,13 +255,12 @@ private: std::unique_ptr m_beginFrameSource; bool m_needsBeginFrames; - bool m_needsFlushInput; bool m_addedFrameObserver; gfx::Vector2dF m_lastScrollOffset; gfx::SizeF m_lastContentsSize; SkColor m_backgroundColor; - cc::LocalSurfaceId m_localSurfaceId; + viz::LocalSurfaceId m_localSurfaceId; uint m_imState; int m_anchorPositionWithinSelection; -- cgit v1.2.3