[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 54a275ae1a720260da312389492b41bd5c4fe82b
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 17 15:54:44 2010 +0000

    2010-12-17  Sheriff Bot  <webkit.review.bot at gmail.com>
    
            Unreviewed, rolling out r74201.
            http://trac.webkit.org/changeset/74201
            https://bugs.webkit.org/show_bug.cgi?id=51248
    
            It broke ~6000 layout tests (Requested by Ossy_ on #webkit).
    
            * UIProcess/API/qt/qgraphicswkview.cpp:
            (QGraphicsWKView::setGeometry):
            (QGraphicsWKView::itemChange):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74268 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 93c60d8..5693a6f 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-17  Sheriff Bot  <webkit.review.bot at gmail.com>
+
+        Unreviewed, rolling out r74201.
+        http://trac.webkit.org/changeset/74201
+        https://bugs.webkit.org/show_bug.cgi?id=51248
+
+        It broke ~6000 layout tests (Requested by Ossy_ on #webkit).
+
+        * UIProcess/API/qt/qgraphicswkview.cpp:
+        (QGraphicsWKView::setGeometry):
+        (QGraphicsWKView::itemChange):
+
 2010-12-16  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Darin Adler.
diff --git a/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp b/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp
index 9ac0b58..ff73440 100644
--- a/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp
+++ b/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp
@@ -47,7 +47,6 @@ struct QGraphicsWKViewPrivate {
     QGraphicsWKViewPrivate(QGraphicsWKView* view);
     WKPageRef pageRef() const { return page->pageRef(); }
 
-    void updateViewportSize();
     void onScaleChanged();
     void commitScale();
 
@@ -57,13 +56,6 @@ struct QGraphicsWKViewPrivate {
     bool m_isChangingScale;
 };
 
-void QGraphicsWKViewPrivate::updateViewportSize()
-{
-    // NOTE: call geometry() as setGeometry ensures that
-    // the geometry is within legal bounds (minimumSize, maximumSize)
-    page->setViewportSize(q->geometry().size().toSize());
-}
-
 QGraphicsWKView::QGraphicsWKView(QWKContext* context, BackingStoreType backingStoreType, QGraphicsItem* parent)
     : QGraphicsWidget(parent)
     , d(new QGraphicsWKViewPrivate(this))
@@ -121,12 +113,9 @@ void QGraphicsWKView::setGeometry(const QRectF& rect)
     if (geometry().size() == oldSize)
         return;
 
-    // Return early if not visible, since setting size on drawing
-    // areas when not visible is not supported.
-    if (!isVisible())
-        return;
-
-    d->updateViewportSize();
+    // NOTE: call geometry() as setGeometry ensures that
+    // the geometry is within legal bounds (minimumSize, maximumSize)
+    page()->setViewportSize(geometry().size().toSize());
 }
 
 void QGraphicsWKView::load(const QUrl& url)
@@ -220,19 +209,7 @@ bool QGraphicsWKView::focusNextPrevChild(bool next)
 */
 QVariant QGraphicsWKView::itemChange(GraphicsItemChange change, const QVariant& value)
 {
-    if (change == ItemVisibleChange) {
-        if (value.canConvert<bool>()) {
-            DrawingAreaProxy* drawingArea = page()->d->page->drawingArea();
-            bool shouldBeVisible = value.toBool();
-            drawingArea->setPageIsVisible(shouldBeVisible);
-
-            // This item might have been resized during being
-            // invisible. Update the size in any case.
-            if (shouldBeVisible)
-                d->updateViewportSize();
-        }
-        return value;
-    }
+    // Here so that it can be reimplemented without breaking ABI.
     return QGraphicsWidget::itemChange(change, value);
 }
 

-- 
WebKit Debian packaging