Changeset 114926 in webkit

Timestamp:

Apr 23, 2012 11:59:59 AM (12 years ago)

Author:

eae@chromium.org

Message:

Clean up subpixel unit handling in hit testing code
​https://bugs.webkit.org/show_bug.cgi?id=84496

Reviewed by Eric Seidel.

Fix use of IntRect and LayoutRect in hit testing code in preparation for
subpixel layout.

No new tests, no change in functionality.

• rendering/HitTestResult.cpp:

(WebCore::HitTestResult::rectForPoint):
Revert rectForPoint to IntRect as all call sites converted it to an
IntRect anyway to compare it with an IntPoint or another IntRect.

• rendering/HitTestingTransformState.cpp:

(WebCore::HitTestingTransformState::boundsOfMappedQuad):

• rendering/HitTestingTransformState.h:

Convert boundsOfMappedQuad to LayoutRect as the TransformationMatrix now
has subpixel precision.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/HitTestResult.cpp (modified) (2 diffs)
• rendering/HitTestResult.h (modified) (2 diffs)
• rendering/HitTestingTransformState.cpp (modified) (1 diff)
• rendering/HitTestingTransformState.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-04-23  Emil A Eklund  <eae@chromium.org>
+
+        Clean up subpixel unit handling in hit testing code
+        https://bugs.webkit.org/show_bug.cgi?id=84496
+
+        Reviewed by Eric Seidel.
+
+        Fix use of IntRect and LayoutRect in hit testing code in preparation for
+        subpixel layout.
+
+        No new tests, no change in functionality.
+
+        * rendering/HitTestResult.cpp:
+        (WebCore::HitTestResult::rectForPoint):
+        Revert rectForPoint to IntRect as all call sites converted it to an
+        IntRect anyway to compare it with an IntPoint or another IntRect.
+
+        * rendering/HitTestingTransformState.cpp:
+        (WebCore::HitTestingTransformState::boundsOfMappedQuad):
+        * rendering/HitTestingTransformState.h:
+        Convert boundsOfMappedQuad to LayoutRect as the TransformationMatrix now
+        has subpixel precision.
+
 2012-04-23  Kentaro Hara  <haraken@chromium.org>
 

trunk/Source/WebCore/rendering/HitTestResult.cpp

@@ -653 +653 @@
 }
 
-LayoutRect HitTestResult::rectForPoint(const LayoutPoint& point, unsigned topPadding, unsigned rightPadding, unsigned bottomPadding, unsigned leftPadding)
-{
-    LayoutPoint actualPoint(point);
-    actualPoint -= LayoutSize(leftPadding, topPadding);
+IntRect HitTestResult::rectForPoint(const LayoutPoint& point, unsigned topPadding, unsigned rightPadding, unsigned bottomPadding, unsigned leftPadding)
+{
+    IntPoint actualPoint(roundedIntPoint(point));
+    actualPoint -= IntSize(leftPadding, topPadding);
 
     IntSize actualPadding(leftPadding + rightPadding, topPadding + bottomPadding);
@@ -662 +662 @@
     actualPadding += IntSize(1, 1);
 
-    return LayoutRect(actualPoint, actualPadding);
+    return IntRect(actualPoint, actualPadding);
 }
 

trunk/Source/WebCore/rendering/HitTestResult.h

@@ -113 +113 @@
     // Rect-based hit test related methods.
     bool isRectBasedTest() const { return m_isRectBased; }
-    LayoutRect rectForPoint(const LayoutPoint&) const;
-    static LayoutRect rectForPoint(const LayoutPoint&, unsigned topPadding, unsigned rightPadding, unsigned bottomPadding, unsigned leftPadding);
+    IntRect rectForPoint(const LayoutPoint&) const;
+    static IntRect rectForPoint(const LayoutPoint&, unsigned topPadding, unsigned rightPadding, unsigned bottomPadding, unsigned leftPadding);
     int topPadding() const { return m_topPadding; }
     int rightPadding() const { return m_rightPadding; }
@@ -163 +163 @@
 // width = leftPadding + rightPadding + 1
 // height = topPadding + bottomPadding + 1
-inline LayoutRect HitTestResult::rectForPoint(const LayoutPoint& point) const
+inline IntRect HitTestResult::rectForPoint(const LayoutPoint& point) const
 {
     return rectForPoint(point, m_topPadding, m_rightPadding, m_bottomPadding, m_leftPadding);

trunk/Source/WebCore/rendering/HitTestingTransformState.cpp

@@ -74 +74 @@
 }
 
-IntRect HitTestingTransformState::boundsOfMappedQuad() const
+LayoutRect HitTestingTransformState::boundsOfMappedQuad() const
 {
     return m_accumulatedTransform.inverse().clampedBoundsOfProjectedQuad(m_lastPlanarQuad);

trunk/Source/WebCore/rendering/HitTestingTransformState.h

@@ -59 +59 @@
     FloatPoint mappedPoint() const;
     FloatQuad mappedQuad() const;
-    IntRect boundsOfMappedQuad() const;
+    LayoutRect boundsOfMappedQuad() const;
     void flatten();