Title: [133636] trunk/LayoutTests
- Revision
- 133636
- Author
- [email protected]
- Date
- 2012-11-06 10:40:26 -0800 (Tue, 06 Nov 2012)
Log Message
[chromium] Two touchadjustment tests are failing on mac
https://bugs.webkit.org/show_bug.cgi?id=100833
Patch by Rick Byers <[email protected]> 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.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (133635 => 133636)
--- trunk/LayoutTests/ChangeLog 2012-11-06 18:27:51 UTC (rev 133635)
+++ trunk/LayoutTests/ChangeLog 2012-11-06 18:40:26 UTC (rev 133636)
@@ -1,3 +1,19 @@
+2012-11-06 Rick Byers <[email protected]>
+
+ [chromium] Two touchadjustment tests are failing on mac
+ https://bugs.webkit.org/show_bug.cgi?id=100833
+
+ 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.
+
2012-11-06 Joshua Bell <[email protected]>
[Chromium] Unreviewed gardening.
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (133635 => 133636)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2012-11-06 18:27:51 UTC (rev 133635)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-11-06 18:40:26 UTC (rev 133636)
@@ -4153,9 +4153,6 @@
# Seems to have the wrong font in the SVG part of the test (CSS is ok).
webkit.org/b/100806 [ Win ] svg/custom/font-face-simple.svg [ Failure ]
-webkit.org/b/100833 [ Mac ] touchadjustment/html-label.html [ Text ]
-webkit.org/b/100833 [ Mac ] touchadjustment/nested-touch.html [ Text ]
-
# This test is consistently leaking state into the next test (object-src-url-allowed.html) after r133069.
webkit.org/b/100955 http/tests/security/contentSecurityPolicy/object-src-none-blocked.html [ Skip ]
Modified: trunk/LayoutTests/touchadjustment/html-label.html (133635 => 133636)
--- trunk/LayoutTests/touchadjustment/html-label.html 2012-11-06 18:27:51 UTC (rev 133635)
+++ trunk/LayoutTests/touchadjustment/html-label.html 2012-11-06 18:40:26 UTC (rev 133636)
@@ -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()
Modified: trunk/LayoutTests/touchadjustment/nested-touch.html (133635 => 133636)
--- trunk/LayoutTests/touchadjustment/nested-touch.html 2012-11-06 18:27:51 UTC (rev 133635)
+++ trunk/LayoutTests/touchadjustment/nested-touch.html 2012-11-06 18:40:26 UTC (rev 133636)
@@ -5,7 +5,7 @@
<script src=""
<script src=""
<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()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
