Changeset 106870 in webkit

Timestamp:

Feb 6, 2012, 4:25:16 PM (15 years ago)

Author:

jamesr@google.com

Message:

[chromium] Drop tiles completely outside of layer bounds when resizing to a smaller size
​https://bugs.webkit.org/show_bug.cgi?id=77910

Reviewed by Kenneth Russell.

Source/WebCore:

When resizing a tiled layer to a smaller size, drop all tiles that lie completely outside the new layer bounds.
This avoids attempting to access out-of-bounds tiles when iterating over all tiles in the tiler, which triggers
ASSERT()s, as well as saves some memory.

New unit test added to TiledLayerChromiumTest.

• platform/graphics/chromium/TiledLayerChromium.cpp:

(WebCore::TiledLayerChromium::invalidateRect):

• platform/graphics/chromium/cc/CCLayerTilingData.cpp:

(WebCore::CCLayerTilingData::setBounds):

Source/WebKit/chromium:

Adds test for resizing a layer to cover fewer tiles. Test hits ASSERT()s without any code changes.

• tests/TiledLayerChromiumTest.cpp:

(::TEST):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/chromium/TiledLayerChromium.cpp (modified) (1 diff)
• WebCore/platform/graphics/chromium/cc/CCLayerTilingData.cpp (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/tests/TiledLayerChromiumTest.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-06  James Robinson  <jamesr@chromium.org>
+
+        [chromium] Drop tiles completely outside of layer bounds when resizing to a smaller size
+        https://bugs.webkit.org/show_bug.cgi?id=77910
+
+        Reviewed by Kenneth Russell.
+
+        When resizing a tiled layer to a smaller size, drop all tiles that lie completely outside the new layer bounds.
+        This avoids attempting to access out-of-bounds tiles when iterating over all tiles in the tiler, which triggers
+        ASSERT()s, as well as saves some memory.
+
+        New unit test added to TiledLayerChromiumTest.
+
+        * platform/graphics/chromium/TiledLayerChromium.cpp:
+        (WebCore::TiledLayerChromium::invalidateRect):
+        * platform/graphics/chromium/cc/CCLayerTilingData.cpp:
+        (WebCore::CCLayerTilingData::setBounds):
+
 2012-02-06  Chris Rogers  <crogers@google.com>
 

trunk/Source/WebCore/platform/graphics/chromium/TiledLayerChromium.cpp

@@ -313 +313 @@
 void TiledLayerChromium::invalidateRect(const IntRect& layerRect)
 {
+    updateBounds();
     if (m_tiler->isEmpty() || layerRect.isEmpty() || m_skipsDraw)
         return;

trunk/Source/WebCore/platform/graphics/chromium/cc/CCLayerTilingData.cpp

@@ -118 +118 @@
 {
     m_tilingData.setTotalSize(size.width(), size.height());
+
+    // Any tiles completely outside our new bounds are invalid and should be dropped.
+    int left, top, right, bottom;
+    layerRectToTileIndices(IntRect(IntPoint(), size), left, top, right, bottom);
+    Vector<TileMapKey> invalidTileKeys;
+    for (TileMap::const_iterator it = m_tiles.begin(); it != m_tiles.end(); ++it) {
+        if (it->first.first > right || it->first.second > bottom)
+            invalidTileKeys.append(it->first);
+    }
+    for (size_t i = 0; i < invalidTileKeys.size(); ++i)
+        m_tiles.remove(invalidTileKeys[i]);
 }
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-02-06  James Robinson  <jamesr@chromium.org>
+
+        [chromium] Drop tiles completely outside of layer bounds when resizing to a smaller size
+        https://bugs.webkit.org/show_bug.cgi?id=77910
+
+        Reviewed by Kenneth Russell.
+
+        Adds test for resizing a layer to cover fewer tiles. Test hits ASSERT()s without any code changes.
+
+        * tests/TiledLayerChromiumTest.cpp:
+        (::TEST):
+
 2012-02-06  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebKit/chromium/tests/TiledLayerChromiumTest.cpp

@@ -566 +566 @@
 }
 
+TEST(TiledLayerChromiumTest, resizeToSmaller)
+{
+    OwnPtr<TextureManager> textureManager = TextureManager::create(60*1024*1024, 60*1024*1024, 1024);
+    RefPtr<FakeTiledLayerChromium> layer = adoptRef(new FakeTiledLayerChromium(textureManager.get()));
+
+    layer->setBounds(IntSize(700, 700));
+    layer->invalidateRect(IntRect(0, 0, 700, 700));
+    layer->prepareToUpdate(IntRect(0, 0, 700, 700));
+
+    layer->setBounds(IntSize(200, 200));
+    layer->invalidateRect(IntRect(0, 0, 200, 200));
+}
+
 } // namespace