Changeset 64556 in webkit

Timestamp:

Aug 3, 2010 8:14:52 AM (14 years ago)

Author:

tonikitoo@webkit.org

Message:

2010-08-02 Antonio Gomes <​tonikitoo@webkit.org>

Reviewed by Kenneth Christiansen.

[Qt] QtTestBrowser not setting preferredContentsSize for resizesToContents
​https://bugs.webkit.org/show_bug.cgi?id=43168

QGraphicsWebView resizesToContents property has to work together with QWebPage's
setPreferredContentsSize as stated by the docs. Patch addresses that for QtTestBrowser.

• QtTestBrowser/launcherwindow.cpp: (LauncherWindow::applyPrefs):
• QtTestBrowser/webview.h: (WebViewGraphicsBased::setCustomLayoutSize): Setter helper. (WebViewGraphicsBased::customLayoutSize): Getter helper.
• QtTestBrowser/webview.cpp: (WebViewGraphicsBased::resizeEvent): (WebViewGraphicsBased::setResizesToContents): Properly handle scene, webview and viewport sizes

needed when toggle resizesToContents on/off.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• QtTestBrowser/launcherwindow.cpp (modified) (1 diff)
• QtTestBrowser/webview.cpp (modified) (2 diffs)
• QtTestBrowser/webview.h (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-08-02  Antonio Gomes  <tonikitoo@webkit.org>
+
+        Reviewed by Kenneth Christiansen.
+
+        [Qt] QtTestBrowser not setting preferredContentsSize for resizesToContents
+        https://bugs.webkit.org/show_bug.cgi?id=43168
+
+        QGraphicsWebView resizesToContents property has to work together with QWebPage's
+        setPreferredContentsSize as stated by the docs. Patch addresses that for QtTestBrowser.
+
+        * QtTestBrowser/launcherwindow.cpp:
+        (LauncherWindow::applyPrefs):
+        * QtTestBrowser/webview.cpp:
+        (WebViewGraphicsBased::setResizesToContents): Properly handle scene, webview and viewport sizes
+                                                      needed when toggle resizesToContents on/off.
+        (WebViewGraphicsBased::resizeEvent):
+        * QtTestBrowser/webview.h:
+        (WebViewGraphicsBased::setCustomLayoutSize): Setter helper.
+        (WebViewGraphicsBased::customLayoutSize): Getter helper.
+
 2010-08-03  Jochen Eisinger  <jochen@chromium.org>
 

trunk/WebKitTools/QtTestBrowser/launcherwindow.cpp

@@ -403 +403 @@
         view->setItemCacheMode(otherView->itemCacheMode());
         view->setResizesToContents(otherView->resizesToContents());
+        view->setCustomLayoutSize(otherView->customLayoutSize());
     } else {
         view->setItemCacheMode(gCacheWebView ? QGraphicsItem::DeviceCoordinateCache : QGraphicsItem::NoCache);
-        view->setResizesToContents(gResizesToContents);
+        toggleResizesToContents(gResizesToContents);
     }
 }

trunk/WebKitTools/QtTestBrowser/webview.cpp

@@ -82 +82 @@
 void WebViewGraphicsBased::setResizesToContents(bool b)
 {
+    if (b == m_resizesToContents)
+        return;
+
     m_resizesToContents = b;
     m_item->setResizesToContents(m_resizesToContents);
+
+    // When setting resizesToContents ON, our web view widget will always size as big as the
+    // web content being displayed, and so will the QWebPage's viewport. It implies that internally
+    // WebCore will work as if there was no content rendered offscreen, and then no scrollbars need
+    // drawing. In order to keep scrolling working, we:
+    //
+    // 1) Set QGraphicsView's scrollbars policy back to 'auto'.
+    // 2) Set scene's boundaries rect to an invalid size, which automatically makes it to be as big
+    //    as it needs to enclose all items onto it. We do that because QGraphicsView also calculates
+    //    the size of its scrollable area according to the amount of content in scene that is rendered
+    //    offscreen.
+    // 3) Set QWebPage's preferredContentsSize according to the size of QGraphicsView's viewport,
+    //    so WebCore properly lays pages out.
+    //
+    // On the other hand, when toggling resizesToContents OFF, we set back the default values, as
+    // opposite as described above.
     if (m_resizesToContents) {
         setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
         setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+        scene()->setSceneRect(QRectF());
+        m_item->page()->setPreferredContentsSize(size());
     } else {
         setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
         setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+        m_item->page()->setPreferredContentsSize(QSize());
+        QRect viewportRect(QPoint(0, 0), size());
+        m_item->setGeometry(viewportRect);
+        scene()->setSceneRect(viewportRect);
     }
 }
@@ -96 +121 @@
 {
     QGraphicsView::resizeEvent(event);
-    if (m_resizesToContents)
+
+    QSize size(event->size());
+
+    if (m_resizesToContents) {
+        m_item->page()->setPreferredContentsSize(size);
         return;
-    QRectF rect(QPoint(0, 0), event->size());
+    }
+
+    QRectF rect(QPoint(0, 0), size);
     m_item->setGeometry(rect);
     scene()->setSceneRect(rect);

trunk/WebKitTools/QtTestBrowser/webview.h

@@ -85 +85 @@
     bool resizesToContents() const { return m_resizesToContents; }
 
+    void setCustomLayoutSize(const QSize& size) { return m_item->page()->setPreferredContentsSize(size); }
+    QSize customLayoutSize() const { return m_item->page()->preferredContentsSize(); }
+
     void setYRotation(qreal angle)
     {