Changeset 128757 in webkit

Timestamp:

Sep 17, 2012 8:02:41 AM (12 years ago)

Author:

allan.jensen@nokia.com

Message:

[TouchAdjustment] Adjusted point outside bounds for non-rectilinear targets
​https://bugs.webkit.org/show_bug.cgi?id=96098

Reviewed by Antonio Gomes.

Source/WebCore:

Simplifies how snapTo tries to restrict the adjustment to the touch-area, and
at the same fix it to give better guarantees.

Test: touchadjustment/rotated-node.html

• page/TouchAdjustment.cpp:

(WebCore::TouchAdjustment::snapTo):

LayoutTests:

Expands the test of rotated nodes to also perform checks of the validity of the adjusted points.

• touchadjustment/resources/touchadjustment.js:

(adjustTouchPoint):

• touchadjustment/rotated-node-expected.txt:
• touchadjustment/rotated-node.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/touchadjustment/resources/touchadjustment.js (modified) (2 diffs)
• LayoutTests/touchadjustment/rotated-node-expected.txt (modified) (1 diff)
• LayoutTests/touchadjustment/rotated-node.html (modified) (3 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/TouchAdjustment.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-09-17  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
+
+        [TouchAdjustment] Adjusted point outside bounds for non-rectilinear targets
+        https://bugs.webkit.org/show_bug.cgi?id=96098
+
+        Reviewed by Antonio Gomes.
+
+        Expands the test of rotated nodes to also perform checks of the validity of the adjusted points.
+
+        * touchadjustment/resources/touchadjustment.js:
+        (adjustTouchPoint):
+        * touchadjustment/rotated-node-expected.txt:
+        * touchadjustment/rotated-node.html:
+
 2012-09-17  Christophe Dumez  <christophe.dumez@intel.com>
 

trunk/LayoutTests/touchadjustment/resources/touchadjustment.js

@@ -65 +65 @@
 }
 
-
 function testTouchPoint(touchpoint, targetNode, allowTextNodes)
 {
@@ -80 +79 @@
         adjustedNode = adjustedNode.parentNode;
     shouldBeNode(adjustedNode, targetNode);
+}
+
+function adjustTouchPoint(touchpoint)
+{
+    var adjustedPoint = internals.touchPositionAdjustedToBestClickableNode(touchpoint.left, touchpoint.top, touchpoint.width, touchpoint.height, document);
+    return adjustedPoint;
 }
 

trunk/LayoutTests/touchadjustment/rotated-node-expected.txt

@@ -21 +21 @@
 PASS adjusted node was DIV#container.
 PASS adjusted node was DIV#container.
+
+Adjusted point within bounds
+PASS adjusted point was within (0,-20)x(40,40)
+PASS adjusted point was within (40,40)x(40,40)
+PASS adjusted point was within (-40,40)x(80,40)
+PASS adjusted point was within (50,-20)x(40,80)
 PASS successfullyParsed is true
 

trunk/LayoutTests/touchadjustment/rotated-node.html

@@ -47 +47 @@
     {
         debug('Direct Touches');
-        
+
         testTouchPoint(touchPoint(30, 30, 20), e.rotated);
         testTouchPoint(touchPoint(20, 30, 20), e.rotated);
@@ -76 +76 @@
     }
 
+    function testAdjustedPoints()
+    {
+        debug('\nAdjusted point within bounds');
+        var adjustedPoint = adjustTouchPoint(touchPoint(20, 0, 20))
+        shouldBeWithin(adjustedPoint, touchPoint(20, 0, 20));
+
+        adjustedPoint = adjustTouchPoint(touchPoint(60, 60, 20))
+        shouldBeWithin(adjustedPoint, touchPoint(60, 60, 20));
+
+        adjustedPoint = adjustTouchPoint(touchPoint(0, 60, 40, 20))
+        shouldBeWithin(adjustedPoint, touchPoint(0, 60, 40, 20));
+
+        adjustedPoint = adjustTouchPoint(touchPoint(70, 20, 20, 40))
+        shouldBeWithin(adjustedPoint, touchPoint(70, 20, 20, 40));
+    }
+
     function runTests()
     {
@@ -83 +99 @@
             testDirectTouches();
             testAdjustedTouches();
+            testAdjustedPoints()
             e.container.style.display = 'none';
         }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-17  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
+
+        [TouchAdjustment] Adjusted point outside bounds for non-rectilinear targets
+        https://bugs.webkit.org/show_bug.cgi?id=96098
+
+        Reviewed by Antonio Gomes.
+
+        Simplifies how snapTo tries to restrict the adjustment to the touch-area, and 
+        at the same fix it to give better guarantees.
+
+        Test: touchadjustment/rotated-node.html
+
+        * page/TouchAdjustment.cpp:
+        (WebCore::TouchAdjustment::snapTo):
+
 2012-09-17  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/Source/WebCore/page/TouchAdjustment.cpp

@@ -358 +358 @@
 }
 
+// Adjusts 'point' to the nearest point inside rect, and leaves it unchanged if already inside.
+void adjustPointToRect(FloatPoint& point, const FloatRect& rect)
+{
+    if (point.x() < rect.x())
+        point.setX(rect.x());
+    else if (point.x() > rect.maxX())
+        point.setX(rect.maxX());
+
+    if (point.y() < rect.y())
+        point.setY(rect.y());
+    else if (point.y() > rect.maxY())
+        point.setY(rect.maxY());
+}
+
 bool snapTo(const SubtargetGeometry& geom, const IntPoint& touchPoint, const IntRect& touchArea, IntPoint& adjustedPoint)
 {
@@ -379 +393 @@
     }
 
-    // Non-rectilinear element.
+    // The following code tries to adjust the point to place inside a both the touchArea and the non-rectilinear quad.
+    // FIXME: This will return the point inside the touch area that is the closest to the quad center, but does not
+    // guarantee that the point will be inside the quad. Corner-cases exist where the quad will intersect but this
+    // will fail to adjust the point to somewhere in the intersection.
+
     // Convert quad from content to window coordinates.
     FloatPoint p1 = contentsToWindow(view, quad.p1());
@@ -393 +411 @@
 
     // Pull point towards the center of the element.
-    float cx = 0.25 * (p1.x() + p2.x() + p3.x() + p4.x());
-    float cy = 0.25 * (p1.y() + p2.y() + p3.y() + p4.y());
-    FloatPoint center = FloatPoint(cx, cy);
-
-    FloatSize pullDirection = center - touchPoint;
-    float distanceToCenter = pullDirection.diagonalLength();
-
-    // Use distance from center to corner of touch area to limit adjustment distance.
-    float dx = 0.5f * touchArea.width();
-    float dy = 0.5f * touchArea.height();
-    float touchRadius = sqrt(dx * dx + dy * dy);
-
-    float scaleFactor = touchRadius / distanceToCenter;
-    if (scaleFactor > 1)
-        scaleFactor = 1;
-    pullDirection.scale(scaleFactor);
-
-    int x = static_cast<int>(touchPoint.x() + pullDirection.width());
-    int y = static_cast<int>(touchPoint.y() + pullDirection.height());
-    IntPoint point(x, y);
-
-    if (quad.containsPoint(point)) {
-        adjustedPoint = point;
-        return true;
-    }
-    return false;
+    FloatPoint center = quad.center();
+
+    adjustPointToRect(center, touchArea);
+    adjustedPoint = roundedIntPoint(center);
+
+    return quad.containsPoint(adjustedPoint);
 }