Changeset 97945 in webkit

Timestamp:

Oct 20, 2011 12:22:49 AM (13 years ago)

Author:

carol@webkit.org

Message:

Tiled Backing Store does not regenerate tiles when it should
​https://bugs.webkit.org/show_bug.cgi?id=57798

Reviewed by Darin Adler.

Source/WebCore:

Changed TiledBackingStore::adjustVisibleRect to take into account
contentsSize, the same way as it is done when tiles are generated.

This is an issue that requires a certain sequence of API calls which
may not be easily simulated from DumpRenderTree, but which is
easily reproduced with QtTest. This is why I have provided only
a Qt specific test despite this being a generic problem.

• platform/graphics/TiledBackingStore.cpp:

(WebCore::TiledBackingStore::adjustVisibleRect):
Changed to take into account ContentsSize.
(WebCore::TiledBackingStore::visibleContentsRect):
Added to return the intersection of the viewport's visible rect with
the ContentsRect.
(WebCore::TiledBackingStore::createTiles):
Changed to take into account the ContentsSize when calculating the
previously visible rect.

• platform/graphics/TiledBackingStore.h:

Source/WebKit/qt:

Provided test for this bug. Changed the name of the resource I added
for a previous test so that the name is descriptive such that it can
be shared across several tests.

• tests/qgraphicswebview/tst_qgraphicswebview.cpp:

(tst_QGraphicsWebView::bug57798):
(tst_QGraphicsWebView::bug56929):

