From f4a8ce98bd371acf1ca1eb2c58a8403e8795a670 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Tue, 19 Dec 2017 12:37:02 +0100
Subject: Adaptations for Chromium 63

Change-Id: I551c7091bbc0463bed94180313eb2bfe92f0ad84
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
---
 src/core/delegated_frame_node.h | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 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 21670e40f..5d967841d 100644
--- a/src/core/delegated_frame_node.h
+++ b/src/core/delegated_frame_node.h
@@ -40,8 +40,9 @@
 #ifndef DELEGATED_FRAME_NODE_H
 #define DELEGATED_FRAME_NODE_H
 
-#include "cc/output/compositor_frame.h"
-#include "cc/quads/render_pass.h"
+#include "base/containers/circular_deque.h"
+#include "components/viz/common/quads/compositor_frame.h"
+#include "components/viz/common/quads/render_pass.h"
 #include "components/viz/common/resources/transferable_resource.h"
 #include "gpu/command_buffer/service/sync_point_manager.h"
 #include "ui/gl/gl_fence.h"
@@ -59,16 +60,16 @@ QT_BEGIN_NAMESPACE
 class QSGLayer;
 QT_END_NAMESPACE
 
-namespace cc {
+namespace gfx {
+class QuadF;
+}
+
+namespace viz {
 class DelegatedFrameData;
 class DrawQuad;
 class DrawPolygon;
 }
 
-namespace gfx {
-class QuadF;
-}
-
 namespace QtWebEngineCore {
 
 class DelegatedNodeTreeHandler;
@@ -81,8 +82,8 @@ class ChromiumCompositorData : public QSharedData {
 public:
     ChromiumCompositorData() : frameDevicePixelRatio(1) { }
     QHash<unsigned, QSharedPointer<ResourceHolder> > resourceHolders;
-    cc::CompositorFrame frameData;
-    cc::CompositorFrame previousFrameData;
+    viz::CompositorFrame frameData;
+    viz::CompositorFrame previousFrameData;
     qreal frameDevicePixelRatio;
 };
 
@@ -94,27 +95,26 @@ public:
     void commit(ChromiumCompositorData *chromiumCompositorData, std::vector<viz::ReturnedResource> *resourcesToRelease, RenderWidgetHostViewQtDelegate *apiDelegate);
 
 private:
-    void flushPolygons(
-        std::deque<std::unique_ptr<cc::DrawPolygon>> *polygonQueue,
+    void flushPolygons(base::circular_deque<std::unique_ptr<viz::DrawPolygon> > *polygonQueue,
         QSGNode *renderPassChain,
         DelegatedNodeTreeHandler *nodeHandler,
         QHash<unsigned, QSharedPointer<ResourceHolder> > &resourceCandidates,
         RenderWidgetHostViewQtDelegate *apiDelegate);
     void handlePolygon(
-        const cc::DrawPolygon *polygon,
+        const viz::DrawPolygon *polygon,
         QSGNode *currentLayerChain,
         DelegatedNodeTreeHandler *nodeHandler,
         QHash<unsigned, QSharedPointer<ResourceHolder> > &resourceCandidates,
         RenderWidgetHostViewQtDelegate *apiDelegate);
     void handleClippedQuad(
-        const cc::DrawQuad *quad,
+        const viz::DrawQuad *quad,
         const gfx::QuadF &clipRegion,
         QSGNode *currentLayerChain,
         DelegatedNodeTreeHandler *nodeHandler,
         QHash<unsigned, QSharedPointer<ResourceHolder> > &resourceCandidates,
         RenderWidgetHostViewQtDelegate *apiDelegate);
     void handleQuad(
-        const cc::DrawQuad *quad,
+        const viz::DrawQuad *quad,
         QSGNode *currentLayerChain,
         DelegatedNodeTreeHandler *nodeHandler,
         QHash<unsigned, QSharedPointer<ResourceHolder> > &resourceCandidates,
@@ -128,8 +128,8 @@ private:
     static void unlockQt(DelegatedFrameNode *frameNode);
 
     ResourceHolder *findAndHoldResource(unsigned resourceId, QHash<unsigned, QSharedPointer<ResourceHolder> > &candidates);
-    void holdResources(const cc::DrawQuad *quad, QHash<unsigned, QSharedPointer<ResourceHolder> > &candidates);
-    void holdResources(const cc::RenderPass *pass, QHash<unsigned, QSharedPointer<ResourceHolder> > &candidates);
+    void holdResources(const viz::DrawQuad *quad, QHash<unsigned, QSharedPointer<ResourceHolder> > &candidates);
+    void holdResources(const viz::RenderPass *pass, QHash<unsigned, QSharedPointer<ResourceHolder> > &candidates);
     QSGTexture *initAndHoldTexture(ResourceHolder *resource, bool quadIsAllOpaque, RenderWidgetHostViewQtDelegate *apiDelegate = 0);
 
     QExplicitlySharedDataPointer<ChromiumCompositorData> m_chromiumCompositorData;
-- 
cgit v1.2.3