[chromium] Two touchadjustment tests are failing on mac

https://bugs.webkit.org/show_bug.cgi?id=100833

Patch by Rick Byers <rbyers@chromium.org> on 2012-11-06
Reviewed by Antonio Gomes.

Re-enable these two tests with appropriate tweaks.  Also avoid the platform dependant
behavior by switching to the Ahem font.

* platform/chromium/TestExpectations: Remove the failure expectations.
* touchadjustment/html-label.html: Tweak one very borderline case to be closer to pass
reliably.  Previously this passed only due to a bug in the test infrastructure fixed in r132929.
* touchadjustment/nested-touch.html: Tweak borderline case to compensate for inclusion of
the border in the measurement of the size of the div.

git-svn-id: svn://svn.chromium.org/blink/trunk@133636 bbb929c8-8fbe-4397-9dbb-9b2b20218538

2 files changed, 13 insertions, 7 deletions

diff --git a/third_party/WebKit/LayoutTests/touchadjustment/html-label.html b/third_party/WebKit/LayoutTests/touchadjustment/html-label.html
index 3c116a5..d544131 100644
--- a/third_party/WebKit/LayoutTests/touchadjustment/html-label.html
+++ b/third_party/WebKit/LayoutTests/touchadjustment/html-label.html
@@ -9,6 +9,7 @@
             position: absolute;
             left: 0px;
             top: 0px;
+            font: 16px Ahem;
         }
     </style>
 </head>
@@ -42,10 +43,10 @@
         testTouchPoint(touchpoint, element);
     }
 
-    function testIndirectTouch(element)
+    function testIndirectTouch(element, offset)
     {
         // Touch just right of the element.
-        var touchpoint = offsetTouchPoint(findAbsoluteBounds(element), 'right', 10, 30, 20);
+        var touchpoint = offsetTouchPoint(findAbsoluteBounds(element), 'right', offset, 30, 20);
         testTouchPoint(touchpoint, element);
     }
 
@@ -62,9 +63,14 @@
     {
         debug('Testing indirect hits.');
 
-        testIndirectTouch(e.mylink);
-        testIndirectTouch(e.mylabel);
-        testIndirectTouch(e.myinput);
+        testIndirectTouch(e.mylink, 10);
+
+        // This case is very borderline - there's not much reason to adjust
+        // left to the label instead of up to the link (it's closer to
+        // the label, but overlaps with more of the link).
+        testIndirectTouch(e.mylabel, 1);
+
+        testIndirectTouch(e.myinput, 10);
     }
 
     function runTests()
diff --git a/third_party/WebKit/LayoutTests/touchadjustment/nested-touch.html b/third_party/WebKit/LayoutTests/touchadjustment/nested-touch.html
index 264e887..7e7bc26 100644
--- a/third_party/WebKit/LayoutTests/touchadjustment/nested-touch.html
+++ b/third_party/WebKit/LayoutTests/touchadjustment/nested-touch.html
@@ -5,7 +5,7 @@
     <script src="../fast/js/resources/js-test-pre.js"></script>
     <script src="resources/touchadjustment.js"></script>
     <style>
-        #sandbox { }
+        #sandbox { font: 16px Ahem; }
         .box { border: 1px solid black; border-radius: 5px 5px; margin: 12px; max-width: 40em; }
     </style>
 </head>
@@ -76,7 +76,7 @@
         // First test was centered, now move the test closer to the wrong node, and ensure we still get the prefered node.
         testTouchPoint(touchPointDoubleTouch(e.mybox1, e.mybox2, 5), e.mybox1);
 
-        testTouchPoint(touchPointDoubleTouch(e.mybox1, e.mybox2, 10), e.mybox1);
+        testTouchPoint(touchPointDoubleTouch(e.mybox1, e.mybox2, 8), e.mybox1);
     }
 
     function runTests()