• tests/qgraphicswebview/tst_qgraphicswebview.qrc:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/TiledBackingStore.cpp (modified) (3 diffs)
• WebCore/platform/graphics/TiledBackingStore.h (modified) (1 diff)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/tests/qgraphicswebview/resources/greendiv.html (moved) (moved from trunk/Source/WebKit/qt/tests/qgraphicswebview/resources/56929.html)
• WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp (modified) (3 diffs)
• WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.qrc (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-20  Carol Szabo  <carol@webkit.org>
+
+        Tiled Backing Store does not regenerate tiles when it should
+        https://bugs.webkit.org/show_bug.cgi?id=57798
+
+        Reviewed by Darin Adler.
+
+        Changed TiledBackingStore::adjustVisibleRect to take into account
+        contentsSize, the same way as it is done when tiles are generated.
+
+        This is an issue that requires a certain sequence of API calls which
+        may not be easily simulated from DumpRenderTree, but which is 
+        easily reproduced with QtTest. This is why I have provided only
+        a Qt specific test despite this being a generic problem.
+
+        * platform/graphics/TiledBackingStore.cpp:
+        (WebCore::TiledBackingStore::adjustVisibleRect):
+        Changed to take into account ContentsSize.
+        (WebCore::TiledBackingStore::visibleContentsRect):
+        Added to return the intersection of the viewport's visible rect with
+        the ContentsRect.
+        (WebCore::TiledBackingStore::createTiles):
+        Changed to take into account the ContentsSize when calculating the
+        previously visible rect.
+        * platform/graphics/TiledBackingStore.h:
+
 2011-10-19  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/platform/graphics/TiledBackingStore.cpp

@@ -174 +174 @@
 void TiledBackingStore::adjustVisibleRect()
 {
-    IntRect visibleRect = mapFromContents(m_client->tiledBackingStoreVisibleRect());
+    IntRect visibleRect = visibleContentsRect();
     if (m_previousVisibleRect == visibleRect)
         return;
@@ -180 +180 @@
 
     startTileCreationTimer();
+}
+
+IntRect TiledBackingStore::visibleContentsRect()
+{
+    return mapFromContents(intersection(m_client->tiledBackingStoreVisibleRect(), m_client->tiledBackingStoreContentsRect()));
 }
 
@@ -243 +248 @@
         return;
     
-    IntRect visibleRect = mapFromContents(m_client->tiledBackingStoreVisibleRect());
+    IntRect visibleRect = visibleContentsRect();
     m_previousVisibleRect = visibleRect;
 

trunk/Source/WebCore/platform/graphics/TiledBackingStore.h

@@ -106 +106 @@
     
     void paintCheckerPattern(GraphicsContext*, const IntRect&, const Tile::Coordinate&);
+    IntRect visibleContentsRect();
 
 private:

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2011-10-20  Carol Szabo  <carol@webkit.org>
+
+        Tiled Backing Store does not regenerate tiles when it should
+        https://bugs.webkit.org/show_bug.cgi?id=57798
+
+        Reviewed by Darin Adler.
+
+        Provided test for this bug. Changed the name of the resource I added
+        for a previous test so that the name is descriptive such that it can
+        be shared across several tests.
+
+        * tests/qgraphicswebview/tst_qgraphicswebview.cpp:
+        (tst_QGraphicsWebView::bug57798):
+        (tst_QGraphicsWebView::bug56929):
+        * tests/qgraphicswebview/tst_qgraphicswebview.qrc:
+
 2011-10-18  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
 

trunk/Source/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp

@@ -50 +50 @@
     void renderHints();
 #if defined(WTF_USE_TILED_BACKING_STORE) && WTF_USE_TILED_BACKING_STORE
+    void bug57798();
     void bug56929();
 #endif
@@ -202 +203 @@
 
 #if defined(WTF_USE_TILED_BACKING_STORE) && WTF_USE_TILED_BACKING_STORE
-void tst_QGraphicsWebView::bug56929()
-{
-    // When rendering from tiles sychronous layout should not be triggered
-    // and scrollbars should be in sync with the size of the document in the displayed state.
+void tst_QGraphicsWebView::bug57798()
+{
+    // When content size grows from less than viewport size to more than that, tiles may need to be regenerated.
 
     QGraphicsWebView* webView = new QGraphicsWebView();
@@ -213 +213 @@
     view.scene()->addItem(webView);
     webView->settings()->setAttribute(QWebSettings::TiledBackingStoreEnabled, true);
-    QUrl url("qrc:///resources/56929.html");
+    QStyleOptionGraphicsItem option;
+    option.exposedRect = view.sceneRect();
+    QImage img(view.width(), view.height(),
+    QImage::Format_ARGB32_Premultiplied);
+    QPainter painter(&img);
+    // This will not paint anything as the tiles are not ready, but will trigger tile creation with size (0, 0).
+    webView->paint(&painter, &option);
+    QApplication::processEvents();
+    QUrl url("qrc:///resources/greendiv.html");
+    webView->load(url);
+    QVERIFY(waitForSignal(webView, SIGNAL(loadFinished(bool))));
+    // This should trigger the recreation of the tiles.
+    webView->paint(&painter, &option);
+    QApplication::processEvents();
+    painter.fillRect(option.exposedRect, Qt::red); // This is here to ensure failure if paint does not paint anything
+    webView->paint(&painter, &option);
+    QCOMPARE(img.pixel(option.exposedRect.width() / 4, option.exposedRect.height() / 4), qRgba(0, 128, 0, 255));
+}
+
+void tst_QGraphicsWebView::bug56929()
+{
+    // When rendering from tiles sychronous layout should not be triggered
+    // and scrollbars should be in sync with the size of the document in the displayed state.
+
+    QGraphicsWebView* webView = new QGraphicsWebView();
+    webView->setGeometry(QRectF(0.0, 0.0, 100.0, 100.0));
+    QGraphicsView view(new QGraphicsScene());
+    view.scene()->setParent(&view);
+    view.scene()->addItem(webView);
+    webView->settings()->setAttribute(QWebSettings::TiledBackingStoreEnabled, true);
+    QUrl url("qrc:///resources/greendiv.html");
     webView->load(url);
     QVERIFY(waitForSignal(webView, SIGNAL(loadFinished(bool))));

trunk/Source/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.qrc

@@ -4 +4 @@
         <file>resources/pointing_right.html</file>
         <file>resources/pointing_up.html</file>
-        <file>resources/56929.html</file>
+        <file>resources/greendiv.html</file>
     </qresource>
 </RCC>