Changeset 74268 in webkit

Timestamp:

Dec 17, 2010 7:54:44 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2010-12-17 Sheriff Bot <​webkit.review.bot@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):

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/qt/qgraphicswkview.cpp (modified) (4 diffs)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-12-17  Sheriff Bot  <webkit.review.bot@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@webkit.org>
 

trunk/WebKit2/UIProcess/API/qt/qgraphicswkview.cpp

@@ -48 +48 @@
     WKPageRef pageRef() const { return page->pageRef(); }
 
-    void updateViewportSize();
     void onScaleChanged();
     void commitScale();
@@ -57 +56 @@
     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)
@@ -122 +114 @@
         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());
 }
 
@@ -221 +210 @@
 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);
 }