Changeset 149369 in webkit

Timestamp:

Apr 30, 2013 7:39:56 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[Texmap] Avoid using overlap/non-overlap region in cases where the overhead is bigger than the gain
​https://bugs.webkit.org/show_bug.cgi?id=115226

Patch by Noam Rosenthal <Noam Rosenthal> on 2013-04-30
Reviewed by Allan Sandfeld Jensen.

When there are several fragmeneted overlap regions, or when the overlap region is bigger than the
non-overlap region, it's more efficient to have a single intermediate surface rather than split
the rendering to overlap/non-overlap.

Covered by tests in compositing/overlap-blending.

• platform/graphics/texmap/TextureMapperLayer.cpp:

(WebCore::TextureMapperLayer::shouldBlend):

Readability fix.

(WebCore::TextureMapperLayer::paintUsingOverlapRegions):

Consolidate to one overlap rect when one of the following occurs:

• The overlap region's area is larger than the non-overlap region area.
• There are many fragmented overlap regions and no non-overlap regions.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/texmap/TextureMapperLayer.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-30  Noam Rosenthal  <noam@webkit.org>
+
+        [Texmap] Avoid using overlap/non-overlap region in cases where the overhead is bigger than the gain
+        https://bugs.webkit.org/show_bug.cgi?id=115226
+
+        Reviewed by Allan Sandfeld Jensen.
+
+        When there are several fragmeneted overlap regions, or when the overlap region is bigger than the
+        non-overlap region, it's more efficient to have a single intermediate surface rather than split
+        the rendering to overlap/non-overlap.
+
+        Covered by tests in compositing/overlap-blending.
+
+        * platform/graphics/texmap/TextureMapperLayer.cpp:
+        (WebCore::TextureMapperLayer::shouldBlend):
+            Readability fix.
+
+        (WebCore::TextureMapperLayer::paintUsingOverlapRegions):
+            Consolidate to one overlap rect when one of the following occurs:
+            - The overlap region's area is larger than the non-overlap region area.
+            - There are many fragmented overlap regions and no non-overlap regions.
+
 2013-04-30  Christophe Dumez  <ch.dumez@sisa.samsung.com>
 

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp

@@ -198 +198 @@
         return false;
 
-#if ENABLE(CSS_FILTERS)
-    if (m_currentFilters.size())
-        return true;
-#endif
-    return m_currentOpacity < 1 || m_state.maskLayer || (m_state.replicaLayer && m_state.replicaLayer->m_state.maskLayer);
+    return m_currentOpacity < 1
+        || hasFilters()
+        || m_state.maskLayer
+        || (m_state.replicaLayer && m_state.replicaLayer->m_state.maskLayer);
 }
 
@@ -335 +334 @@
     }
 
+    // Having both overlap and non-overlap regions carries some overhead. Avoid it if the overlap area
+    // is big anyway.
+    if (overlapRegion.bounds().size().area() > nonOverlapRegion.bounds().size().area()) {
+        overlapRegion.unite(nonOverlapRegion);
+        nonOverlapRegion = Region();
+    }
+
     nonOverlapRegion.translate(options.offset);
     Vector<IntRect> rects = nonOverlapRegion.rects();
+
     for (size_t i = 0; i < rects.size(); ++i) {
         IntRect rect = rects[i];
@@ -348 +355 @@
 
     rects = overlapRegion.rects();
+    static const size_t OverlapRegionConsolidationThreshold = 4;
+    if (nonOverlapRegion.isEmpty() && rects.size() > OverlapRegionConsolidationThreshold) {
+        rects.clear();
+        rects.append(overlapRegion.bounds());
+    }
+
     IntSize maxTextureSize = options.textureMapper->maxTextureSize();
     IntRect adjustedClipBounds(options.textureMapper->clipBounds());