Diff
Modified: trunk/LayoutTests/ChangeLog (123246 => 123247)
--- trunk/LayoutTests/ChangeLog 2012-07-20 18:58:00 UTC (rev 123246)
+++ trunk/LayoutTests/ChangeLog 2012-07-20 19:17:58 UTC (rev 123247)
@@ -1,3 +1,23 @@
+2012-07-20 Vincent Scheib <[email protected]>
+
+ Move pointer lock test resources to http/tests/resources in preparation for adding new tests to http.
+ https://bugs.webkit.org/show_bug.cgi?id=91882
+
+ Reviewed by Adrienne Walker.
+
+ * http/tests/resources/pointer-lock/pointer-lock-test-harness.js: Renamed from LayoutTests/pointer-lock/resources/pointer-lock-test-harness.js.
+ * pointer-lock/bug90391-move-then-window-open-crash.html:
+ * pointer-lock/lock-already-locked.html:
+ * pointer-lock/lock-element-not-in-dom.html:
+ * pointer-lock/lock-fail-responses.html:
+ * pointer-lock/locked-element-iframe-removed-from-dom.html:
+ * pointer-lock/locked-element-removed-from-dom.html:
+ * pointer-lock/mouse-event-api.html:
+ * pointer-lock/mouse-event-delivery.html:
+ * pointer-lock/pointer-lock-api.html:
+ * pointer-lock/pointerlockchange-pointerlockerror-events.html:
+ * pointer-lock/pointerlocklost-event.html:
+
2012-07-20 Zan Dobersek <[email protected]>
Unreviewed GTK gardening, adding platform-specific baseline for
Copied: trunk/LayoutTests/http/tests/resources/pointer-lock/pointer-lock-test-harness.js (from rev 123246, trunk/LayoutTests/pointer-lock/resources/pointer-lock-test-harness.js) (0 => 123247)
--- trunk/LayoutTests/http/tests/resources/pointer-lock/pointer-lock-test-harness.js (rev 0)
+++ trunk/LayoutTests/http/tests/resources/pointer-lock/pointer-lock-test-harness.js 2012-07-20 19:17:58 UTC (rev 123247)
@@ -0,0 +1,69 @@
+// Automatically add doNextStepButton to document for manual tests.
+if (!window.testRunner) {
+ setTimeout(function () {
+ doNextStepButton = document.body.insertBefore(document.createElement("button"), document.body.firstChild);
+ doNextStepButton._onclick_ = doNextStep;
+ doNextStepButton.innerText = "doNextStep button for manual testing. Use keyboard to select button and press (TAB, then SPACE).";
+ }, 0);
+}
+
+function doNextStep()
+{
+ if (typeof(currentStep) == "undefined")
+ currentStep = 0;
+
+ setTimeout(function () {
+ var thisStep = currentStep++;
+ if (thisStep < todo.length)
+ todo[thisStep]();
+ else if (thisStep == todo.length)
+ setTimeout(function () { finishJSTest(); }, 0); // Deferred so that excessive doNextStep calls will be observed.
+ else
+ testFailed("doNextStep called too many times.");
+ }, 0);
+}
+
+function doNextStepWithUserGesture()
+{
+ if (!window.testRunner)
+ return; // Wait for human to press doNextStep button.
+ doNextStep();
+}
+
+function eventExpected(eventHandlerName, message, expectedCalls, targetHanderNode)
+{
+ targetHanderNode[eventHandlerName] = function () {
+ switch (expectedCalls--) {
+ case 0:
+ testFailed(eventHandlerName + " received after: " + message);
+ finishJSTest();
+ break;
+ case 1:
+ doNextStep();
+ default:
+ testPassed(eventHandlerName + " received after: " + message);
+ };
+ };
+};
+
+function expectOnlyChangeEvent(message, targetDocument) {
+ debug(" " + message);
+ targetDocument = targetDocument !== undefined ? targetDocument : document;
+ eventExpected("onwebkitpointerlockchange", message, 1, targetDocument);
+ eventExpected("onwebkitpointerlockerror", message, 0, targetDocument);
+};
+
+function expectOnlyErrorEvent(message, targetDocument) {
+ debug(" " + message);
+ targetDocument = targetDocument !== undefined ? targetDocument : document;
+ eventExpected("onwebkitpointerlockchange", message, 0, targetDocument);
+ eventExpected("onwebkitpointerlockerror", message, 1, targetDocument);
+};
+
+function expectNoEvents(message, targetDocument) {
+ debug(" " + message);
+ targetDocument = targetDocument !== undefined ? targetDocument : document;
+ eventExpected("onwebkitpointerlockchange", message, 0, targetDocument);
+ eventExpected("onwebkitpointerlockerror", message, 0, targetDocument);
+};
+
Property changes: trunk/LayoutTests/http/tests/resources/pointer-lock/pointer-lock-test-harness.js
Added: svn:eol-style
Modified: trunk/LayoutTests/pointer-lock/bug90391-move-then-window-open-crash.html (123246 => 123247)
--- trunk/LayoutTests/pointer-lock/bug90391-move-then-window-open-crash.html 2012-07-20 18:58:00 UTC (rev 123246)
+++ trunk/LayoutTests/pointer-lock/bug90391-move-then-window-open-crash.html 2012-07-20 19:17:58 UTC (rev 123247)
@@ -1,8 +1,8 @@
<!DOCTYPE HTML>
<html>
<head>
-<script src=""
-<script src=""
+<script src=""
+<script src=""
</head>
<body>
<div>
@@ -49,6 +49,6 @@
];
doNextStepWithUserGesture();
</script>
-<script src=""
+<script src=""
</body>
</html>
Modified: trunk/LayoutTests/pointer-lock/lock-already-locked.html (123246 => 123247)
--- trunk/LayoutTests/pointer-lock/lock-already-locked.html 2012-07-20 18:58:00 UTC (rev 123246)
+++ trunk/LayoutTests/pointer-lock/lock-already-locked.html 2012-07-20 19:17:58 UTC (rev 123247)
@@ -1,8 +1,8 @@
<!DOCTYPE HTML>
<html>
<head>
-<script src=""
-<script src=""
+<script src=""
+<script src=""
</head>
<body>
<div>
@@ -102,6 +102,6 @@
];
doNextStepWithUserGesture();
</script>
-<script src=""
+<script src=""
</body>
</html>
Modified: trunk/LayoutTests/pointer-lock/lock-element-not-in-dom.html (123246 => 123247)
--- trunk/LayoutTests/pointer-lock/lock-element-not-in-dom.html 2012-07-20 18:58:00 UTC (rev 123246)
+++ trunk/LayoutTests/pointer-lock/lock-element-not-in-dom.html 2012-07-20 19:17:58 UTC (rev 123247)
@@ -1,8 +1,8 @@
<!DOCTYPE HTML>
<html>
<head>
-<script src=""
-<script src=""
+<script src=""
+<script src=""
</head>
<body>
<div>
@@ -26,6 +26,6 @@
];
doNextStepWithUserGesture();
</script>
-<script src=""
+<script src=""
</body>
</html>
Modified: trunk/LayoutTests/pointer-lock/lock-fail-responses.html (123246 => 123247)
--- trunk/LayoutTests/pointer-lock/lock-fail-responses.html 2012-07-20 18:58:00 UTC (rev 123246)
+++ trunk/LayoutTests/pointer-lock/lock-fail-responses.html 2012-07-20 19:17:58 UTC (rev 123247)
@@ -1,8 +1,8 @@
<!DOCTYPE HTML>
<html>
<head>
-<script src=""
-<script src=""
+<script src=""
+<script src=""
</head>
<body>
<script>
@@ -38,6 +38,6 @@
];
doNextStepWithUserGesture();
</script>
-<script src=""
+<script src=""
</body>
</html>
Modified: trunk/LayoutTests/pointer-lock/locked-element-iframe-removed-from-dom.html (123246 => 123247)
--- trunk/LayoutTests/pointer-lock/locked-element-iframe-removed-from-dom.html 2012-07-20 18:58:00 UTC (rev 123246)
+++ trunk/LayoutTests/pointer-lock/locked-element-iframe-removed-from-dom.html 2012-07-20 19:17:58 UTC (rev 123247)
@@ -1,8 +1,8 @@
<!DOCTYPE HTML>
<html>
<head>
-<script src=""
-<script src=""
+<script src=""
+<script src=""
</head>
<body>
<div>
@@ -44,6 +44,6 @@
];
doNextStep();
</script>
-<script src=""
+<script src=""
</body>
</html>
Modified: trunk/LayoutTests/pointer-lock/locked-element-removed-from-dom.html (123246 => 123247)
--- trunk/LayoutTests/pointer-lock/locked-element-removed-from-dom.html 2012-07-20 18:58:00 UTC (rev 123246)
+++ trunk/LayoutTests/pointer-lock/locked-element-removed-from-dom.html 2012-07-20 19:17:58 UTC (rev 123247)
@@ -1,8 +1,8 @@
<!DOCTYPE HTML>
<html>
<head>
-<script src=""
-<script src=""
+<script src=""
+<script src=""
</head>
<body>
<div>
@@ -48,6 +48,6 @@
];
doNextStep();
</script>
-<script src=""
+<script src=""
</body>
</html>
Modified: trunk/LayoutTests/pointer-lock/mouse-event-api.html (123246 => 123247)
--- trunk/LayoutTests/pointer-lock/mouse-event-api.html 2012-07-20 18:58:00 UTC (rev 123246)
+++ trunk/LayoutTests/pointer-lock/mouse-event-api.html 2012-07-20 19:17:58 UTC (rev 123247)
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html>
<head>
-<script src=""
+<script src=""
</head>
<body>
<script>
@@ -9,6 +9,6 @@
shouldBeDefined("mouseEvent.webkitMovementX");
shouldBeDefined("mouseEvent.webkitMovementY");
</script>
-<script src=""
+<script src=""
</body>
</html>
Modified: trunk/LayoutTests/pointer-lock/mouse-event-delivery.html (123246 => 123247)
--- trunk/LayoutTests/pointer-lock/mouse-event-delivery.html 2012-07-20 18:58:00 UTC (rev 123246)
+++ trunk/LayoutTests/pointer-lock/mouse-event-delivery.html 2012-07-20 19:17:58 UTC (rev 123247)
@@ -1,8 +1,8 @@
<!DOCTYPE HTML>
<html>
<head>
-<script src=""
-<script src=""
+<script src=""
+<script src=""
</head>
<body id="body">
<div>
@@ -98,6 +98,6 @@
];
doNextStepWithUserGesture();
</script>
-<script src=""
+<script src=""
</body>
</html>
Modified: trunk/LayoutTests/pointer-lock/pointer-lock-api.html (123246 => 123247)
--- trunk/LayoutTests/pointer-lock/pointer-lock-api.html 2012-07-20 18:58:00 UTC (rev 123246)
+++ trunk/LayoutTests/pointer-lock/pointer-lock-api.html 2012-07-20 19:17:58 UTC (rev 123247)
@@ -1,8 +1,8 @@
<!DOCTYPE HTML>
<html>
<head>
-<script src=""
-<script src=""
+<script src=""
+<script src=""
</head>
<body>
<script>
@@ -35,6 +35,6 @@
];
doNextStepWithUserGesture();
</script>
-<script src=""
+<script src=""
</body>
</html>
Modified: trunk/LayoutTests/pointer-lock/pointerlockchange-pointerlockerror-events.html (123246 => 123247)
--- trunk/LayoutTests/pointer-lock/pointerlockchange-pointerlockerror-events.html 2012-07-20 18:58:00 UTC (rev 123246)
+++ trunk/LayoutTests/pointer-lock/pointerlockchange-pointerlockerror-events.html 2012-07-20 19:17:58 UTC (rev 123247)
@@ -1,8 +1,8 @@
<!DOCTYPE HTML>
<html>
<head>
-<script src=""
-<script src=""
+<script src=""
+<script src=""
</head>
<body>
<div>
@@ -92,6 +92,6 @@
];
doNextStep();
</script>
-<script src=""
+<script src=""
</body>
</html>
Modified: trunk/LayoutTests/pointer-lock/pointerlocklost-event.html (123246 => 123247)
--- trunk/LayoutTests/pointer-lock/pointerlocklost-event.html 2012-07-20 18:58:00 UTC (rev 123246)
+++ trunk/LayoutTests/pointer-lock/pointerlocklost-event.html 2012-07-20 19:17:58 UTC (rev 123247)
@@ -1,8 +1,8 @@
<!DOCTYPE HTML>
<html>
<head>
-<script src=""
-<script src=""
+<script src=""
+<script src=""
</head>
<body>
<div>
@@ -100,7 +100,7 @@
];
doNextStepWithUserGesture();
</script>
-<script src=""
+<script src=""
</body>
</html>
Deleted: trunk/LayoutTests/pointer-lock/resources/pointer-lock-test-harness.js (123246 => 123247)
--- trunk/LayoutTests/pointer-lock/resources/pointer-lock-test-harness.js 2012-07-20 18:58:00 UTC (rev 123246)
+++ trunk/LayoutTests/pointer-lock/resources/pointer-lock-test-harness.js 2012-07-20 19:17:58 UTC (rev 123247)
@@ -1,69 +0,0 @@
-// Automatically add doNextStepButton to document for manual tests.
-if (!window.testRunner) {
- setTimeout(function () {
- doNextStepButton = document.body.insertBefore(document.createElement("button"), document.body.firstChild);
- doNextStepButton._onclick_ = doNextStep;
- doNextStepButton.innerText = "doNextStep button for manual testing. Use keyboard to select button and press (TAB, then SPACE).";
- }, 0);
-}
-
-function doNextStep()
-{
- if (typeof(currentStep) == "undefined")
- currentStep = 0;
-
- setTimeout(function () {
- var thisStep = currentStep++;
- if (thisStep < todo.length)
- todo[thisStep]();
- else if (thisStep == todo.length)
- setTimeout(function () { finishJSTest(); }, 0); // Deferred so that excessive doNextStep calls will be observed.
- else
- testFailed("doNextStep called too many times.");
- }, 0);
-}
-
-function doNextStepWithUserGesture()
-{
- if (!window.testRunner)
- return; // Wait for human to press doNextStep button.
- doNextStep();
-}
-
-function eventExpected(eventHandlerName, message, expectedCalls, targetHanderNode)
-{
- targetHanderNode[eventHandlerName] = function () {
- switch (expectedCalls--) {
- case 0:
- testFailed(eventHandlerName + " received after: " + message);
- finishJSTest();
- break;
- case 1:
- doNextStep();
- default:
- testPassed(eventHandlerName + " received after: " + message);
- };
- };
-};
-
-function expectOnlyChangeEvent(message, targetDocument) {
- debug(" " + message);
- targetDocument = targetDocument !== undefined ? targetDocument : document;
- eventExpected("onwebkitpointerlockchange", message, 1, targetDocument);
- eventExpected("onwebkitpointerlockerror", message, 0, targetDocument);
-};
-
-function expectOnlyErrorEvent(message, targetDocument) {
- debug(" " + message);
- targetDocument = targetDocument !== undefined ? targetDocument : document;
- eventExpected("onwebkitpointerlockchange", message, 0, targetDocument);
- eventExpected("onwebkitpointerlockerror", message, 1, targetDocument);
-};
-
-function expectNoEvents(message, targetDocument) {
- debug(" " + message);
- targetDocument = targetDocument !== undefined ? targetDocument : document;
- eventExpected("onwebkitpointerlockchange", message, 0, targetDocument);
- eventExpected("onwebkitpointerlockerror", message, 0, targetDocument);
-};
-
Modified: trunk/Source/WebCore/dom/Document.cpp (123246 => 123247)
--- trunk/Source/WebCore/dom/Document.cpp 2012-07-20 18:58:00 UTC (rev 123246)
+++ trunk/Source/WebCore/dom/Document.cpp 2012-07-20 19:17:58 UTC (rev 123247)
@@ -5816,6 +5816,23 @@
void Document::webkitExitPointerLock()
{
if (page())
+ page()->pointerLockController()->requestPointerLock(element, 0, 0);
+ else
+ element->document()->enqueueDocumentEvent(Event::create(eventNames().webkitpointerlockerrorEvent, true, false));
+}
+
+bool Document::webkitPointerLockEnabled() const
+{
+ return isAttributeOnAllOwners(webkitallowpointerlockAttr, ownerElement());
+}
+
+void Document::webkitExitPointerLock()
+{
+ Element* element;
+ if (!page() || !(element = page()->pointerLockController()->element()))
+ return;
+
+ if (securityOrigin()->canAccess(element->document()->securityOrigin()))
page()->pointerLockController()->requestPointerUnlock();
}