path: root/src/core/delegated_frame_node.h
diff options
authorArvid Nilsson <>2013-12-13 15:57:26 +0100
committerThe Qt Project <>2014-01-31 17:31:13 +0100
commita4b0e2183c23c0173167833c75f0e2970f3ab524 (patch)
tree43d60fee79115c6634991696e3db1c152eafcc4a /src/core/delegated_frame_node.h
parentf55df93be18e990d6f8daf7f691c75303c57ad5f (diff)
Quick: Support reparenting
To support reparenting, we make the compositing surface independent of the window by using gfx::TEXTURE_TRANSPORT. We also need to be able to keep frame data across window changes so we can reconstruct the QSGNode tree in a new context, so extract that data into DelegatedFrameNodeData class. Any context-specific data is still stored in DelegatedFrameNode. Also hook up window changes to WebContents::WasShown/Hidden for Quick. Remove checking of Qt isVisible state, this mechanism is used to sync Chromium with Qt, not the other way around. WasShown/Hidden is orthogonal to Show/Hide, and can use different triggers. However for Widgets it probably makes sense to hook both up to widget visibility. Change-Id: I1ef4b50cd61b8e54b791e03f0b41929c42fec8bf Reviewed-by: Jocelyn Turcotte <>
Diffstat (limited to 'src/core/delegated_frame_node.h')
1 files changed, 12 insertions, 2 deletions
diff --git a/src/core/delegated_frame_node.h b/src/core/delegated_frame_node.h
index b73370874..2a4ae53d0 100644
--- a/src/core/delegated_frame_node.h
+++ b/src/core/delegated_frame_node.h
@@ -42,9 +42,11 @@
+#include "base/memory/scoped_ptr.h"
#include "cc/resources/transferable_resource.h"
#include <QMutex>
#include <QSGNode>
+#include <QSharedData>
#include <QSharedPointer>
#include <QWaitCondition>
@@ -61,17 +63,25 @@ class DelegatedFrameData;
class MailboxTexture;
class RenderPassTexture;
+// Separating this data allows another DelegatedFrameNode to reconstruct the QSGNode tree from the mailbox textures
+// and render pass information.
+class DelegatedFrameNodeData : public QSharedData {
+ QHash<unsigned, QSharedPointer<MailboxTexture> > mailboxTextures;
+ scoped_ptr<cc::DelegatedFrameData> frameData;
class DelegatedFrameNode : public QSGNode {
DelegatedFrameNode(QQuickWindow *window);
void preprocess();
- void commit(cc::DelegatedFrameData *frameData, cc::TransferableResourceArray *resourcesToRelease);
+ void commit(DelegatedFrameNodeData* data, cc::ReturnedResourceArray *resourcesToRelease);
+ QExplicitlySharedDataPointer<DelegatedFrameNodeData> m_data;
QQuickWindow *m_window;
QList<QSharedPointer<RenderPassTexture> > m_renderPassTextures;
- QMap<int, QSharedPointer<MailboxTexture> > m_mailboxTextures;
int m_numPendingSyncPoints;
QWaitCondition m_mailboxesFetchedWaitCond;
QMutex m_mutex;