From a4b0e2183c23c0173167833c75f0e2970f3ab524 Mon Sep 17 00:00:00 2001 From: Arvid Nilsson Date: Fri, 13 Dec 2013 15:57:26 +0100 Subject: 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 --- .../auto/quick/qquickwebviewgraphics/tst_qquickwebviewgraphics.cpp | 6 ------ 1 file changed, 6 deletions(-) (limited to 'tests/auto/quick/qquickwebviewgraphics') diff --git a/tests/auto/quick/qquickwebviewgraphics/tst_qquickwebviewgraphics.cpp b/tests/auto/quick/qquickwebviewgraphics/tst_qquickwebviewgraphics.cpp index a88389c58..4411107c4 100644 --- a/tests/auto/quick/qquickwebviewgraphics/tst_qquickwebviewgraphics.cpp +++ b/tests/auto/quick/qquickwebviewgraphics/tst_qquickwebviewgraphics.cpp @@ -142,12 +142,6 @@ void tst_QQuickWebViewGraphics::renderAfterNodeCleanup() // Do it twice in a row, if the window isn't visible, the scene graph is going to be trashed by QQuickWindow::grabWindow after the first render. QVERIFY(!m_view->isVisible()); QCOMPARE(m_view->grabWindow(), get150x150GreenReferenceImage()); - -#if !defined(TST_QQUICKWEBVIEWGRAPHICS_SOFTWARE) - QEXPECT_FAIL("", "FIXME: This isn't working properly yet, QQuickWindow::grab() destroys the DelegatedFrameNode after it's done." - " There might be a way to trigger a repaint in Chromium, or we might have to prevent the destruction of our node tree.", Continue); -#endif - QCOMPARE(m_view->grabWindow(), get150x150GreenReferenceImage()); } -- cgit v1.2.3