<!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>[210642] branches/safari-603-branch/LayoutTests</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/210642">210642</a></dd>

<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>

<dt>Date</dt> <dd>2017-01-12 08:45:12 -0800 (Thu, 12 Jan 2017)</dd>

</dl>

<h3>Log Message</h3>

<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/210371">r210371</a>. rdar://problem/29851126</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#branchessafari603branchLayoutTestsChangeLog">branches/safari-603-branch/LayoutTests/ChangeLog</a></li>

<li><a href="#branchessafari603branchLayoutTestshttptestspointerlockiframesandboxedexpectedtxt">branches/safari-603-branch/LayoutTests/http/tests/pointer-lock/iframe-sandboxed-expected.txt</a></li>

<li><a href="#branchessafari603branchLayoutTestshttptestspointerlockiframesandboxednesteddisallowthenallowpointerlockexpectedtxt">branches/safari-603-branch/LayoutTests/http/tests/pointer-lock/iframe-sandboxed-nested-disallow-then-allow-pointer-lock-expected.txt</a></li>

<li><a href="#branchessafari603branchLayoutTestsplatformmacTestExpectations">branches/safari-603-branch/LayoutTests/platform/mac/TestExpectations</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 (210641 => 210642)</h4>

<pre class="diff"><span>

<span class="info">--- branches/safari-603-branch/LayoutTests/ChangeLog        2017-01-12 16:45:10 UTC (rev 210641)

+++ branches/safari-603-branch/LayoutTests/ChangeLog        2017-01-12 16:45:12 UTC (rev 210642)

</span><span class="lines">@@ -1,5 +1,32 @@

</span><span class="cx"> 2017-01-12  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;

</span><span class="cx"> 

</span><ins>+        Merge r210371. rdar://problem/29851126

+

+    2017-01-05  Jeremy Jones  &lt;jeremyj@apple.com&gt;

+

+            Update pointer-lock test expectations, enabling passing tests.

+            https://bugs.webkit.org/show_bug.cgi?id=166656

+            rdar://problem/29851126

+

+            Reviewed by Alex Christensen.

+

+            Several pointer lock tests are passing and are now marked as passing.

+            pointer-lock/lock-already-locked.html Pass

+            pointer-lock/lock-element-not-in-dom.html Pass

+            http/tests/pointer-lock/iframe-sandboxed-allow-pointer-lock.html Pass

+            http/tests/pointer-lock/iframe-sandboxed-nested-allow-pointer-lock.html Pass

+            http/tests/pointer-lock/pointerlockelement-different-origin.html Pass

+            http/tests/pointer-lock/pointerlockelement-same-origin.html Pass

+            http/tests/pointer-lock/requestPointerLock-can-not-transfer-between-documents.html Pass

+            http/tests/pointer-lock/iframe-sandboxed.html Pass

+            http/tests/pointer-lock/iframe-sandboxed-nested-disallow-then-allow-pointer-lock.html Pass

+

+            * platform/mac/TestExpectations:

+            * http/tests/pointer-lock/iframe-sandboxed-expected.txt: Updated.

+            * http/tests/pointer-lock/iframe-sandboxed-nested-disallow-then-allow-pointer-lock-expected.txt: Updated

+

+2017-01-12  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;

+

</ins><span class="cx">         Merge r210147. rdar://problem/29675551

</span><span class="cx"> 

</span><span class="cx">     2016-12-23  Simon Fraser  &lt;simon.fraser@apple.com&gt;

</span></span></pre></div>

<a id="branchessafari603branchLayoutTestshttptestspointerlockiframesandboxedexpectedtxt"></a>

<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/http/tests/pointer-lock/iframe-sandboxed-expected.txt (210641 => 210642)</h4>

<pre class="diff"><span>

<span class="info">--- branches/safari-603-branch/LayoutTests/http/tests/pointer-lock/iframe-sandboxed-expected.txt        2017-01-12 16:45:10 UTC (rev 210641)

