Remove usage of QSGInternalImageNode

Since 1f01b44d20471a7f4a5029a4c0049e8296749fef landed in qtdeclarative,
the internal API createInternalImageNode() takes one required argument.
However due to the following commit in qtdeclarative
cf24651b550752fbf9bd3afb02aee5d722164658 we no longer need to use
internal image nodes.

Remove their usage, and use the regular image nodes instead.

Change-Id: Ie0cc2a2c1e365bb7fae564ad3c9d880c3a0bf0d9
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

8 files changed, 6 insertions, 33 deletions

diff --git a/src/core/compositor/delegated_frame_node.cpp b/src/core/compositor/delegated_frame_node.cpp
index dc67b03e2..19e8d1b82 100644
--- a/src/core/compositor/delegated_frame_node.cpp
+++ b/src/core/compositor/delegated_frame_node.cpp
@@ -195,12 +195,10 @@ public:
     {
         Q_ASSERT(layer);
         Q_ASSERT(m_nodeIterator != m_sceneGraphNodes->end());
-        QSGInternalImageNode *imageNode = static_cast<QSGInternalImageNode*>(*m_nodeIterator++);
-        imageNode->setTargetRect(rect);
-        imageNode->setInnerTargetRect(rect);
-        imageNode->setSubSourceRect(layer->convertToNormalizedSourceRect(sourceRect));
+        QSGImageNode *imageNode = static_cast<QSGImageNode*>(*m_nodeIterator++);
+        imageNode->setRect(rect);
+        imageNode->setSourceRect(sourceRect);
         imageNode->setTexture(layer);
-        imageNode->update();
     }
 
     void setupTextureContentNode(QSGTexture *texture, const QRect &rect, const QRectF &sourceRect,
@@ -281,13 +279,10 @@ public:
                              QSGNode *layerChain) override
     {
         Q_ASSERT(layer);
-        // Only QSGInternalImageNode currently supports QSGLayer textures.
-        QSGInternalImageNode *imageNode = m_apiDelegate->createInternalImageNode();
-        imageNode->setTargetRect(rect);
-        imageNode->setInnerTargetRect(rect);
-        imageNode->setSubSourceRect(layer->convertToNormalizedSourceRect(sourceRect));
+        QSGImageNode *imageNode = m_apiDelegate->createImageNode();
+        imageNode->setRect(rect);
+        imageNode->setSourceRect(sourceRect);
         imageNode->setTexture(layer);
-        imageNode->update();
 
         layerChain->appendChildNode(imageNode);
         m_sceneGraphNodes->append(imageNode);
diff --git a/src/core/render_widget_host_view_qt_delegate.h b/src/core/render_widget_host_view_qt_delegate.h
index 6066284d9..4ee790ce9 100644
--- a/src/core/render_widget_host_view_qt_delegate.h
+++ b/src/core/render_widget_host_view_qt_delegate.h
@@ -65,7 +65,6 @@ class QSGTexture;
 class QVariant;
 class QInputMethodEvent;
 
-class QSGInternalImageNode;
 class QSGImageNode;
 
 QT_END_NAMESPACE
@@ -102,7 +101,6 @@ public:
     virtual QWindow* window() const = 0;
     virtual QSGTexture *createTextureFromImage(const QImage &) = 0;
     virtual QSGLayer *createLayer() = 0;
-    virtual QSGInternalImageNode *createInternalImageNode() = 0;
     virtual QSGImageNode *createImageNode() = 0;
     virtual QSGRectangleNode *createRectangleNode() = 0;
     virtual void update() = 0;
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 b636448b3..3a103b9aa 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
+++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
@@ -170,12 +170,6 @@ QSGLayer *RenderWidgetHostViewQtDelegateQuick::createLayer()
     return renderContext->sceneGraphContext()->createLayer(renderContext);
 }
 
-QSGInternalImageNode *RenderWidgetHostViewQtDelegateQuick::createInternalImageNode()
-{
-    QSGRenderContext *renderContext = QQuickWindowPrivate::get(QQuickItem::window())->context;
-    return renderContext->sceneGraphContext()->createInternalImageNode();
-}
-
 QSGImageNode *RenderWidgetHostViewQtDelegateQuick::createImageNode()
 {
     return QQuickItem::window()->createImageNode();
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.h b/src/webengine/render_widget_host_view_qt_delegate_quick.h
index 00158b3ac..b55b2d658 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quick.h
+++ b/src/webengine/render_widget_host_view_qt_delegate_quick.h
@@ -71,7 +71,6 @@ public:
     QWindow* window() const override;
     QSGTexture *createTextureFromImage(const QImage &) override;
     QSGLayer *createLayer() override;
-    QSGInternalImageNode *createInternalImageNode() override;
     QSGImageNode *createImageNode() override;
     QSGRectangleNode *createRectangleNode() override;
     void update() override;
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quickwindow.cpp b/src/webengine/render_widget_host_view_qt_delegate_quickwindow.cpp
index c085aacd7..23b9e02c2 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quickwindow.cpp
+++ b/src/webengine/render_widget_host_view_qt_delegate_quickwindow.cpp
@@ -131,11 +131,6 @@ QSGLayer *RenderWidgetHostViewQtDelegateQuickWindow::createLayer()
     return m_realDelegate->createLayer();
 }
 
-QSGInternalImageNode *RenderWidgetHostViewQtDelegateQuickWindow::createInternalImageNode()
-{
-    return m_realDelegate->createInternalImageNode();
-}
-
 QSGImageNode *RenderWidgetHostViewQtDelegateQuickWindow::createImageNode()
 {
     return m_realDelegate->createImageNode();
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quickwindow.h b/src/webengine/render_widget_host_view_qt_delegate_quickwindow.h
index ab583bd63..bebbfa439 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quickwindow.h
+++ b/src/webengine/render_widget_host_view_qt_delegate_quickwindow.h
@@ -68,7 +68,6 @@ public:
     QWindow* window() const override;
     QSGTexture *createTextureFromImage(const QImage &) override;
     QSGLayer *createLayer() override;
-    QSGInternalImageNode *createInternalImageNode() override;
     QSGImageNode *createImageNode() override;
     QSGRectangleNode *createRectangleNode() override;
     void update() override;
diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
index 817d6e408..85c5c89f4 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
@@ -309,12 +309,6 @@ QSGLayer *RenderWidgetHostViewQtDelegateWidget::createLayer()
     return renderContext->sceneGraphContext()->createLayer(renderContext);
 }
 
-QSGInternalImageNode *RenderWidgetHostViewQtDelegateWidget::createInternalImageNode()
-{
-    QSGRenderContext *renderContext = QQuickWindowPrivate::get(quickWindow())->context;
-    return renderContext->sceneGraphContext()->createInternalImageNode();
-}
-
 QSGImageNode *RenderWidgetHostViewQtDelegateWidget::createImageNode()
 {
     return quickWindow()->createImageNode();
diff --git a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h
index 7746c4405..18f848da5 100644
--- a/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h
+++ b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h
@@ -78,7 +78,6 @@ public:
     QWindow* window() const override;
     QSGTexture *createTextureFromImage(const QImage &) override;
     QSGLayer *createLayer() override;
-    QSGInternalImageNode *createInternalImageNode() override;
     QSGImageNode *createImageNode() override;
     QSGRectangleNode *createRectangleNode() override;
     void update() override;