Changeset 163019 in webkit

Timestamp:

Jan 29, 2014 8:11:47 AM (10 years ago)

Author:

Antti Koivisto

Message:

REGRESSION (r162947): css3/flexbox/multiline-justify-content.html and css3/flexbox/position-absolute-child.html are timing out
​https://bugs.webkit.org/show_bug.cgi?id=127809

Reviewed by Anders Carlsson.

Source/WebCore:

These tests generate very large number of small repaint rectangles that overwhelm the region code.

• page/FrameView.cpp:

(WebCore::FrameView::repaintContentRectangle):

• platform/graphics/Region.h:

(WebCore::Region::gridSize):
(WebCore::Region::Shape::gridSize):

Add accessor for getting the current region grid complexity.

• rendering/RenderView.cpp:

(WebCore::RenderView::repaintViewRectangle):

If the region gets very complex merge the repaint rects into a single big rectangle.

LayoutTests:

• platform/mac/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/Region.h (modified) (2 diffs)
• Source/WebCore/rendering/RenderView.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-01-29  Antti Koivisto  <antti@apple.com>
+
+        REGRESSION (r162947): css3/flexbox/multiline-justify-content.html and css3/flexbox/position-absolute-child.html are timing out
+        https://bugs.webkit.org/show_bug.cgi?id=127809
+
+        Reviewed by Anders Carlsson.
+
+        * platform/mac/TestExpectations:
+
 2014-01-29  Radu Stavila  <stavila@adobe.com>
 

trunk/LayoutTests/platform/mac/TestExpectations

@@ -1324 +1324 @@
 
 webkit.org/b/127310 svg/filters/feComponentTransfer-style-crash.xhtml [ Pass Failure Timeout ]
-
-webkit.org/b/127809 css3/flexbox/multiline-justify-content.html [ Skip ]
-webkit.org/b/127809 css3/flexbox/position-absolute-child.html [ Skip ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-01-29  Antti Koivisto  <antti@apple.com>
+
+        REGRESSION (r162947): css3/flexbox/multiline-justify-content.html and css3/flexbox/position-absolute-child.html are timing out
+        https://bugs.webkit.org/show_bug.cgi?id=127809
+
+        Reviewed by Anders Carlsson.
+
+        These tests generate very large number of small repaint rectangles that overwhelm the region code.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::repaintContentRectangle):
+        * platform/graphics/Region.h:
+        (WebCore::Region::gridSize):
+        (WebCore::Region::Shape::gridSize):
+        
+            Add accessor for getting the current region grid complexity.
+
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::repaintViewRectangle):
+        
+            If the region gets very complex merge the repaint rects into a single big rectangle.
+
 2014-01-29  Radu Stavila  <stavila@adobe.com>
 

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

@@ -59 +59 @@
     unsigned totalArea() const;
 
+    unsigned gridSize() const { return m_shape.gridSize(); }
+
 #ifndef NDEBUG
     void dump() const;
@@ -82 +84 @@
         bool isEmpty() const { return m_spans.isEmpty(); }
         bool isRect() const { return m_spans.size() <= 2 && m_segments.size() <= 2; }
+        unsigned gridSize() const { return m_spans.size() * m_segments.size(); }
 
         typedef const Span* SpanIterator;

trunk/Source/WebCore/rendering/RenderView.cpp

@@ -635 +635 @@
     }
     m_accumulatedRepaintRegion->unite(pixelSnappedRect);
+
+    // Region will get slow if it gets too complex. Merge all rects so far to bounds if this happens.
+    // FIXME: Maybe there should be a region type that does this automatically.
+    static const unsigned maximumRepaintRegionGridSize = 16 * 16;
+    if (m_accumulatedRepaintRegion->gridSize() > maximumRepaintRegionGridSize)
+        m_accumulatedRepaintRegion = std::make_unique<Region>(m_accumulatedRepaintRegion->bounds());
 }