Index: third_party/WebKit/LayoutTests/fast/events/pointerevents/pointerevent_touch-action-verification.html |
diff --git a/third_party/WebKit/LayoutTests/imported/wpt/pointerevents/pointerevent_touch-action-verification.html b/third_party/WebKit/LayoutTests/fast/events/pointerevents/pointerevent_touch-action-verification.html |
similarity index 87% |
copy from third_party/WebKit/LayoutTests/imported/wpt/pointerevents/pointerevent_touch-action-verification.html |
copy to third_party/WebKit/LayoutTests/fast/events/pointerevents/pointerevent_touch-action-verification.html |
index 7800f2c9da2245ea91ba77158f13d8f0c396f4a8..311ed73e64c3eee019fd2a4875d472321d11f4ad 100644 |
--- a/third_party/WebKit/LayoutTests/imported/wpt/pointerevents/pointerevent_touch-action-verification.html |
+++ b/third_party/WebKit/LayoutTests/fast/events/pointerevents/pointerevent_touch-action-verification.html |
@@ -1,6 +1,10 @@ |
<!doctype html> |
<html> |
<head> |
+<!-- This is a fork of the web-platform-test version to support pinch-zoom. |
+ It should be integrated into web-platform-test when the pinch-zoom is |
+ accepted into the specification. |
+ See https://github.com/w3c/pointerevents/issues/29 --> |
<title>touch-action: basic verification</title> |
<meta name="assert" content="TA15.20 - The touch-action CSS property determines whether touch input MAY trigger default behavior supplied by the user agent. |
auto: The user agent MAY determine any permitted touch behaviors, such as panning and zooming manipulations of the viewport, for touches that begin on the element. |
@@ -10,9 +14,9 @@ |
manipulation: The user agent MAY consider touches that begin on the element only for the purposes of scrolling and continuous zooming. Any additional behaviors supported by auto are out of scope for this specification."> |
<meta name="viewport" content="width=device-width"> |
<link rel="stylesheet" type="text/css" href="pointerevent_styles.css"> |
- <script src="/resources/testharness.js"></script> |
- <script src="/resources/testharnessreport.js"></script> |
- <script src="pointerevent_support.js"></script> |
+ <script src="../../../resources/testharness.js"></script> |
+ <script src="../../../resources/testharnessreport.js"></script> |
+ <script src="../../../imported/wpt/pointerevents/pointerevent_support.js"></script> |
<style> |
/* |
Give some rules below something to override in order to test |
@@ -57,6 +61,7 @@ |
<div class="test" id="explicit-pan-y" style="touch-action: pan-y;" expected="pan-y"></div> |
<div class="test" id="explicit-pan-up" style="touch-action: pan-up;" expected="pan-up"></div> |
<div class="test" id="explicit-pan-down" style="touch-action: pan-down;" expected="pan-down"></div> |
+ <div class="test" id="explicit-pinch-zoom" style="touch-action: pinch-zoom;" expected="pinch-zoom"></div> |
<div class="test" id="explicit-pan-x-pan-y" style="touch-action: pan-x pan-y;" expected="pan-x pan-y"></div> |
<div class="test" id="explicit-pan-y-pan-x" style="touch-action: pan-y pan-x;" expected="pan-x pan-y"></div> |
<div class="test" id="explicit-pan-left-pan-up" style="touch-action: pan-left pan-up;" expected="pan-left pan-up"></div> |
@@ -67,6 +72,8 @@ |
<div class="test" id="explicit-pan-up-pan-right" style="touch-action: pan-up pan-right;" expected="pan-right pan-up"></div> |
<div class="test" id="explicit-pan-down-pan-left" style="touch-action: pan-down pan-left;" expected="pan-left pan-down"></div> |
<div class="test" id="explicit-pan-down-pan-right" style="touch-action: pan-down pan-right;" expected="pan-right pan-down"></div> |
+ <div class="test" id="explicit-pinch-zoom-pan-x-pan-up" style="touch-action: pinch-zoom pan-x pan-up;" expected="pan-x pan-up pinch-zoom"></div> |
+ <div class="test" id="explicit-pinch-zoom-pan-x-pan-y" style="touch-action: pinch-zoom pan-x pan-y;" expected="manipulation"></div> |
<div class="test" id="explicit-manipulation" style="touch-action: manipulation;" expected="manipulation"></div> |
<div class="test" id="explicit-none" style="touch-action: none;" expected="none"></div> |
<div class="test" id="explicit-invalid-1" style="touch-action: bogus;" expected="auto"></div> |
@@ -82,6 +89,7 @@ |
<div class="test" id="explicit-invalid-11" style="touch-action: pan-y pan-down;" expected="auto"></div> |
<div class="test" id="explicit-invalid-12" style="touch-action: pan-left pan-right;" expected="auto"></div> |
<div class="test" id="explicit-invalid-13" style="touch-action: pan-up pan-down;" expected="auto"></div> |
+ <div class="test" id="explicit-invalid-14" style="touch-action: pinch-zoom none;" expected="auto"></div> |
<div style="touch-action: none;"> |
<div class="test" id="not-inherited" expected="auto"></div> |
<div class="test" id="inherit" style="touch-action: inherit;" expected="none"></div> |