Changeset 88822 in webkit

Timestamp:

Jun 14, 2011 10:44:45 AM (13 years ago)

Author:

enne@google.com

Message:

2011-06-13 Adrienne Walker <​enne@google.com>

Reviewed by James Robinson.

[chromium] Disable drawing for huge mask layers
​https://bugs.webkit.org/show_bug.cgi?id=62607

• platform/chromium/compositing/huge-mask-layer-expected.txt: Added.
• platform/chromium/compositing/huge-mask-layer.html: Added.

2011-06-13 Adrienne Walker <​enne@google.com>

Reviewed by James Robinson.

[chromium] Disable drawing for huge mask layers
​https://bugs.webkit.org/show_bug.cgi?id=62607

Because masks have a different layer size than the layer they are
masking, they are untiled. If they are too large to be contained
within a single texture, then they should just be disabled.

Test: platform/chromium/compositing/huge-mask-layer.html

• platform/graphics/chromium/ContentLayerChromium.cpp: (WebCore::ContentLayerChromium::drawsContent): (WebCore::ContentLayerChromium::paintContentsIfDirty):
• platform/graphics/chromium/LayerTilerChromium.h: (WebCore::LayerTilerChromium::getSingleTexture): (WebCore::LayerTilerChromium::numTiles):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/compositing/huge-mask-layer-expected.txt (added)
• LayoutTests/platform/chromium/compositing/huge-mask-layer.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/chromium/ContentLayerChromium.cpp (modified) (2 diffs)
• Source/WebCore/platform/graphics/chromium/LayerTilerChromium.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/chromium/LayerTilerChromium.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-06-13  Adrienne Walker  <enne@google.com>
+
+        Reviewed by James Robinson.
+
+        [chromium] Disable drawing for huge mask layers
+        https://bugs.webkit.org/show_bug.cgi?id=62607
+
+        * platform/chromium/compositing/huge-mask-layer-expected.txt: Added.
+        * platform/chromium/compositing/huge-mask-layer.html: Added.
+
 2011-06-14  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-13  Adrienne Walker  <enne@google.com>
+
+        Reviewed by James Robinson.
+
+        [chromium] Disable drawing for huge mask layers
+        https://bugs.webkit.org/show_bug.cgi?id=62607
+
+        Because masks have a different layer size than the layer they are
+        masking, they are untiled.  If they are too large to be contained
+        within a single texture, then they should just be disabled.
+
+        Test: platform/chromium/compositing/huge-mask-layer.html
+
+        * platform/graphics/chromium/ContentLayerChromium.cpp:
+        (WebCore::ContentLayerChromium::drawsContent):
+        (WebCore::ContentLayerChromium::paintContentsIfDirty):
+        * platform/graphics/chromium/LayerTilerChromium.h:
+        (WebCore::LayerTilerChromium::getSingleTexture):
+        (WebCore::LayerTilerChromium::numTiles):
+
 2011-06-14  Viatcheslav Ostapenko  <ostapenko.viatcheslav@nokia.com>
 

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

@@ -110 +110 @@
     m_tiler->invalidateRect(dirty);
 
+    if (!drawsContent())
+        return;
+
     m_tiler->prepareToUpdate(layerRect);
     m_dirtyRect = FloatRect();
@@ -219 +222 @@
 bool ContentLayerChromium::drawsContent() const
 {
-    return m_owner && m_owner->drawsContent() && (!m_tiler || !m_tiler->skipsDraw());
+    if (!m_owner || !m_owner->drawsContent())
+        return false;
+
+    if (!m_tiler)
+        return true;
+
+    if (m_tilingOption == NeverTile && m_tiler->numTiles() > 1)
+        return false;
+
+    return !m_tiler->skipsDraw();
 }
 

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

@@ -84 +84 @@
 LayerTexture* LayerTilerChromium::getSingleTexture()
 {
+    if (m_tilingData.numTiles() != 1)
+        return 0;
+
     Tile* tile = tileAt(0, 0);
     return tile ? tile->texture() : 0;

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

@@ -61 +61 @@
     // Draw all tiles that intersect with the content rect.
     void draw(const IntRect& contentRect, const TransformationMatrix&, float opacity);
+
+    int numTiles() const { return m_tilingData.numTiles(); }
 
     // Set position of this tiled layer in content space.