From 6b35497375c07c49cca7317a4452acc6adc7a1cd Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 1 Feb 2018 12:19:37 +0100 Subject: Basic adaptations for 65-based MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I121b14d6a44e80f5eea4b159c58f7010d472926e Reviewed-by: Michael Brüning --- src/core/render_widget_host_view_qt.cpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'src/core/render_widget_host_view_qt.cpp') diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp index a9e2f2ccb..2d42dc11c 100644 --- a/src/core/render_widget_host_view_qt.cpp +++ b/src/core/render_widget_host_view_qt.cpp @@ -316,7 +316,7 @@ bool isAccessibilityEnabled() { return accessibility_enabled; } -RenderWidgetHostViewQt::RenderWidgetHostViewQt(content::RenderWidgetHost* widget) +RenderWidgetHostViewQt::RenderWidgetHostViewQt(content::RenderWidgetHost *widget) : m_host(content::RenderWidgetHostImpl::From(widget)) , m_gestureProvider(QtGestureProviderConfig(), this) , m_sendMotionActionDown(false) @@ -408,7 +408,7 @@ void RenderWidgetHostViewQt::InitAsFullscreen(content::RenderWidgetHostView*) { } -content::RenderWidgetHost* RenderWidgetHostViewQt::GetRenderWidgetHost() const +content::RenderWidgetHostImpl* RenderWidgetHostViewQt::GetRenderWidgetHostImpl() const { return m_host; } @@ -750,6 +750,11 @@ void RenderWidgetHostViewQt::SubmitCompositorFrame(const viz::LocalSurfaceId &lo m_chromiumCompositorData->frameDevicePixelRatio = frame.metadata.device_scale_factor; m_chromiumCompositorData->frameData = std::move(frame); + // Force to process swap messages + uint32_t frame_token = frame.metadata.frame_token; + if (frame_token) + OnFrameTokenChangedForView(frame_token); + // Support experimental.viewport.devicePixelRatio, see GetScreenInfo implementation below. float dpiScale = this->dpiScale(); if (dpiScale != 0 && dpiScale != 1) @@ -1718,5 +1723,13 @@ ui::TextInputType RenderWidgetHostViewQt::getTextInputType() const return ui::TEXT_INPUT_TYPE_NONE; } +void RenderWidgetHostViewQt::SetWantsAnimateOnlyBeginFrames() +{ +} + +viz::SurfaceId RenderWidgetHostViewQt::GetCurrentSurfaceId() const +{ + return viz::SurfaceId(); +} } // namespace QtWebEngineCore -- cgit v1.2.3