Changeset 87822 in webkit

Timestamp:

Jun 1, 2011 10:36:56 AM (13 years ago)

Author:

enne@google.com

Message:

2011-05-19 Adrienne Walker <​enne@google.com>

Reviewed by James Robinson.

[chromium] Don't split long, narrow layers into multiple tiles.
​https://bugs.webkit.org/show_bug.cgi?id=60821

These tests have imperceptible pixel changes on horizontal scrollbars
as a result of this patch. Marking them as failing temporarily so
that they can be rebaselined.

• platform/chromium/test_expectations.txt:

2011-05-19 Adrienne Walker <​enne@google.com>

Reviewed by James Robinson.

[chromium] Don't split long, narrow layers into multiple tiles.
​https://bugs.webkit.org/show_bug.cgi?id=60821

This changes the heuristic for when we tile layers to be less bad
about wasting texture space. Long, narrow layers that are tiled with
a large tile size waste texture space. Now layers are only tiled if
they are above 512px in one dimension and extend into a second tile in
the other. If they are not tiled, their layer texture will exactly
fit their layer bounds. In particular, this will help scrollbars.

• platform/graphics/chromium/ContentLayerChromium.cpp: (WebCore::ContentLayerChromium::updateLayerSize):
• platform/graphics/chromium/LayerRendererChromium.h: (WebCore::LayerRendererChromium::maxTextureSize):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp (modified) (3 diffs)
• Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-19  Adrienne Walker  <enne@google.com>
+
+        Reviewed by James Robinson.
+
+        [chromium] Don't split long, narrow layers into multiple tiles.
+        https://bugs.webkit.org/show_bug.cgi?id=60821
+
+        These tests have imperceptible pixel changes on horizontal scrollbars
+        as a result of this patch.  Marking them as failing temporarily so
+        that they can be rebaselined.
+
+        * platform/chromium/test_expectations.txt:
+
 2011-06-01  Steve Lacey  <sjl@chromium.org>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -3904 +3904 @@
 BUGCR82950 WIN : http/tests/navigation/post-303-response.html = TEXT
 
+BUGENNE GPU : compositing/geometry/fixed-position.html = FAIL
+BUGENNE GPU : compositing/geometry/vertical-scroll-composited.html = FAIL
+BUGENNE GPU : compositing/overflow/fixed-position-ancestor-clip.html = FAIL
+
 // Fails after details element turned on in Chrome r85744
 // See also BUGWK59172

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-19  Adrienne Walker  <enne@google.com>
+
+        Reviewed by James Robinson.
+
+        [chromium] Don't split long, narrow layers into multiple tiles.
+        https://bugs.webkit.org/show_bug.cgi?id=60821
+
+        This changes the heuristic for when we tile layers to be less bad
+        about wasting texture space.  Long, narrow layers that are tiled with
+        a large tile size waste texture space.  Now layers are only tiled if
+        they are above 512px in one dimension and extend into a second tile in
+        the other.  If they are not tiled, their layer texture will exactly
+        fit their layer bounds.  In particular, this will help scrollbars.
+
+        * platform/graphics/chromium/ContentLayerChromium.cpp:
+        (WebCore::ContentLayerChromium::updateLayerSize):
+        * platform/graphics/chromium/LayerRendererChromium.h:
+        (WebCore::LayerRendererChromium::maxTextureSize):
+
 2011-06-01  Cary Clark  <caryclark@google.com>
 

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

@@ -47 +47 @@
 #include <wtf/CurrentTime.h>
 
-// Maximum size the width or height of this layer can be before enabling tiling
-// when m_tilingOption == AutoTile.
+// Start tiling when the width and height of a layer are larger than this size.
 static int maxUntiledSize = 512;
+
 // When tiling is enabled, use tiles of this dimension squared.
 static int defaultTileSize = 256;
@@ -187 +187 @@
 
     const IntSize tileSize(min(defaultTileSize, layerSize.width()), min(defaultTileSize, layerSize.height()));
-    const bool autoTiled = layerSize.width() > maxUntiledSize || layerSize.height() > maxUntiledSize;
+
+    // Tile if both dimensions large, or any one dimension large and the other
+    // extends into a second tile. This heuristic allows for long skinny layers
+    // (e.g. scrollbars) that are Nx1 tiles to minimize wasted texture space.
+    const bool anyDimensionLarge = layerSize.width() > maxUntiledSize || layerSize.height() > maxUntiledSize;
+    const bool anyDimensionOneTile = layerSize.width() <= defaultTileSize || layerSize.height() <= defaultTileSize;
+    const bool autoTiled = anyDimensionLarge && !anyDimensionOneTile;
 
     bool isTiled;
@@ -197 +203 @@
         isTiled = autoTiled;
 
-    m_tiler->setTileSize(isTiled ? tileSize : layerSize);
+    IntSize requestedSize = isTiled ? tileSize : layerSize;
+    const int maxSize = layerRenderer()->maxTextureSize();
+    IntSize clampedSize = requestedSize.shrunkTo(IntSize(maxSize, maxSize));
+    m_tiler->setTileSize(clampedSize);
 }
 

trunk/Source/WebCore/platform/graphics/chromium/LayerRendererChromium.h

@@ -122 +122 @@
 
     bool checkTextureSize(const IntSize&);
+    int maxTextureSize() const { return m_maxTextureSize; }
 
     const GeometryBinding* sharedGeometry() const { return m_sharedGeometry.get(); }