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 <jocelyn.turcotte@digia.com>

1 files changed, 6 insertions, 12 deletions

diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
index 8d0f5f0cc..9a983a2b7 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
+++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
@@ -48,21 +48,21 @@ RenderWidgetHostViewQtDelegateQuick::RenderWidgetHostViewQtDelegateQuick(RenderW
     setFlag(ItemHasContents);
 }
 
-WId RenderWidgetHostViewQtDelegateQuick::nativeWindowIdForCompositor() const
+void RenderWidgetHostViewQtDelegateQuick::update(const QRect&)
 {
-    return QQuickItem::window() ? QQuickItem::window()->winId() : 0;
+    QQuickItem::update();
 }
 
-void RenderWidgetHostViewQtDelegateQuick::update(const QRect&)
+bool RenderWidgetHostViewQtDelegateQuick::supportsHardwareAcceleration() const
 {
-    QQuickItem::update();
+    return true;
 }
 
 void RenderWidgetHostViewQtDelegateQuick::itemChange(ItemChange change, const ItemChangeData &value)
 {
     QQuickItem::itemChange(change, value);
-    if (change == QQuickItem::ItemSceneChange && value.window)
-        m_client->compositingSurfaceUpdated();
+    if (change == QQuickItem::ItemSceneChange)
+        m_client->windowChanged();
 }
 
 QSGNode *RenderWidgetHostViewQtDelegateQuick::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
@@ -76,12 +76,6 @@ RenderWidgetHostViewQtDelegateQuickPainted::RenderWidgetHostViewQtDelegateQuickP
 {
 }
 
-WId RenderWidgetHostViewQtDelegateQuickPainted::nativeWindowIdForCompositor() const
-{
-    // This causes a failure of the compositor initialization which ends up disabling it completely.
-    return 0;
-}
-
 void RenderWidgetHostViewQtDelegateQuickPainted::update(const QRect& rect)
 {
     polish();