<!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>[188746] trunk/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/188746">188746</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-08-20 20:12:25 -0700 (Thu, 20 Aug 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>AX: fix accessibility/loading-iframe-updates-axtree.html test for mac
https://bugs.webkit.org/show_bug.cgi?id=148251

Patch by Nan Wang &lt;n_wang@apple.com&gt; on 2015-08-20
Reviewed by Chris Fleizach.

Added a container in order to make the frame accessible. Also, added expected results for
both WK1 and WK2.

* accessibility/loading-iframe-updates-axtree-expected.txt:
* accessibility/loading-iframe-updates-axtree.html:
* platform/mac-wk1/accessibility: Added.
* platform/mac-wk1/accessibility/loading-iframe-updates-axtree-expected.txt: Added.
* platform/mac/TestExpectations:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsaccessibilityloadingiframeupdatesaxtreeexpectedtxt">trunk/LayoutTests/accessibility/loading-iframe-updates-axtree-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilityloadingiframeupdatesaxtreehtml">trunk/LayoutTests/accessibility/loading-iframe-updates-axtree.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/platform/mac-wk1/accessibility/</li>
<li><a href="#trunkLayoutTestsplatformmacwk1accessibilityloadingiframeupdatesaxtreeexpectedtxt">trunk/LayoutTests/platform/mac-wk1/accessibility/loading-iframe-updates-axtree-expected.txt</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (188745 => 188746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-08-21 03:05:02 UTC (rev 188745)
+++ trunk/LayoutTests/ChangeLog        2015-08-21 03:12:25 UTC (rev 188746)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-08-20  Nan Wang  &lt;n_wang@apple.com&gt;
+
+        AX: fix accessibility/loading-iframe-updates-axtree.html test for mac
+        https://bugs.webkit.org/show_bug.cgi?id=148251
+
+        Reviewed by Chris Fleizach.
+
+        Added a container in order to make the frame accessible. Also, added expected results for
+        both WK1 and WK2.
+
+        * accessibility/loading-iframe-updates-axtree-expected.txt:
+        * accessibility/loading-iframe-updates-axtree.html:
+        * platform/mac-wk1/accessibility: Added.
+        * platform/mac-wk1/accessibility/loading-iframe-updates-axtree-expected.txt: Added.
+        * platform/mac/TestExpectations:
+
</ins><span class="cx"> 2015-08-20  Chris Dumez  &lt;cdumez@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Fix passing null / undefined as NodeFilter parameter for createNodeIterator() / createTreeWalker()
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityloadingiframeupdatesaxtreeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/loading-iframe-updates-axtree-expected.txt (188745 => 188746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/loading-iframe-updates-axtree-expected.txt        2015-08-21 03:05:02 UTC (rev 188745)
+++ trunk/LayoutTests/accessibility/loading-iframe-updates-axtree-expected.txt        2015-08-21 03:12:25 UTC (rev 188746)
</span><span class="lines">@@ -10,9 +10,9 @@
</span><span class="cx"> On success, you will see a series of &quot;PASS&quot; messages, followed by &quot;TEST COMPLETE&quot;.
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-PASS iframe.isEqual(newIframe) is true
-PASS scrollarea.isEqual(newScrollarea) is false
-PASS subwebarea.isEqual(newSubwebarea) is false
</del><ins>+iframe.isEqual(newIframe): true
+scrollarea.isEqual(newScrollarea): false
+subwebarea.isEqual(newSubwebarea): false
</ins><span class="cx"> PASS newSubwebarea.childrenCount &gt; 0 is true
</span><span class="cx"> 
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityloadingiframeupdatesaxtreehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/loading-iframe-updates-axtree.html (188745 => 188746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/loading-iframe-updates-axtree.html        2015-08-21 03:05:02 UTC (rev 188745)
+++ trunk/LayoutTests/accessibility/loading-iframe-updates-axtree.html        2015-08-21 03:12:25 UTC (rev 188746)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx">         description(&quot;This tests that if an iframe loads new content after its accessibility object has already been accessed, the iframe accessibility object's descendants are the new scroll area and web area, not the old deleted ones.&quot;);
</span><span class="cx"> 
</span><span class="cx">         if (window.accessibilityController) {
</span><del>-            window.iframe = accessibilityController.accessibleElementById('iframe');
</del><ins>+            window.iframe = accessibilityController.accessibleElementById('iframeContainer');
</ins><span class="cx">             window.scrollarea = iframe.childAtIndex(0);
</span><span class="cx">             window.subwebarea = scrollarea.childAtIndex(0);
</span><span class="cx">         }
</span><span class="lines">@@ -19,13 +19,17 @@
</span><span class="cx">         window.iframeElement = document.getElementById(&quot;iframe&quot;);
</span><span class="cx">         iframeElement.addEventListener(&quot;load&quot;, function() {
</span><span class="cx">             if (window.accessibilityController) {
</span><del>-                window.newIframe = accessibilityController.accessibleElementById('iframe');
</del><ins>+                window.newIframe = accessibilityController.accessibleElementById('iframeContainer');
</ins><span class="cx">                 window.newScrollarea = newIframe.childAtIndex(0);
</span><span class="cx">                 window.newSubwebarea = newScrollarea.childAtIndex(0);
</span><span class="cx"> 
</span><del>-                shouldBeTrue(&quot;iframe.isEqual(newIframe)&quot;);
-                shouldBeFalse(&quot;scrollarea.isEqual(newScrollarea)&quot;);
-                shouldBeFalse(&quot;subwebarea.isEqual(newSubwebarea)&quot;);
</del><ins>+                // for WK1, the scroll area does not change
+                var iframeEqual = iframe.isEqual(newIframe);
+                var scrollareaEqual = scrollarea.isEqual(newScrollarea);
+                var subwebareaEqual = subwebarea.isEqual(newSubwebarea);
+                debug(&quot;iframe.isEqual(newIframe): &quot; + iframeEqual);
+                debug(&quot;scrollarea.isEqual(newScrollarea): &quot; + scrollareaEqual);
+                debug(&quot;subwebarea.isEqual(newSubwebarea): &quot; + subwebareaEqual);
</ins><span class="cx">                 shouldBeTrue(&quot;newSubwebarea.childrenCount &gt; 0&quot;);
</span><span class="cx">             }
</span><span class="cx"> 
</span><span class="lines">@@ -51,7 +55,9 @@
</span><span class="cx"> 
</span><span class="cx"> &lt;p&gt;Before&lt;/p&gt;
</span><span class="cx"> 
</span><del>-&lt;iframe id=&quot;iframe&quot; role=&quot;group&quot;&gt;&lt;/iframe&gt;
</del><ins>+&lt;div id=&quot;iframeContainer&quot;&gt;
+&lt;iframe id=&quot;iframe&quot;&gt;&lt;/iframe&gt;
+&lt;/div&gt;
</ins><span class="cx"> 
</span><span class="cx"> &lt;p&gt;After&lt;/p&gt;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (188745 => 188746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations        2015-08-21 03:05:02 UTC (rev 188745)
+++ trunk/LayoutTests/platform/mac/TestExpectations        2015-08-21 03:12:25 UTC (rev 188746)
</span><span class="lines">@@ -35,9 +35,6 @@
</span><span class="cx"> fast/dom/Window/slow-unload-handler.html
</span><span class="cx"> fast/dom/Window/slow-unload-handler-only-frame-is-stopped.html
</span><span class="cx"> 
</span><del>-# This test fails on release and crashes on debug because of trying to use isEqual() with undefined objects
-webkit.org/b/126066 accessibility/loading-iframe-updates-axtree.html [ Failure Crash ]
-
</del><span class="cx"> webkit.org/b/116636 accessibility/document-attributes.html [ Failure ]
</span><span class="cx"> 
</span><span class="cx"> # Accessibility tests with missing AccessibilityController functionality.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1accessibilityloadingiframeupdatesaxtreeexpectedtxtfromrev188745trunkLayoutTestsaccessibilityloadingiframeupdatesaxtreeexpectedtxt"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/platform/mac-wk1/accessibility/loading-iframe-updates-axtree-expected.txt (from rev 188745, trunk/LayoutTests/accessibility/loading-iframe-updates-axtree-expected.txt) (0 => 188746)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/accessibility/loading-iframe-updates-axtree-expected.txt                                (rev 0)
+++ trunk/LayoutTests/platform/mac-wk1/accessibility/loading-iframe-updates-axtree-expected.txt        2015-08-21 03:12:25 UTC (rev 188746)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+Before
+
+
+After
+
+End of test
+
+This tests that if an iframe loads new content after its accessibility object has already been accessed, the iframe accessibility object's descendants are the new scroll area and web area, not the old deleted ones.
+
+On success, you will see a series of &quot;PASS&quot; messages, followed by &quot;TEST COMPLETE&quot;.
+
+
+iframe.isEqual(newIframe): true
+scrollarea.isEqual(newScrollarea): true
+subwebarea.isEqual(newSubwebarea): false
+PASS newSubwebarea.childrenCount &gt; 0 is true
+
+TEST COMPLETE
+
</ins></span></pre>
</div>
</div>

</body>
</html>