1 files changed, 25 insertions, 12 deletions

diff --git a/src/core/delegated_frame_node.h b/src/core/delegated_frame_node.h
index a031a464f..b866c94b4 100644
--- a/src/core/delegated_frame_node.h
+++ b/src/core/delegated_frame_node.h
@@ -38,6 +38,7 @@
 #define DELEGATED_FRAME_NODE_H
 
 #include "base/memory/scoped_ptr.h"
+#include "cc/quads/render_pass.h"
 #include "cc/resources/transferable_resource.h"
 #include <QMutex>
 #include <QSGNode>
@@ -46,20 +47,25 @@
 #include <QWaitCondition>
 
 #include "chromium_gpu_helper.h"
+#include "render_widget_host_view_qt_delegate.h"
+
+QT_BEGIN_NAMESPACE
+class QSGLayer;
+QT_END_NAMESPACE
 
 namespace cc {
 class DelegatedFrameData;
 }
 
 class MailboxTexture;
-class RenderPassTexture;
+class ResourceHolder;
 
 // Separating this data allows another DelegatedFrameNode to reconstruct the QSGNode tree from the mailbox textures
 // and render pass information.
-class DelegatedFrameNodeData : public QSharedData {
+class ChromiumCompositorData : public QSharedData {
 public:
-    DelegatedFrameNodeData() : frameDevicePixelRatio(1) { }
-    QHash<unsigned, QSharedPointer<MailboxTexture> > mailboxTextures;
+    ChromiumCompositorData() : frameDevicePixelRatio(1) { }
+    QHash<unsigned, QSharedPointer<ResourceHolder> > resourceHolders;
     scoped_ptr<cc::DelegatedFrameData> frameData;
     qreal frameDevicePixelRatio;
 };
@@ -69,20 +75,27 @@ public:
     DelegatedFrameNode();
     ~DelegatedFrameNode();
     void preprocess();
-    void commit(DelegatedFrameNodeData* data, cc::ReturnedResourceArray *resourcesToRelease);
+    void commit(ChromiumCompositorData *chromiumCompositorData, cc::ReturnedResourceArray *resourcesToRelease, RenderWidgetHostViewQtDelegate *apiDelegate);
 
 private:
-    QExplicitlySharedDataPointer<DelegatedFrameNodeData> m_data;
-    QList<QSharedPointer<RenderPassTexture> > m_renderPassTextures;
-    int m_numPendingSyncPoints;
-    QMap<uint32, gfx::TransferableFence> m_mailboxGLFences;
-    QWaitCondition m_mailboxesFetchedWaitCond;
-    QMutex m_mutex;
-
     // Making those callbacks static bypasses base::Bind's ref-counting requirement
     // of the this pointer when the callback is a method.
     static void fetchTexturesAndUnlockQt(DelegatedFrameNode *frameNode, QList<MailboxTexture *> *mailboxesToFetch);
     static void syncPointRetired(DelegatedFrameNode *frameNode, QList<MailboxTexture *> *mailboxesToFetch);
+
+    ResourceHolder *findAndHoldResource(unsigned resourceId, QHash<unsigned, QSharedPointer<ResourceHolder> > &candidates);
+    QSGTexture *initAndHoldTexture(ResourceHolder *resource, bool quadIsAllOpaque, RenderWidgetHostViewQtDelegate *apiDelegate = 0);
+
+    QExplicitlySharedDataPointer<ChromiumCompositorData> m_chromiumCompositorData;
+    struct SGObjects {
+        QList<QPair<cc::RenderPass::Id, QSharedPointer<QSGLayer> > > renderPassLayers;
+        QList<QSharedPointer<QSGRootNode> > renderPassRootNodes;
+        QList<QSharedPointer<QSGTexture> > textureStrongRefs;
+    } m_sgObjects;
+    int m_numPendingSyncPoints;
+    QMap<uint32, gfx::TransferableFence> m_mailboxGLFences;
+    QWaitCondition m_mailboxesFetchedWaitCond;
+    QMutex m_mutex;
 };
 
 #endif // DELEGATED_FRAME_NODE_H