1 files changed, 15 insertions, 43 deletions

diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp b/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp
index 206ba2522..22c6703c4 100644
--- a/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp
+++ b/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp
@@ -46,31 +46,13 @@ QQuickWebPage::~QQuickWebPage()
     delete d;
 }
 
-QtSGUpdateQueue *QQuickWebPage::sceneGraphUpdateQueue() const
-{
-    return &d->sgUpdateQueue;
-}
-
-void QQuickWebPage::geometryChanged(const QRectF& newGeometry, const QRectF& oldGeometry)
-{
-    QQuickItem::geometryChanged(newGeometry, oldGeometry);
-
-    if (!d->useTraditionalDesktopBehaviour)
-        return;
-
-    if (newGeometry.size() != oldGeometry.size())
-        d->setDrawingAreaSize(newGeometry.size().toSize());
-}
-
 QQuickWebPagePrivate::QQuickWebPagePrivate(QQuickWebPage* q, QQuickWebView* viewportItem)
     : q(q)
     , viewportItem(viewportItem)
     , webPageProxy(0)
-    , sgUpdateQueue(q)
     , paintingIsInitialized(false)
     , m_paintNode(0)
-    , contentScale(1)
-    , useTraditionalDesktopBehaviour(false)
+    , contentsScale(1)
 {
 }
 
@@ -112,7 +94,7 @@ void QQuickWebPagePrivate::paintToCurrentGLContext()
         return;
 
     QTransform transform = q->itemTransform(0, 0);
-    transform.scale(contentScale, contentScale);
+    transform.scale(contentsScale, contentsScale);
 
     float opacity = computeEffectiveOpacity(q);
     QRectF clipRect = q->parentItem()->mapRectToScene(q->parentItem()->boundingRect());
@@ -220,47 +202,37 @@ QSGNode* QQuickWebPage::updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData*)
     return proxyNode;
 }
 
-bool QQuickWebPage::usesTraditionalDesktopBehaviour() const
-{
-    return d->useTraditionalDesktopBehaviour;
-}
-
-void QQuickWebPage::setUsesTraditionalDesktopBehaviour(bool enable)
-{
-    d->useTraditionalDesktopBehaviour = enable;
-}
-
 QtWebPageEventHandler* QQuickWebPage::eventHandler() const
 {
     return d->eventHandler.data();
 }
 
-void QQuickWebPage::setContentSize(const QSizeF& size)
+void QQuickWebPage::setContentsSize(const QSizeF& size)
 {
-    if (size.isEmpty() || d->contentSize == size)
+    if (size.isEmpty() || d->contentsSize == size)
         return;
 
-    d->contentSize = size;
+    d->contentsSize = size;
     d->updateSize();
-    d->setDrawingAreaSize(d->contentSize.toSize());
+    d->setDrawingAreaSize(d->contentsSize.toSize());
 }
 
-const QSizeF& QQuickWebPage::contentSize() const
+const QSizeF& QQuickWebPage::contentsSize() const
 {
-    return d->contentSize;
+    return d->contentsSize;
 }
 
-void QQuickWebPage::setContentScale(qreal scale)
+void QQuickWebPage::setContentsScale(qreal scale)
 {
     ASSERT(scale > 0);
-    d->contentScale = scale;
+    d->contentsScale = scale;
     d->updateSize();
 }
 
-qreal QQuickWebPage::contentScale() const
+qreal QQuickWebPage::contentsScale() const
 {
-    ASSERT(d->contentScale > 0);
-    return d->contentScale;
+    ASSERT(d->contentsScale > 0);
+    return d->contentsScale;
 }
 
 QTransform QQuickWebPage::transformFromItem() const
@@ -270,12 +242,12 @@ QTransform QQuickWebPage::transformFromItem() const
 
 QTransform QQuickWebPage::transformToItem() const
 {
-    return QTransform(d->contentScale, 0, 0, 0, d->contentScale, 0, x(), y(), 1);
+    return QTransform(d->contentsScale, 0, 0, 0, d->contentsScale, 0, x(), y(), 1);
 }
 
 void QQuickWebPagePrivate::updateSize()
 {
-    QSizeF scaledSize = contentSize * contentScale;
+    QSizeF scaledSize = contentsSize * contentsScale;
     q->setSize(scaledSize);
 }