Changeset 110624 in webkit

Timestamp:

Mar 13, 2012, 3:35:16 PM (15 years ago)

Author:

commit-queue@webkit.org

Message:

Region::contains(IntPoint) is slow
​https://bugs.webkit.org/show_bug.cgi?id=81008

Patch by Dana Jansens <​danakj@chromium.org> on 2012-03-13
Reviewed by Anders Carlsson.

Source/WebCore:

Speed up Region::contains(IntPoint) by directly testing if the point
is inside the Region's shape, rather than using a temporary 1x1 Region
for the test.

Unit test: RegionTest.containsPoint

• platform/graphics/Region.cpp:

(WebCore::Region::contains):

Source/WebKit/chromium:

• WebKit.gypi:
• tests/RegionTest.cpp: Added.

(WebCore):
(WebCore::TEST):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/Region.cpp (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/WebKit.gypi (modified) (1 diff)
• WebKit/chromium/tests/RegionTest.cpp (added)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-13  Dana Jansens  <danakj@chromium.org>
+
+        Region::contains(IntPoint) is slow
+        https://bugs.webkit.org/show_bug.cgi?id=81008
+
+        Reviewed by Anders Carlsson.
+
+        Speed up Region::contains(IntPoint) by directly testing if the point
+        is inside the Region's shape, rather than using a temporary 1x1 Region
+        for the test.
+
+        Unit test: RegionTest.containsPoint
+
+        * platform/graphics/Region.cpp:
+        (WebCore::Region::contains):
+
 2012-03-13  Adrienne Walker  <enne@google.com>
 

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

@@ -73 +73 @@
 bool Region::contains(const IntPoint& point) const
 {
-    // FIXME: This is inefficient. We should be able to iterate over the spans and find
-    // out if the region contains the point.
-    return contains(IntRect(point, IntSize(1, 1)));
+    if (!m_bounds.contains(point))
+        return false;
+
+    for (Shape::SpanIterator span = m_shape.spans_begin(), end = m_shape.spans_end(); span != end && span + 1 != end; ++span) {
+        int y = span->y;
+        int maxY = (span + 1)->y;
+
+        if (y > point.y())
+            break;
+        if (maxY <= point.y())
+            continue;
+
+        for (Shape::SegmentIterator segment = m_shape.segments_begin(span), end = m_shape.segments_end(span); segment != end && segment + 1 != end; segment += 2) {
+            int x = *segment;
+            int maxX = *(segment + 1);
+
+            if (x > point.x())
+                break;
+            if (maxX > point.x())
+                return true;
+        }
+    }
+
+    return false;
 }
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-03-13  Dana Jansens  <danakj@chromium.org>
+
+        Region::contains(IntPoint) is slow
+        https://bugs.webkit.org/show_bug.cgi?id=81008
+
+        Reviewed by Anders Carlsson.
+
+        * WebKit.gypi:
+        * tests/RegionTest.cpp: Added.
+        (WebCore):
+        (WebCore::TEST):
+
 2012-03-13  Gavin Peters  <gavinp@chromium.org>
 

trunk/Source/WebKit/chromium/WebKit.gypi

@@ -117 +117 @@
             'tests/PODIntervalTreeTest.cpp',
             'tests/PODRedBlackTreeTest.cpp',
+            'tests/RegionTest.cpp',
             'tests/RenderTableCellTest.cpp',
             'tests/ScrollbarLayerChromiumTest.cpp',