<!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>[211512] branches/safari-603-branch</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/211512">211512</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-02-01 13:26:21 -0800 (Wed, 01 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/211249">r211249</a>. rdar://problem/29539389</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsChangeLog">branches/safari-603-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari603branchLayoutTestsplatformmacTestExpectations">branches/safari-603-branch/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#branchessafari603branchLayoutTestsplatformmacwk1TestExpectations">branches/safari-603-branch/LayoutTests/platform/mac-wk1/TestExpectations</a></li>
<li><a href="#branchessafari603branchSourceWebCoreChangeLog">branches/safari-603-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCorepagePointerLockControllercpp">branches/safari-603-branch/Source/WebCore/page/PointerLockController.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCorepagePointerLockControllerh">branches/safari-603-branch/Source/WebCore/page/PointerLockController.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/ChangeLog (211511 => 211512)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/ChangeLog 2017-02-01 21:26:17 UTC (rev 211511)
+++ branches/safari-603-branch/LayoutTests/ChangeLog 2017-02-01 21:26:21 UTC (rev 211512)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2017-01-31 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r211249. rdar://problem/29539389
+
+ 2017-01-26 Jeremy Jones <jeremyj@apple.com>
+
+ Page should be able to request pointer lock without user gesture if it relinquished it without a user gesture
+ https://bugs.webkit.org/show_bug.cgi?id=167126
+
+ Reviewed by Jon Lee.
+
+ Enable pointer-lock/locked-element-removed-from-dom.html for WK2 by enabling for Mac and disabling for WK1.
+ Not enable in WK1 becuase of https://bugs.webkit.org/show_bug.cgi?id=167127
+
+ * platform/mac-wk1/TestExpectations:
+ * platform/mac/TestExpectations:
+
</ins><span class="cx"> 2017-01-26 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r211235. rdar://problem/30058933
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/platform/mac/TestExpectations (211511 => 211512)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/platform/mac/TestExpectations 2017-02-01 21:26:17 UTC (rev 211511)
+++ branches/safari-603-branch/LayoutTests/platform/mac/TestExpectations 2017-02-01 21:26:21 UTC (rev 211512)
</span><span class="lines">@@ -281,7 +281,6 @@
</span><span class="cx"> # Pointer Lock can only check some of the API at the moment.
</span><span class="cx"> pointer-lock/bug90391-move-then-window-open-crash.html
</span><span class="cx"> pointer-lock/locked-element-iframe-removed-from-dom.html
</span><del>-pointer-lock/locked-element-removed-from-dom.html
</del><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></span></pre></div>
<a id="branchessafari603branchLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/platform/mac-wk1/TestExpectations (211511 => 211512)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/platform/mac-wk1/TestExpectations 2017-02-01 21:26:17 UTC (rev 211511)
+++ branches/safari-603-branch/LayoutTests/platform/mac-wk1/TestExpectations 2017-02-01 21:26:21 UTC (rev 211512)
</span><span class="lines">@@ -293,3 +293,5 @@
</span><span class="cx"> webkit.org/b/165541 compositing/rtl/rtl-fixed-overflow.html [ Failure ]
</span><span class="cx">
</span><span class="cx"> webkit.org/b/165589 pointer-lock/lock-lost-on-esc-in-fullscreen.html [ Skip ]
</span><ins>+
+webkit.org/b/167127 pointer-lock/locked-element-removed-from-dom.html
</ins></span></pre></div>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (211511 => 211512)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-01 21:26:17 UTC (rev 211511)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-02-01 21:26:21 UTC (rev 211512)
</span><span class="lines">@@ -1,5 +1,43 @@
</span><span class="cx"> 2017-01-31 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r211249. rdar://problem/29539389
+
+ 2017-01-26 Jeremy Jones <jeremyj@apple.com>
+
+ Page should be able to request pointer lock without user gesture if it relinquished it without a user gesture
+ https://bugs.webkit.org/show_bug.cgi?id=167126
+
+ Reviewed by Jon Lee.
+
+ Enabled pointer-lock/locked-element-removed-from-dom.html for WK2.
+ Not enable in WK1 because of https://bugs.webkit.org/show_bug.cgi?id=167127
+
+ This change allows a page to lock the pointer again without a user gesture if it was unlocked by
+ the page and not by the user. See https://www.w3.org/TR/2016/REC-pointerlock-20161027/ 5.1 Methods
+
+ * page/PointerLockController.cpp:
+
+ When a document acquires pointer lock with a user gesture, that document is allowed to request pointer lock again
+ until the user takes an action to end pointer lock. We know it is a user action because user actions always
+ call requestPointerUnlockAndForceCursorVisible().
+
+ When the page requests a pointer unlock (via requestPointerUnlock), that document is allowed to continue to relock
+ the page. This continues until there is either an unlock request form the user
+ via requestPointerUnlockAndForceCursorVisible or a didLosePointerLock without a pointer unlock request.
+
+ (WebCore::PointerLockController::PointerLockController):
+ (WebCore::PointerLockController::requestPointerLock):
+ (WebCore::PointerLockController::requestPointerUnlock):
+ (WebCore::PointerLockController::requestPointerUnlockAndForceCursorVisible):
+ (WebCore::PointerLockController::elementRemoved):
+ (WebCore::PointerLockController::documentDetached):
+ (WebCore::PointerLockController::didAcquirePointerLock):
+ (WebCore::PointerLockController::didLosePointerLock):
+ (WebCore::PointerLockController::clearElement):
+ * page/PointerLockController.h:
+
+2017-01-31 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r211240. rdar://problem/30247467b
</span><span class="cx">
</span><span class="cx"> 2017-01-26 Jer Noble <jer.noble@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorepagePointerLockControllercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/page/PointerLockController.cpp (211511 => 211512)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/page/PointerLockController.cpp 2017-02-01 21:26:17 UTC (rev 211511)
+++ branches/safari-603-branch/Source/WebCore/page/PointerLockController.cpp 2017-02-01 21:26:21 UTC (rev 211512)
</span><span class="lines">@@ -44,7 +44,6 @@
</span><span class="cx">
</span><span class="cx"> PointerLockController::PointerLockController(Page& page)
</span><span class="cx"> : m_page(page)
</span><del>- , m_lockPending(false)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -55,7 +54,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!ScriptController::processingUserGesture()) {
</del><ins>+ if (m_documentAllowedToRelockWithoutUserGesture != &target->document() && !ScriptController::processingUserGesture()) {
</ins><span class="cx"> enqueueEvent(eventNames().pointerlockerrorEvent, target);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -78,8 +77,7 @@
</span><span class="cx"> m_lockPending = true;
</span><span class="cx"> m_element = target;
</span><span class="cx"> if (!m_page.chrome().client().requestPointerLock()) {
</span><del>- m_element = nullptr;
- m_lockPending = false;
</del><ins>+ clearElement();
</ins><span class="cx"> enqueueEvent(eventNames().pointerlockerrorEvent, target);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -90,14 +88,18 @@
</span><span class="cx"> if (!m_element)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ m_unlockPending = true;
</ins><span class="cx"> m_page.chrome().client().requestPointerUnlock();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PointerLockController::requestPointerUnlockAndForceCursorVisible()
</span><span class="cx"> {
</span><ins>+ m_documentAllowedToRelockWithoutUserGesture = nullptr;
+
</ins><span class="cx"> if (!m_element)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ m_unlockPending = true;
</ins><span class="cx"> m_page.chrome().client().requestPointerUnlock();
</span><span class="cx"> m_forceCursorVisibleUponUnlock = true;
</span><span class="cx"> }
</span><span class="lines">@@ -108,8 +110,8 @@
</span><span class="cx"> m_documentOfRemovedElementWhileWaitingForUnlock = &m_element->document();
</span><span class="cx"> // Set element null immediately to block any future interaction with it
</span><span class="cx"> // including mouse events received before the unlock completes.
</span><ins>+ requestPointerUnlock();
</ins><span class="cx"> clearElement();
</span><del>- requestPointerUnlock();
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -116,8 +118,9 @@
</span><span class="cx"> void PointerLockController::documentDetached(Document& document)
</span><span class="cx"> {
</span><span class="cx"> if (m_element && &m_element->document() == &document) {
</span><ins>+ m_documentOfRemovedElementWhileWaitingForUnlock = &m_element->document();
+ requestPointerUnlock();
</ins><span class="cx"> clearElement();
</span><del>- requestPointerUnlockAndForceCursorVisible();
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -140,6 +143,8 @@
</span><span class="cx"> {
</span><span class="cx"> enqueueEvent(eventNames().pointerlockchangeEvent, m_element.get());
</span><span class="cx"> m_lockPending = false;
</span><ins>+ m_forceCursorVisibleUponUnlock = false;
+ m_documentAllowedToRelockWithoutUserGesture = &m_element->document();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PointerLockController::didNotAcquirePointerLock()
</span><span class="lines">@@ -146,12 +151,17 @@
</span><span class="cx"> {
</span><span class="cx"> enqueueEvent(eventNames().pointerlockerrorEvent, m_element.get());
</span><span class="cx"> clearElement();
</span><ins>+ m_unlockPending = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PointerLockController::didLosePointerLock()
</span><span class="cx"> {
</span><ins>+ if (!m_unlockPending)
+ m_documentAllowedToRelockWithoutUserGesture = nullptr;
+
</ins><span class="cx"> enqueueEvent(eventNames().pointerlockchangeEvent, m_element ? &m_element->document() : m_documentOfRemovedElementWhileWaitingForUnlock.get());
</span><span class="cx"> clearElement();
</span><ins>+ m_unlockPending = false;
</ins><span class="cx"> m_documentOfRemovedElementWhileWaitingForUnlock = nullptr;
</span><span class="cx"> if (m_forceCursorVisibleUponUnlock) {
</span><span class="cx"> m_forceCursorVisibleUponUnlock = false;
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorepagePointerLockControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/page/PointerLockController.h (211511 => 211512)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/page/PointerLockController.h 2017-02-01 21:26:17 UTC (rev 211511)
+++ branches/safari-603-branch/Source/WebCore/page/PointerLockController.h 2017-02-01 21:26:21 UTC (rev 211512)
</span><span class="lines">@@ -64,10 +64,12 @@
</span><span class="cx"> void enqueueEvent(const AtomicString& type, Element*);
</span><span class="cx"> void enqueueEvent(const AtomicString& type, Document*);
</span><span class="cx"> Page& m_page;
</span><del>- bool m_lockPending;
</del><ins>+ bool m_lockPending { false };
+ bool m_unlockPending { false };
</ins><span class="cx"> bool m_forceCursorVisibleUponUnlock { false };
</span><span class="cx"> RefPtr<Element> m_element;
</span><span class="cx"> RefPtr<Document> m_documentOfRemovedElementWhileWaitingForUnlock;
</span><ins>+ RefPtr<Document> m_documentAllowedToRelockWithoutUserGesture;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>