Adaptations to Chromium 53

Change-Id: I15053486edfd42ee607250b4f14fb6eaa325c959
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

1 files changed, 8 insertions, 13 deletions

diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
index a018788c1..77fd55aab 100644
--- a/src/core/render_widget_host_view_qt.cpp
+++ b/src/core/render_widget_host_view_qt.cpp
@@ -655,19 +655,19 @@ void RenderWidgetHostViewQt::UnlockCompositingSurface()
 {
 }
 
-void RenderWidgetHostViewQt::OnSwapCompositorFrame(uint32_t output_surface_id, std::unique_ptr<cc::CompositorFrame> frame)
+void RenderWidgetHostViewQt::OnSwapCompositorFrame(uint32_t output_surface_id, cc::CompositorFrame frame)
 {
-    bool scrollOffsetChanged = (m_lastScrollOffset != frame->metadata.root_scroll_offset);
-    bool contentsSizeChanged = (m_lastContentsSize != frame->metadata.root_layer_size);
-    m_lastScrollOffset = frame->metadata.root_scroll_offset;
-    m_lastContentsSize = frame->metadata.root_layer_size;
+    bool scrollOffsetChanged = (m_lastScrollOffset != frame.metadata.root_scroll_offset);
+    bool contentsSizeChanged = (m_lastContentsSize != frame.metadata.root_layer_size);
+    m_lastScrollOffset = frame.metadata.root_scroll_offset;
+    m_lastContentsSize = frame.metadata.root_layer_size;
     Q_ASSERT(!m_needsDelegatedFrameAck);
     m_needsDelegatedFrameAck = true;
     m_pendingOutputSurfaceId = output_surface_id;
-    Q_ASSERT(frame->delegated_frame_data);
+    Q_ASSERT(frame.delegated_frame_data);
     Q_ASSERT(!m_chromiumCompositorData->frameData || m_chromiumCompositorData->frameData->resource_list.empty());
-    m_chromiumCompositorData->frameData = std::move(frame->delegated_frame_data);
-    m_chromiumCompositorData->frameDevicePixelRatio = frame->metadata.device_scale_factor;
+    m_chromiumCompositorData->frameData = std::move(frame.delegated_frame_data);
+    m_chromiumCompositorData->frameDevicePixelRatio = frame.metadata.device_scale_factor;
 
     // Support experimental.viewport.devicePixelRatio, see GetScreenInfo implementation below.
     float dpiScale = this->dpiScale();
@@ -711,11 +711,6 @@ void RenderWidgetHostViewQt::ClearCompositorFrame()
 {
 }
 
-bool RenderWidgetHostViewQt::GetScreenColorProfile(std::vector<char>*)
-{
-    return false;
-}
-
 void RenderWidgetHostViewQt::SelectionChanged(const base::string16 &text, size_t offset, const gfx::Range &range)
 {
     content::RenderWidgetHostViewBase::SelectionChanged(text, offset, range);