Changeset 142187 in webkit

Timestamp:

Feb 7, 2013 3:20:27 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[CSS Exclusions] Ignore ExclusionPolygon edges above minLogicalIntervalTop
​https://bugs.webkit.org/show_bug.cgi?id=107566

Patch by Hans Muller <​hmuller@adobe.com> on 2013-02-07
Reviewed by David Hyatt.

Source/WebCore:

Improve ExclusionPolygon::firstIncludedIntervalLogicalTop() performance by only
creating offset edges for polygon edges that are below the horizontal minLogicalIntervalTop
line. In other words, don't bother creating offset edges that can't define the polygon's
first fit location.

Test: fast/exclusions/shape-inside/shape-inside-first-fit-004.html

• rendering/ExclusionPolygon.cpp:

(WebCore::ExclusionPolygon::firstIncludedIntervalLogicalTop): Don't create offset edges for polygon edges above minLogicalIntervalTop.

LayoutTests:

Added a simple polygonal shape-inside test where only a subset of the polygon edges
should contribute to each line's offset edges.

• fast/exclusions/shape-inside/shape-inside-first-fit-004-expected.html: Added.
• fast/exclusions/shape-inside/shape-inside-first-fit-004.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/exclusions/shape-inside/shape-inside-first-fit-004-expected.html (added)
• LayoutTests/fast/exclusions/shape-inside/shape-inside-first-fit-004.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/ExclusionPolygon.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-07  Hans Muller  <hmuller@adobe.com>
+
+        [CSS Exclusions] Ignore ExclusionPolygon edges above minLogicalIntervalTop
+        https://bugs.webkit.org/show_bug.cgi?id=107566
+
+        Reviewed by David Hyatt.
+
+        Added a simple polygonal shape-inside test where only a subset of the polygon edges
+        should contribute to each line's offset edges.
+
+        * fast/exclusions/shape-inside/shape-inside-first-fit-004-expected.html: Added.
+        * fast/exclusions/shape-inside/shape-inside-first-fit-004.html: Added.
+
 2013-02-07  James Craig  <jcraig@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-07  Hans Muller  <hmuller@adobe.com>
+
+        [CSS Exclusions] Ignore ExclusionPolygon edges above minLogicalIntervalTop
+        https://bugs.webkit.org/show_bug.cgi?id=107566
+
+        Reviewed by David Hyatt.
+
+        Improve ExclusionPolygon::firstIncludedIntervalLogicalTop() performance by only
+        creating offset edges for polygon edges that are below the horizontal minLogicalIntervalTop
+        line. In other words, don't bother creating offset edges that can't define the polygon's
+        first fit location.
+
+        Test: fast/exclusions/shape-inside/shape-inside-first-fit-004.html
+
+        * rendering/ExclusionPolygon.cpp:
+        (WebCore::ExclusionPolygon::firstIncludedIntervalLogicalTop): Don't create offset edges for polygon edges above minLogicalIntervalTop.
+
 2013-02-07  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/rendering/ExclusionPolygon.cpp

@@ -498 +498 @@
         return false;
 
+    Vector<ExclusionPolygon::EdgeInterval> overlappingEdges;
+    m_edgeTree.allOverlaps(ExclusionPolygon::EdgeInterval(minLogicalIntervalTop, m_boundingBox.maxY(), 0), overlappingEdges);
+
     float dx = minLogicalIntervalSize.width() / 2;
     float dy = minLogicalIntervalSize.height() / 2;
     Vector<OffsetPolygonEdge> offsetEdges;
 
-    for (unsigned i = 0; i < numberOfEdges(); ++i) {
-        const ExclusionPolygonEdge& edge = edgeAt(i);
+    for (unsigned i = 0; i < overlappingEdges.size(); ++i) {
+        const ExclusionPolygonEdge& edge = *static_cast<ExclusionPolygonEdge*>(overlappingEdges[i].data());
         const FloatPoint& vertex1 = edge.vertex1();
         const FloatPoint& vertex2 = edge.vertex2();