+++ branches/safari-603-branch/LayoutTests/http/tests/pointer-lock/iframe-sandboxed-expected.txt        2017-01-12 16:45:12 UTC (rev 210642)

</span><span class="lines">@@ -1,4 +1,4 @@

<del>-CONSOLE MESSAGE: Blocked pointer lock on an element because the element's frame is sandboxed and the 'allow-pointer-lock' permission is not set.

</del><ins>+CONSOLE MESSAGE: line 1: Blocked pointer lock on an element because the element's frame is sandboxed and the 'allow-pointer-lock' permission is not set.

</ins><span class="cx"> Test sandboxed iframe blocks pointer lock.

</span><span class="cx"> 

<span class="cx"> On success, you will see a series of &quot;PASS&quot; messages, followed by &quot;TEST COMPLETE&quot;.

</span></span></pre></div>

<a id="branchessafari603branchLayoutTestshttptestspointerlockiframesandboxednesteddisallowthenallowpointerlockexpectedtxt"></a>

<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/http/tests/pointer-lock/iframe-sandboxed-nested-disallow-then-allow-pointer-lock-expected.txt (210641 => 210642)</h4>

<pre class="diff"><span>

<span class="info">--- branches/safari-603-branch/LayoutTests/http/tests/pointer-lock/iframe-sandboxed-nested-disallow-then-allow-pointer-lock-expected.txt        2017-01-12 16:45:10 UTC (rev 210641)

+++ branches/safari-603-branch/LayoutTests/http/tests/pointer-lock/iframe-sandboxed-nested-disallow-then-allow-pointer-lock-expected.txt        2017-01-12 16:45:12 UTC (rev 210642)

</span><span class="lines">@@ -1,4 +1,4 @@

<del>-CONSOLE MESSAGE: Blocked pointer lock on an element because the element's frame is sandboxed and the 'allow-pointer-lock' permission is not set.

</del><ins>+CONSOLE MESSAGE: line 1: Blocked pointer lock on an element because the element's frame is sandboxed and the 'allow-pointer-lock' permission is not set.

</ins><span class="cx"> Test nested sandboxed iframes without and then with allow-pointer-lock disallow pointer lock.

</span><span class="cx"> 

<span class="cx"> On success, you will see a series of &quot;PASS&quot; messages, followed by &quot;TEST COMPLETE&quot;.

</span></span></pre></div>

<a id="branchessafari603branchLayoutTestsplatformmacTestExpectations"></a>

<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/platform/mac/TestExpectations (210641 => 210642)</h4>

<pre class="diff"><span>

<span class="info">--- branches/safari-603-branch/LayoutTests/platform/mac/TestExpectations        2017-01-12 16:45:10 UTC (rev 210641)

+++ branches/safari-603-branch/LayoutTests/platform/mac/TestExpectations        2017-01-12 16:45:12 UTC (rev 210642)

</span><span class="lines">@@ -280,8 +280,6 @@

</span><span class="cx"> 

<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><del>-pointer-lock/lock-already-locked.html

-pointer-lock/lock-element-not-in-dom.html

</del><span class="cx"> pointer-lock/locked-element-iframe-removed-from-dom.html

</span><span class="cx"> pointer-lock/locked-element-removed-from-dom.html

</span><span class="cx"> pointer-lock/mouse-event-delivery.html

</span><span class="lines">@@ -288,11 +286,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><del>-pointer-lock/lock-lost-on-navigation.html [ Pass ]

-http/tests/pointer-lock/

</del><span class="cx"> 

</span><del>-pointer-lock/lock-lost-on-alert.html [ Pass ]

-

</del><span class="cx"> webkit.org/b/82763 fast/forms/textarea-placeholder-set-attribute.html

</span><span class="cx"> 

</span><span class="cx"> webkit.org/b/102257 fast/dom/Window/open-window-min-size.html

</span></span></pre>

</div>

</div>

</body>

</html>