diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-25 15:33:01 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-25 14:41:02 +0000 |
| commit | 448478729cfdf5098dd24a6a870bacdbcd8cf9a7 (patch) | |
| tree | 546386ed2957dfc39725180a992191745dbef177 /src/core/render_widget_host_view_qt.h | |
| parent | 5ab157588214bfbbc1d1f258a461b1cab4cc3991 (diff) | |
Adaptations for Chromium 62
Change-Id: I49cd3c419d4dd1180144c3c07bdd9a628ab73caa
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'src/core/render_widget_host_view_qt.h')
| -rw-r--r-- | src/core/render_widget_host_view_qt.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/core/render_widget_host_view_qt.h b/src/core/render_widget_host_view_qt.h index 1ac32456a..16b0aa573 100644 --- a/src/core/render_widget_host_view_qt.h +++ b/src/core/render_widget_host_view_qt.h @@ -43,8 +43,8 @@ #include "render_widget_host_view_qt_delegate.h" #include "base/memory/weak_ptr.h" -#include "cc/scheduler/begin_frame_source.h" -#include "cc/resources/transferable_resource.h" +#include "components/viz/common/frame_sinks/begin_frame_source.h" +#include "components/viz/common/resources/transferable_resource.h" #include "content/browser/accessibility/browser_accessibility_manager.h" #include "content/browser/renderer_host/render_widget_host_view_base.h" #include "content/browser/renderer_host/text_input_manager.h" @@ -102,7 +102,7 @@ class RenderWidgetHostViewQt , public ui::GestureProviderClient , public RenderWidgetHostViewQtDelegateClient , public base::SupportsWeakPtr<RenderWidgetHostViewQt> - , public cc::BeginFrameObserverBase + , public viz::BeginFrameObserverBase #ifndef QT_NO_ACCESSIBILITY , public QAccessible::ActivationObserver #endif // QT_NO_ACCESSIBILITY @@ -151,7 +151,7 @@ public: void Destroy() override; void SetTooltipText(const base::string16 &tooltip_text) override; bool HasAcceleratedSurface(const gfx::Size&) override; - void DidCreateNewRendererCompositorFrameSink(cc::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink) override; + void DidCreateNewRendererCompositorFrameSink(viz::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink) override; void SubmitCompositorFrame(const viz::LocalSurfaceId&, cc::CompositorFrame) override; void WheelEventAck(const blink::WebMouseWheelEvent &event, content::InputEventAckState ack_result) override; @@ -180,7 +180,7 @@ public: void OnTextSelectionChanged(content::TextInputManager *text_input_manager, RenderWidgetHostViewBase *updated_view) override; // cc::BeginFrameObserverBase implementation. - bool OnBeginFrameDerivedImpl(const cc::BeginFrameArgs& args) override; + bool OnBeginFrameDerivedImpl(const viz::BeginFrameArgs& args) override; void OnBeginFrameSourcePausedChanged(bool paused) override; void handleMouseEvent(QMouseEvent*); @@ -243,14 +243,14 @@ private: std::unique_ptr<RenderWidgetHostViewQtDelegate> m_delegate; QExplicitlySharedDataPointer<ChromiumCompositorData> m_chromiumCompositorData; - std::vector<cc::ReturnedResource> m_resourcesToRelease; + std::vector<viz::ReturnedResource> m_resourcesToRelease; bool m_needsDelegatedFrameAck; LoadVisuallyCommittedState m_loadVisuallyCommittedState; QMetaObject::Connection m_adapterClientDestroyedConnection; WebContentsAdapterClient *m_adapterClient; MultipleMouseClickHelper m_clickHelper; - cc::mojom::CompositorFrameSinkClient *m_rendererCompositorFrameSink; + viz::mojom::CompositorFrameSinkClient *m_rendererCompositorFrameSink; bool m_imeInProgress; bool m_receivedEmptyImeText; @@ -258,7 +258,7 @@ private: bool m_initPending; - std::unique_ptr<cc::SyntheticBeginFrameSource> m_beginFrameSource; + std::unique_ptr<viz::SyntheticBeginFrameSource> m_beginFrameSource; bool m_needsBeginFrames; bool m_addedFrameObserver; |