diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
| commit | 3749d61e1f7a59f5ec5067e560af1eb610c82015 (patch) | |
| tree | 73dc228333948738bbe02976cacca8cd382bc978 /Source/WebKit2/UIProcess/qt/QtWebPageSGNode.cpp | |
| parent | b32b4dcd9a51ab8de6afc53d9e17f8707e1f7a5e (diff) | |
| download | qtwebkit-3749d61e1f7a59f5ec5067e560af1eb610c82015.tar.gz | |
Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 (http://svn.webkit.org/repository/webkit/trunk@125365)
New snapshot with build fixes for latest API changes in Qt and all WK1 Win MSVC fixes upstream
Diffstat (limited to 'Source/WebKit2/UIProcess/qt/QtWebPageSGNode.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/qt/QtWebPageSGNode.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/WebKit2/UIProcess/qt/QtWebPageSGNode.cpp b/Source/WebKit2/UIProcess/qt/QtWebPageSGNode.cpp index 4de77f70a..eb7023990 100644 --- a/Source/WebKit2/UIProcess/qt/QtWebPageSGNode.cpp +++ b/Source/WebKit2/UIProcess/qt/QtWebPageSGNode.cpp @@ -21,7 +21,7 @@ #include "config.h" #include "QtWebPageSGNode.h" -#include "WebLayerTreeRenderer.h" +#include "LayerTreeRenderer.h" #include <QtGui/QPolygonF> #include <QtQuick/QSGSimpleRectNode> #include <private/qsgrendernode_p.h> @@ -32,7 +32,7 @@ namespace WebKit { class ContentsSGNode : public QSGRenderNode { public: - ContentsSGNode(PassRefPtr<WebLayerTreeRenderer> renderer) + ContentsSGNode(PassRefPtr<LayerTreeRenderer> renderer) : m_renderer(renderer) { layerTreeRenderer()->setActive(true); @@ -61,7 +61,7 @@ public: layerTreeRenderer()->purgeGLResources(); } - WebLayerTreeRenderer* layerTreeRenderer() const { return m_renderer.get(); } + LayerTreeRenderer* layerTreeRenderer() const { return m_renderer.get(); } private: QRectF clipRect() const @@ -105,7 +105,7 @@ private: return resultRect; } - RefPtr<WebLayerTreeRenderer> m_renderer; + RefPtr<LayerTreeRenderer> m_renderer; }; QtWebPageSGNode::QtWebPageSGNode() @@ -128,7 +128,7 @@ void QtWebPageSGNode::setScale(float scale) setMatrix(matrix); } -void QtWebPageSGNode::setRenderer(PassRefPtr<WebLayerTreeRenderer> renderer) +void QtWebPageSGNode::setRenderer(PassRefPtr<LayerTreeRenderer> renderer) { if (m_contentsNode && m_contentsNode->layerTreeRenderer() == renderer) return; |