From 917f862ebfd0a1797786c7c663acb83ff9144cde Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Wed, 5 Apr 2017 16:25:06 +0200
Subject: Adaptations for Chromium 57

Change-Id: Ia2756c1e9b13839c2330bd98cf953d47cbdac0dd
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
---
 src/core/delegated_frame_node.h | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'src/core/delegated_frame_node.h')

diff --git a/src/core/delegated_frame_node.h b/src/core/delegated_frame_node.h
index 6178bd232..0c826663a 100644
--- a/src/core/delegated_frame_node.h
+++ b/src/core/delegated_frame_node.h
@@ -40,6 +40,7 @@
 #ifndef DELEGATED_FRAME_NODE_H
 #define DELEGATED_FRAME_NODE_H
 
+#include "cc/output/compositor_frame.h"
 #include "cc/quads/render_pass.h"
 #include "cc/resources/transferable_resource.h"
 #include "gpu/command_buffer/service/sync_point_manager.h"
@@ -58,10 +59,6 @@ QT_BEGIN_NAMESPACE
 class QSGLayer;
 QT_END_NAMESPACE
 
-namespace cc {
-class DelegatedFrameData;
-}
-
 namespace QtWebEngineCore {
 
 class MailboxTexture;
@@ -73,8 +70,8 @@ class ChromiumCompositorData : public QSharedData {
 public:
     ChromiumCompositorData() : frameDevicePixelRatio(1) { }
     QHash<unsigned, QSharedPointer<ResourceHolder> > resourceHolders;
-    std::unique_ptr<cc::DelegatedFrameData> frameData;
-    std::unique_ptr<cc::DelegatedFrameData> previousFrameData;
+    cc::CompositorFrame frameData;
+    cc::CompositorFrame previousFrameData;
     qreal frameDevicePixelRatio;
 };
 
@@ -97,7 +94,7 @@ private:
 
     QExplicitlySharedDataPointer<ChromiumCompositorData> m_chromiumCompositorData;
     struct SGObjects {
-        QVector<QPair<cc::RenderPassId, QSharedPointer<QSGLayer> > > renderPassLayers;
+        QVector<QPair<int, QSharedPointer<QSGLayer> > > renderPassLayers;
         QVector<QSharedPointer<QSGRootNode> > renderPassRootNodes;
         QVector<QSharedPointer<QSGTexture> > textureStrongRefs;
     } m_sgObjects;
-- 
cgit v1.2.3