<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[209525] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/209525">209525</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-12-07 22:19:57 -0800 (Wed, 07 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Exit pointer lock when page goes into page cache.
https://bugs.webkit.org/show_bug.cgi?id=165425
rdar://problem/29430834
Patch by Jeremy Jones <jeremyj@apple.com> on 2016-12-07
Reviewed by Jer Noble.
Source/WebCore:
Test: pointer-lock/lock-lost-on-navigation.html
Cancel pointer lock when page goes into page cache and add methods to Internals
so it can be tested.
* dom/Document.cpp:
(WebCore::Document::setPageCacheState):
* page/PointerLockController.h:
* testing/Internals.cpp:
(WebCore::Internals::pageHasPendingPointerLock):
(WebCore::Internals::pageHasPointerLock):
* testing/Internals.h:
* testing/Internals.idl:
LayoutTests:
* platform/mac/TestExpectations:
* pointer-lock/lock-lost-on-navigation-expected.txt: Added.
* pointer-lock/lock-lost-on-navigation.html: Added.
* pointer-lock/resources/lock-lost-on-navigation2.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePointerLockControllerh">trunk/Source/WebCore/page/PointerLockController.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsh">trunk/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsidl">trunk/Source/WebCore/testing/Internals.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestspointerlocklocklostonnavigationexpectedtxt">trunk/LayoutTests/pointer-lock/lock-lost-on-navigation-expected.txt</a></li>
<li><a href="#trunkLayoutTestspointerlocklocklostonnavigationhtml">trunk/LayoutTests/pointer-lock/lock-lost-on-navigation.html</a></li>
<li>trunk/LayoutTests/pointer-lock/resources/</li>
<li><a href="#trunkLayoutTestspointerlockresourceslocklostonnavigation2html">trunk/LayoutTests/pointer-lock/resources/lock-lost-on-navigation2.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209524 => 209525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-12-08 06:14:07 UTC (rev 209524)
+++ trunk/LayoutTests/ChangeLog 2016-12-08 06:19:57 UTC (rev 209525)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-12-07 Jeremy Jones <jeremyj@apple.com>
+
+ Exit pointer lock when page goes into page cache.
+ https://bugs.webkit.org/show_bug.cgi?id=165425
+ rdar://problem/29430834
+
+ Reviewed by Jer Noble.
+
+ * platform/mac/TestExpectations:
+ * pointer-lock/lock-lost-on-navigation-expected.txt: Added.
+ * pointer-lock/lock-lost-on-navigation.html: Added.
+ * pointer-lock/resources/lock-lost-on-navigation2.html: Added.
+
</ins><span class="cx"> 2016-12-07 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [CSS Parser] Unskip calc() tests
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (209524 => 209525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2016-12-08 06:14:07 UTC (rev 209524)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2016-12-08 06:19:57 UTC (rev 209525)
</span><span class="lines">@@ -288,6 +288,7 @@
</span><span class="cx"> pointer-lock/pointerlockchange-event-on-lock-lost.html
</span><span class="cx"> pointer-lock/pointerlockchange-pointerlockerror-events.html
</span><span class="cx"> pointer-lock/pointerlockelement-null-when-pending.html
</span><ins>+pointer-lock/lock-lost-on-navigation.html [ Pass ]
</ins><span class="cx"> http/tests/pointer-lock/
</span><span class="cx">
</span><span class="cx"> webkit.org/b/82763 fast/forms/textarea-placeholder-set-attribute.html
</span></span></pre></div>
<a id="trunkLayoutTestspointerlocklocklostonnavigationexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/pointer-lock/lock-lost-on-navigation-expected.txt (0 => 209525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/pointer-lock/lock-lost-on-navigation-expected.txt (rev 0)
+++ trunk/LayoutTests/pointer-lock/lock-lost-on-navigation-expected.txt 2016-12-08 06:19:57 UTC (rev 209525)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+Test that pointer lock is lost after navigation.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS window.testRunner is defined.
+PASS internals.pageHasPendingPointerLock() is false
+PASS internals.pageHasPointerLock() is false
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestspointerlocklocklostonnavigationhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/pointer-lock/lock-lost-on-navigation.html (0 => 209525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/pointer-lock/lock-lost-on-navigation.html (rev 0)
+++ trunk/LayoutTests/pointer-lock/lock-lost-on-navigation.html 2016-12-08 06:19:57 UTC (rev 209525)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+<!DOCTYPE HTML>
+<html>
+<head>
+<script src="../http/tests/resources/js-test-pre.js"></script>
+<script src="../http/tests/resources/pointer-lock/pointer-lock-test-harness.js"></script>
+</head>
+<body>
+<div>
+ <div id="target1"></div>
+</div>
+<script>
+ description("Test that pointerlockchange event is dispatched when lock is lost.")
+ window.jsTestIsAsync = true;
+ shouldBeDefined("window.testRunner");
+
+ targetDiv1 = document.getElementById("target1");
+
+ todo = [
+ function () {
+ expectOnlyChangeEvent("Lock targetDiv1.");
+ targetDiv1.requestPointerLock();
+ // doNextStep called by event handler.
+ },
+ function () {
+ shouldBe("document.pointerLockElement", "targetDiv1");
+ setTimeout(() => {
+ window.location.href = "resources/lock-lost-on-navigation2.html";
+ }, 0);
+ },
+ ];
+ doNextStepWithUserGesture();
+</script>
+<script src="../http/tests/resources/js-test-post.js"></script>
+</body>
+</html>
+
</ins></span></pre></div>
<a id="trunkLayoutTestspointerlockresourceslocklostonnavigation2html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/pointer-lock/resources/lock-lost-on-navigation2.html (0 => 209525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/pointer-lock/resources/lock-lost-on-navigation2.html (rev 0)
+++ trunk/LayoutTests/pointer-lock/resources/lock-lost-on-navigation2.html 2016-12-08 06:19:57 UTC (rev 209525)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<!DOCTYPE HTML>
+<html>
+<head>
+<script src="../../http/tests/resources/js-test-pre.js"></script>
+<script src="../http/tests/resources/pointer-lock/pointer-lock-test-harness.js"></script>
+</head>
+<body>
+<div>
+ <div id="target1"></div>
+</div>
+<script>
+ description("Test that pointer lock is lost after navigation.")
+ window.jsTestIsAsync = true;
+ shouldBeDefined("window.testRunner");
+
+ shouldBe("internals.pageHasPendingPointerLock()", "false");
+ shouldBe("internals.pageHasPointerLock()", "false");
+ finishJSTest();
+</script>
+<script src="../../http/tests/resources/js-test-post.js"></script>
+</body>
+</html>
+
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209524 => 209525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-08 06:14:07 UTC (rev 209524)
+++ trunk/Source/WebCore/ChangeLog 2016-12-08 06:19:57 UTC (rev 209525)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-12-07 Jeremy Jones <jeremyj@apple.com>
+
+ Exit pointer lock when page goes into page cache.
+ https://bugs.webkit.org/show_bug.cgi?id=165425
+ rdar://problem/29430834
+
+ Reviewed by Jer Noble.
+
+ Test: pointer-lock/lock-lost-on-navigation.html
+
+ Cancel pointer lock when page goes into page cache and add methods to Internals
+ so it can be tested.
+
+ * dom/Document.cpp:
+ (WebCore::Document::setPageCacheState):
+ * page/PointerLockController.h:
+ * testing/Internals.cpp:
+ (WebCore::Internals::pageHasPendingPointerLock):
+ (WebCore::Internals::pageHasPointerLock):
+ * testing/Internals.h:
+ * testing/Internals.idl:
+
</ins><span class="cx"> 2016-12-07 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> [Modern Media Controls] Tracks panel does not display in the right location in fullscreen and cannot be dismissed
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (209524 => 209525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2016-12-08 06:14:07 UTC (rev 209524)
+++ trunk/Source/WebCore/dom/Document.cpp 2016-12-08 06:19:57 UTC (rev 209525)
</span><span class="lines">@@ -4544,6 +4544,10 @@
</span><span class="cx"> v->resetScrollbars();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(POINTER_LOCK)
+ exitPointerLock();
+#endif
+
</ins><span class="cx"> styleScope().clearResolver();
</span><span class="cx"> clearSelectorQueryCache();
</span><span class="cx"> m_styleRecalcTimer.stop();
</span></span></pre></div>
<a id="trunkSourceWebCorepagePointerLockControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PointerLockController.h (209524 => 209525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PointerLockController.h 2016-12-08 06:14:07 UTC (rev 209524)
+++ trunk/Source/WebCore/page/PointerLockController.h 2016-12-08 06:19:57 UTC (rev 209525)
</span><span class="lines">@@ -48,8 +48,8 @@
</span><span class="cx"> void requestPointerUnlockAndForceCursorVisible();
</span><span class="cx"> void elementRemoved(Element&);
</span><span class="cx"> void documentDetached(Document&);
</span><del>- bool lockPending() const;
- Element* element() const;
</del><ins>+ WEBCORE_EXPORT bool lockPending() const;
+ WEBCORE_EXPORT Element* element() const;
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void didAcquirePointerLock();
</span><span class="cx"> WEBCORE_EXPORT void didNotAcquirePointerLock();
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (209524 => 209525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2016-12-08 06:14:07 UTC (rev 209524)
+++ trunk/Source/WebCore/testing/Internals.cpp 2016-12-08 06:19:57 UTC (rev 209525)
</span><span class="lines">@@ -212,6 +212,10 @@
</span><span class="cx"> #include "MediaPlaybackTargetContext.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(POINTER_LOCK)
+#include "PointerLockController.h"
+#endif
+
</ins><span class="cx"> using JSC::CallData;
</span><span class="cx"> using JSC::CallType;
</span><span class="cx"> using JSC::CodeBlock;
</span><span class="lines">@@ -3405,4 +3409,34 @@
</span><span class="cx"> WTFReportBacktrace();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(POINTER_LOCK)
+bool Internals::pageHasPendingPointerLock() const
+{
+ Document* document = contextDocument();
+ if (!document)
+ return false;
+
+ Page* page = document->page();
+ if (!page)
+ return false;
+
+ return page->pointerLockController().lockPending();
+}
+
+bool Internals::pageHasPointerLock() const
+{
+ Document* document = contextDocument();
+ if (!document)
+ return false;
+
+ Page* page = document->page();
+ if (!page)
+ return false;
+
+ auto& controller = page->pointerLockController();
+ return controller.element() && !controller.lockPending();
+}
+#endif
+
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (209524 => 209525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2016-12-08 06:14:07 UTC (rev 209524)
+++ trunk/Source/WebCore/testing/Internals.h 2016-12-08 06:19:57 UTC (rev 209525)
</span><span class="lines">@@ -508,6 +508,11 @@
</span><span class="cx">
</span><span class="cx"> void reportBacktrace();
</span><span class="cx">
</span><ins>+#if ENABLE(POINTER_LOCK)
+ bool pageHasPendingPointerLock() const;
+ bool pageHasPointerLock() const;
+#endif
+
</ins><span class="cx"> private:
</span><span class="cx"> explicit Internals(Document&);
</span><span class="cx"> Document* contextDocument() const;
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (209524 => 209525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl 2016-12-08 06:14:07 UTC (rev 209524)
+++ trunk/Source/WebCore/testing/Internals.idl 2016-12-08 06:19:57 UTC (rev 209525)
</span><span class="lines">@@ -483,4 +483,7 @@
</span><span class="cx"> boolean userPrefersReducedMotion();
</span><span class="cx">
</span><span class="cx"> void reportBacktrace();
</span><ins>+
+ [Conditional=POINTER_LOCK] boolean pageHasPendingPointerLock();
+ [Conditional=POINTER_LOCK] boolean pageHasPointerLock();
</ins><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>