From baaab31631dcff6075418c95f0220e8fb207dd50 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Date: Fri, 15 Jul 2016 13:16:24 +0200
Subject: Adaptations to Chromium 52
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Idf8a511ba26d263fd9d014d87d5e1101d706da71
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
---
 src/core/delegated_frame_node.h | 5 ++---
 1 file changed, 2 insertions(+), 3 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 8a37f6b4c..d27138013 100644
--- a/src/core/delegated_frame_node.h
+++ b/src/core/delegated_frame_node.h
@@ -40,7 +40,6 @@
 #ifndef DELEGATED_FRAME_NODE_H
 #define DELEGATED_FRAME_NODE_H
 
-#include "base/memory/scoped_ptr.h"
 #include "cc/quads/render_pass.h"
 #include "cc/resources/transferable_resource.h"
 #include "gpu/command_buffer/service/sync_point_manager.h"
@@ -73,7 +72,7 @@ class ChromiumCompositorData : public QSharedData {
 public:
     ChromiumCompositorData() : frameDevicePixelRatio(1) { }
     QHash<unsigned, QSharedPointer<ResourceHolder> > resourceHolders;
-    scoped_ptr<cc::DelegatedFrameData> frameData;
+    std::unique_ptr<cc::DelegatedFrameData> frameData;
     qreal frameDevicePixelRatio;
 };
 
@@ -104,7 +103,7 @@ private:
     QWaitCondition m_mailboxesFetchedWaitCond;
     QMutex m_mutex;
     QList<gfx::TransferableFence> m_textureFences;
-    scoped_ptr<gpu::SyncPointClient> m_syncPointClient;
+    std::unique_ptr<gpu::SyncPointClient> m_syncPointClient;
 };
 
 } // namespace QtWebEngineCore
-- 
cgit v1.2.3