<!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>[214183] 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/214183">214183</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-03-20 11:51:49 -0700 (Mon, 20 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/214081">r214081</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsChangeLog">branches/safari-603-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari603branchLayoutTestsTestExpectations">branches/safari-603-branch/LayoutTests/TestExpectations</a></li>
<li><a href="#branchessafari603branchLayoutTestscompositingcanvasacceleratedcanvascompositingsizelimitexpectedtxt">branches/safari-603-branch/LayoutTests/compositing/canvas/accelerated-canvas-compositing-size-limit-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsimportedw3cChangeLog">branches/safari-603-branch/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#branchessafari603branchLayoutTestsimportedw3cwebplatformtestshtmlbrowsersorigincrossoriginobjectscrossoriginobjectsexpectedtxt">branches/safari-603-branch/LayoutTests/imported/w3c/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestspageoverlayoverlayremovereinsertviewexpectedtxt">branches/safari-603-branch/LayoutTests/pageoverlay/overlay-remove-reinsert-view-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsplatformmacwk2TestExpectations">branches/safari-603-branch/LayoutTests/platform/mac-wk2/TestExpectations</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsworkerssabsentfromworkertransferexpectedtxt">branches/safari-603-branch/LayoutTests/workers/sab/sent-from-worker-transfer-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsworkerssabsentfromworkertransferhtml">branches/safari-603-branch/LayoutTests/workers/sab/sent-from-worker-transfer.html</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 (214182 => 214183)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/ChangeLog        2017-03-20 18:43:28 UTC (rev 214182)
+++ branches/safari-603-branch/LayoutTests/ChangeLog        2017-03-20 18:51:49 UTC (rev 214183)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-03-20 Jason Marcell <jmarcell@apple.com>
+
+ Merge r214081.
+
+ 2017-03-16 Ryan Haddad <ryanhaddad@apple.com>
+
+ Unreviewed test gardening.
+
+ * TestExpectations:
+ * compositing/canvas/accelerated-canvas-compositing-size-limit-expected.txt:
+ * pageoverlay/overlay-remove-reinsert-view-expected.txt:
+ * platform/mac-wk2/TestExpectations:
+ * workers/sab/sent-from-worker-transfer-expected.txt: Removed.
+ * workers/sab/sent-from-worker-transfer.html: Removed.
+
</ins><span class="cx"> 2017-03-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r213953. rdar://problem/31049771
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/TestExpectations (214182 => 214183)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/TestExpectations        2017-03-20 18:43:28 UTC (rev 214182)
+++ branches/safari-603-branch/LayoutTests/TestExpectations        2017-03-20 18:51:49 UTC (rev 214183)
</span><span class="lines">@@ -747,7 +747,7 @@
</span><span class="cx"> # integral hittest vs. subpixel table
</span><span class="cx"> fast/table/hittest-tablecell-with-borders-right-edge.html [ Pass Failure ]
</span><span class="cx"> fast/table/hittest-tablecell-right-edge.html [ Pass Failure ]
</span><del>-fast/css/appearance-apple-pay-button.html [ Failure ]
</del><ins>+fast/css/appearance-apple-pay-button.html [ ImageOnlyFailure ]
</ins><span class="cx">
</span><span class="cx"> webkit.org/b/150598 fast/repaint/table-hover-on-link.html [ Pass Failure ]
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestscompositingcanvasacceleratedcanvascompositingsizelimitexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/compositing/canvas/accelerated-canvas-compositing-size-limit-expected.txt (214182 => 214183)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/compositing/canvas/accelerated-canvas-compositing-size-limit-expected.txt        2017-03-20 18:43:28 UTC (rev 214182)
+++ branches/safari-603-branch/LayoutTests/compositing/canvas/accelerated-canvas-compositing-size-limit-expected.txt        2017-03-20 18:51:49 UTC (rev 214183)
</span><span class="lines">@@ -13,7 +13,6 @@
</span><span class="cx"> (position 8.00 50.00)
</span><span class="cx"> (bounds 512.00 288.00)
</span><span class="cx"> (drawsContent 1)
</span><del>- (acceleratesDrawing 1)
</del><span class="cx"> )
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (position 8.00 342.00)
</span><span class="lines">@@ -20,7 +19,6 @@
</span><span class="cx"> (bounds 5120.00 2880.00)
</span><span class="cx"> (usingTiledLayer 1)
</span><span class="cx"> (drawsContent 1)
</span><del>- (acceleratesDrawing 1)
</del><span class="cx"> )
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (position 8.00 3226.00)
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/imported/w3c/ChangeLog (214182 => 214183)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/imported/w3c/ChangeLog        2017-03-20 18:43:28 UTC (rev 214182)
+++ branches/safari-603-branch/LayoutTests/imported/w3c/ChangeLog        2017-03-20 18:51:49 UTC (rev 214183)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-03-20 Jason Marcell <jmarcell@apple.com>
+
+ Merge r214081.
+
+ 2017-03-16 Ryan Haddad <ryanhaddad@apple.com>
+
+ Unreviewed test gardening.
+
+ * web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects-expected.txt:
+
</ins><span class="cx"> 2017-02-09 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r211913. rdar://problem/28062149
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsimportedw3cwebplatformtestshtmlbrowsersorigincrossoriginobjectscrossoriginobjectsexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/imported/w3c/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects-expected.txt (214182 => 214183)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/imported/w3c/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects-expected.txt        2017-03-20 18:43:28 UTC (rev 214182)
+++ branches/safari-603-branch/LayoutTests/imported/w3c/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects-expected.txt        2017-03-20 18:51:49 UTC (rev 214183)
</span><span class="lines">@@ -19,5 +19,4 @@
</span><span class="cx"> PASS Same-origin observers get different functions for cross-origin objects
</span><span class="cx"> PASS Same-origin observers get different accessors for cross-origin Window
</span><span class="cx"> PASS Same-origin observers get different accessors for cross-origin Location
</span><del>-FAIL {}.toString.call() does the right thing on cross-origin objects assert_equals: expected "[object Object]" but got "[object Window]"
</del><span class="cx">
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestspageoverlayoverlayremovereinsertviewexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/pageoverlay/overlay-remove-reinsert-view-expected.txt (214182 => 214183)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/pageoverlay/overlay-remove-reinsert-view-expected.txt        2017-03-20 18:43:28 UTC (rev 214182)
+++ branches/safari-603-branch/LayoutTests/pageoverlay/overlay-remove-reinsert-view-expected.txt        2017-03-20 18:51:49 UTC (rev 214183)
</span><span class="lines">@@ -38,10 +38,34 @@
</span><span class="cx"> Layers after removal
</span><span class="cx">
</span><span class="cx"> View-relative:
</span><del>-(no view-relative overlay root)
</del><ins>+(GraphicsLayer
+ (children 1
+ (GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 800.00 600.00)
+ (drawsContent 1)
+ (backgroundColor #00000000)
+ )
+ )
+)
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> Document-relative:
</span><del>-(no document-relative overlay root)
</del><ins>+(GraphicsLayer
+ (children 1
+ (GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 5008.00 5016.00)
+ (usingTiledLayer 1)
+ (drawsContent 1)
+ (backgroundColor #00000000)
+ (tile cache coverage 0, 0 1024 x 1024)
+ (tile size 512 x 512)
+ (top left tile 0, 0 tiles grid 2 x 2)
+ (in window 0)
+ )
+ )
+)
</ins><span class="cx"> Layers after re-insertion
</span><span class="cx">
</span><span class="cx"> View-relative:
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsplatformmacwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/platform/mac-wk2/TestExpectations (214182 => 214183)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/platform/mac-wk2/TestExpectations        2017-03-20 18:43:28 UTC (rev 214182)
+++ branches/safari-603-branch/LayoutTests/platform/mac-wk2/TestExpectations        2017-03-20 18:51:49 UTC (rev 214183)
</span><span class="lines">@@ -616,4 +616,5 @@
</span><span class="cx"> webkit.org/b/166765 [ Debug ] http/tests/pointer-lock/iframe-sandboxed-nested-allow-pointer-lock.html [ Crash ]
</span><span class="cx"> webkit.org/b/166765 [ Debug ] http/tests/pointer-lock/pointerlockelement-same-origin.html [ Crash ]
</span><span class="cx"> webkit.org/b/166765 [ Debug ] pointer-lock/lock-lost-on-alert.html [ Crash ]
</span><ins>+webkit.org/b/167965 pointer-lock/mouse-event-delivery.html [ Pass Failure ]
</ins><span class="cx">
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsworkerssabsentfromworkertransferexpectedtxt"></a>
<div class="delfile"><h4>Deleted: branches/safari-603-branch/LayoutTests/workers/sab/sent-from-worker-transfer-expected.txt (214182 => 214183)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/workers/sab/sent-from-worker-transfer-expected.txt        2017-03-20 18:43:28 UTC (rev 214182)
+++ branches/safari-603-branch/LayoutTests/workers/sab/sent-from-worker-transfer-expected.txt        2017-03-20 18:51:49 UTC (rev 214183)
</span><span class="lines">@@ -1,3 +0,0 @@
</span><del>-All workers done!
-Test passed!
-
</del></span></pre></div>
<a id="branchessafari603branchLayoutTestsworkerssabsentfromworkertransferhtml"></a>
<div class="delfile"><h4>Deleted: branches/safari-603-branch/LayoutTests/workers/sab/sent-from-worker-transfer.html (214182 => 214183)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/workers/sab/sent-from-worker-transfer.html        2017-03-20 18:43:28 UTC (rev 214182)
+++ branches/safari-603-branch/LayoutTests/workers/sab/sent-from-worker-transfer.html        2017-03-20 18:51:49 UTC (rev 214183)
</span><span class="lines">@@ -1,95 +0,0 @@
</span><del>-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-</head>
-<body>
-<script>
-function getOrCreate(id, tagName)
-{
- var element = document.getElementById(id);
- if (element)
- return element;
-
- element = document.createElement(tagName);
- element.id = id;
- var parent = document.body || document.documentElement;
- var refNode = parent.firstChild;
-
- parent.insertBefore(element, refNode);
- return element;
-}
-
-function debug(msg)
-{
- var span = document.createElement("span");
- getOrCreate("console", "div").appendChild(span); // insert it first so XHTML knows the namespace
- span.innerHTML = msg + '<br />';
-}
-
-if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
-}
-
-var verbose = false;
-
-var sab;
-var memory;
-
-var numWorkers = 0;
-function startWorker(file)
-{
- if (verbose)
- debug("Starting worker: " + file);
- numWorkers++;
- var worker = new Worker(file);
- worker.onmessage = function(event) {
- if (event.data == "done") {
- if (verbose)
- debug("Finished worker: " + file);
- if (--numWorkers)
- return;
- debug("All workers done!");
- done();
- return;
- }
- if (event.data.indexOf("Error") == 0) {
- debug("Test failed: "+ event.data);
- if (window.testRunner)
- testRunner.notifyDone();
- }
-
- if (verbose)
- debug("Event from " + file + ": " + event.data);
- };
- worker.postMessage(memory, [sab]);
-}
-
-function done()
-{
- for (var i = 0; i < 3; ++i) {
- if (memory[i] != 1)
- throw "Error: Bad value at memory[" + i + "]: " + memory[i];
- }
- for (var i = 3; i < memory.length; ++i) {
- if (memory[i] != 0)
- throw "Error: Bad value at memory[" + i + "]: " + memory[i];
- }
- debug("Test passed!");
-
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-var sabCreator = new Worker("sab-creator-transfer.js");
-sabCreator.onmessage = function(event) {
- memory = event.data;
- sab = memory.buffer;
-
- startWorker("simple-worker-1.js");
- startWorker("simple-worker-2.js");
-};
-
-</script>
-</body>
-</html>
</del></span></pre>
</div>
</div>
</body>
</html>