diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-02 10:14:57 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-02 09:12:55 +0000 |
commit | 7fb329705494f0cd2448ab1b9d72223e6dbc20b0 (patch) | |
tree | 3b138ce05ec5428af371a098f6b7034634d510e7 /src/webengine | |
parent | 3257ab9ce01b01b667237fd6ad33512739db5b01 (diff) |
Cleanup scenegraph integration
Get rid of old QSG type names, and also remove redundant setupTiledNode
call.
Change-Id: Ifbd83f6bdc0e029eb52899b20562ef6606f5562b
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'src/webengine')
4 files changed, 10 insertions, 10 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 3d539f8b2..baece82f3 100644 --- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp +++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp @@ -177,13 +177,13 @@ QSGLayer *RenderWidgetHostViewQtDelegateQuick::createLayer() return renderContext->sceneGraphContext()->createLayer(renderContext); } -QSGInternalImageNode *RenderWidgetHostViewQtDelegateQuick::createImageNode() +QSGInternalImageNode *RenderWidgetHostViewQtDelegateQuick::createInternalImageNode() { QSGRenderContext *renderContext = QQuickWindowPrivate::get(QQuickItem::window())->context; return renderContext->sceneGraphContext()->createInternalImageNode(); } -QSGTextureNode *RenderWidgetHostViewQtDelegateQuick::createTextureNode() +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 a5101d070..74cddf476 100644 --- a/src/webengine/render_widget_host_view_qt_delegate_quick.h +++ b/src/webengine/render_widget_host_view_qt_delegate_quick.h @@ -66,8 +66,8 @@ public: QWindow* window() const override; QSGTexture *createTextureFromImage(const QImage &) override; QSGLayer *createLayer() override; - QSGInternalImageNode *createImageNode() override; - QSGTextureNode *createTextureNode() override; + QSGInternalImageNode *createInternalImageNode() override; + QSGImageNode *createImageNode() override; QSGRectangleNode *createRectangleNode() override; void update() override; void updateCursor(const QCursor &) 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 7b7d32d67..dd37ff6fa 100644 --- a/src/webengine/render_widget_host_view_qt_delegate_quickwindow.cpp +++ b/src/webengine/render_widget_host_view_qt_delegate_quickwindow.cpp @@ -111,14 +111,14 @@ QSGLayer *RenderWidgetHostViewQtDelegateQuickWindow::createLayer() return m_realDelegate->createLayer(); } -QSGInternalImageNode *RenderWidgetHostViewQtDelegateQuickWindow::createImageNode() +QSGInternalImageNode *RenderWidgetHostViewQtDelegateQuickWindow::createInternalImageNode() { - return m_realDelegate->createImageNode(); + return m_realDelegate->createInternalImageNode(); } -QSGTextureNode *RenderWidgetHostViewQtDelegateQuickWindow::createTextureNode() +QSGImageNode *RenderWidgetHostViewQtDelegateQuickWindow::createImageNode() { - return m_realDelegate->createTextureNode(); + return m_realDelegate->createImageNode(); } QSGRectangleNode *RenderWidgetHostViewQtDelegateQuickWindow::createRectangleNode() 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 be4033728..6a1be8b7f 100644 --- a/src/webengine/render_widget_host_view_qt_delegate_quickwindow.h +++ b/src/webengine/render_widget_host_view_qt_delegate_quickwindow.h @@ -69,8 +69,8 @@ public: QWindow* window() const override; QSGTexture *createTextureFromImage(const QImage &) override; QSGLayer *createLayer() override; - QSGInternalImageNode *createImageNode() override; - QSGTextureNode *createTextureNode() override; + QSGInternalImageNode *createInternalImageNode() override; + QSGImageNode *createImageNode() override; QSGRectangleNode *createRectangleNode() override; void update() override; void updateCursor(const QCursor &) override; |