From 6668b07fcd51f86be243b9e08e667224e30c0cf8 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 27 Jun 2012 09:28:46 +0200 Subject: Imported WebKit commit 26cd9bd8ab0471ffe987c9b60368f63dc0f1f31b (http://svn.webkit.org/repository/webkit/trunk@121325) New snapshot with more Windows build fixes --- Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'Source/WebKit2/UIProcess/API/qt') diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp b/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp index e0d6012d2..e1f6759ac 100644 --- a/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp @@ -21,7 +21,7 @@ #include "config.h" #include "qquickwebpage_p.h" -#include "LayerTreeHostProxy.h" +#include "LayerTreeCoordinatorProxy.h" #include "QtWebPageEventHandler.h" #include "QtWebPageSGNode.h" #include "TransformationMatrix.h" @@ -72,9 +72,9 @@ void QQuickWebPagePrivate::paint(QPainter* painter) if (!webPageProxy->drawingArea()) return; - LayerTreeHostProxy* layerTreeHostProxy = webPageProxy->drawingArea()->layerTreeHostProxy(); - if (layerTreeHostProxy->layerTreeRenderer()) - layerTreeHostProxy->layerTreeRenderer()->paintToGraphicsContext(painter); + LayerTreeCoordinatorProxy* layerTreeCoordinatorProxy = webPageProxy->drawingArea()->layerTreeCoordinatorProxy(); + if (layerTreeCoordinatorProxy->layerTreeRenderer()) + layerTreeCoordinatorProxy->layerTreeRenderer()->paintToGraphicsContext(painter); } QSGNode* QQuickWebPage::updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData*) @@ -82,8 +82,8 @@ QSGNode* QQuickWebPage::updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData*) if (!d->webPageProxy->drawingArea()) return oldNode; - LayerTreeHostProxy* layerTreeHostProxy = d->webPageProxy->drawingArea()->layerTreeHostProxy(); - WebLayerTreeRenderer* renderer = layerTreeHostProxy->layerTreeRenderer(); + LayerTreeCoordinatorProxy* layerTreeCoordinatorProxy = d->webPageProxy->drawingArea()->layerTreeCoordinatorProxy(); + WebLayerTreeRenderer* renderer = layerTreeCoordinatorProxy->layerTreeRenderer(); QtWebPageSGNode* node = static_cast(oldNode); if (!node) @@ -159,8 +159,8 @@ void QQuickWebPagePrivate::updateSize() QSizeF scaledSize = contentsSize * contentsScale; DrawingAreaProxy* drawingArea = webPageProxy->drawingArea(); - if (drawingArea && drawingArea->layerTreeHostProxy()) - drawingArea->layerTreeHostProxy()->setContentsSize(contentsSize); + if (drawingArea && drawingArea->layerTreeCoordinatorProxy()) + drawingArea->layerTreeCoordinatorProxy()->setContentsSize(contentsSize); q->setSize(scaledSize); -- cgit v1.2.1