<!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>[186758] branches/safari-601.1-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/186758">186758</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-07-12 23:59:01 -0700 (Sun, 12 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/186741">r186741</a>. rdar://problem/21051187</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6011branchLayoutTestsChangeLog">branches/safari-601.1-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6011branchSourceWebCoreChangeLog">branches/safari-601.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6011branchSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm">branches/safari-601.1-branch/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6011branchLayoutTestsplatformiossimulatoraccessibilityiframeaccessexpectedtxt">branches/safari-601.1-branch/LayoutTests/platform/ios-simulator/accessibility/iframe-access-expected.txt</a></li>
<li><a href="#branchessafari6011branchLayoutTestsplatformiossimulatoraccessibilityiframeaccesshtml">branches/safari-601.1-branch/LayoutTests/platform/ios-simulator/accessibility/iframe-access.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6011branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/LayoutTests/ChangeLog (186757 => 186758)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/LayoutTests/ChangeLog 2015-07-13 06:56:28 UTC (rev 186757)
+++ branches/safari-601.1-branch/LayoutTests/ChangeLog 2015-07-13 06:59:01 UTC (rev 186758)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-07-12 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r186741.
+
+ 2015-07-12 Chris Fleizach <cfleizach@apple.com>
+
+ AX: WEB: VoiceOver for iOS does not read <iframe> elements during linear (swipe) navigation.
+ https://bugs.webkit.org/show_bug.cgi?id=146861
+
+ Reviewed by Darin Adler.
+
+ * platform/ios-simulator/accessibility/iframe-access-expected.txt: Added.
+ * platform/ios-simulator/accessibility/iframe-access.html: Added.
+
</ins><span class="cx"> 2015-07-10 Hunseop Jeong <hs85.jeong@samsung.com>
</span><span class="cx">
</span><span class="cx"> Fix typo in LayoutTests/platform/wk2/TestExpectation.
</span></span></pre></div>
<a id="branchessafari6011branchLayoutTestsplatformiossimulatoraccessibilityiframeaccessexpectedtxtfromrev186741trunkLayoutTestsplatformiossimulatoraccessibilityiframeaccessexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1-branch/LayoutTests/platform/ios-simulator/accessibility/iframe-access-expected.txt (from rev 186741, trunk/LayoutTests/platform/ios-simulator/accessibility/iframe-access-expected.txt) (0 => 186758)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/LayoutTests/platform/ios-simulator/accessibility/iframe-access-expected.txt (rev 0)
+++ branches/safari-601.1-branch/LayoutTests/platform/ios-simulator/accessibility/iframe-access-expected.txt 2015-07-13 06:59:01 UTC (rev 186758)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+
+This makes sure that an iframe is accessible on iOS
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+AXIdentifier: content
+AXIdentifier: iframe
+AXIdentifier:
+AXIdentifier:
+AXIdentifier:
+AXIdentifier: frame-button
+AXIdentifier: frame-link
+AXIdentifier:
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari6011branchLayoutTestsplatformiossimulatoraccessibilityiframeaccesshtmlfromrev186741trunkLayoutTestsplatformiossimulatoraccessibilityiframeaccesshtml"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1-branch/LayoutTests/platform/ios-simulator/accessibility/iframe-access.html (from rev 186741, trunk/LayoutTests/platform/ios-simulator/accessibility/iframe-access.html) (0 => 186758)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/LayoutTests/platform/ios-simulator/accessibility/iframe-access.html (rev 0)
+++ branches/safari-601.1-branch/LayoutTests/platform/ios-simulator/accessibility/iframe-access.html 2015-07-13 06:59:01 UTC (rev 186758)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../../resources/js-test-pre.js"></script>
+<script>
+var successfullyParsed = false;
+</script>
+</head>
+<body id="body">
+
+<div id="content">
+<iframe id="iframe" onload="startTest();" src="data:text/html,<body><button id='frame-button'>Click me</button><a href='#' id='frame-link'>a</a></body>"></iframe>
+</div>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This makes sure that an iframe is accessible on iOS");
+
+ function dumpAccessibilityChildren(element, level) {
+ if (!element) {
+ return;
+ }
+ var indent = "";
+ for (var k = 0; k < level; k++) { indent += " "; }
+ debug(indent + element.identifier);
+ var childrenCount = element.childrenCount;
+ for (var k = 0; k < childrenCount; k++) {
+ dumpAccessibilityChildren(element.childAtIndex(k), level+1);
+ }
+ }
+
+ window.jsTestIsAsync = true;
+ function startTest() {
+
+ if (window.accessibilityController) {
+ // Dump the tree to confirm that the items inside the frame can be accessed.
+ var content = accessibilityController.accessibleElementById("content");
+ dumpAccessibilityChildren(content);
+ finishJSTest();
+ }
+ }
+
+ successfullyParsed = true;
+</script>
+
+<script src="../../../resources/js-test-post.js"></script>
+</body>
+</html>
+
</ins></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (186757 => 186758)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-13 06:56:28 UTC (rev 186757)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-13 06:59:01 UTC (rev 186758)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2015-07-12 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r186741.
+
+ 2015-07-12 Chris Fleizach <cfleizach@apple.com>
+
+ AX: WEB: VoiceOver for iOS does not read <iframe> elements during linear (swipe) navigation.
+ https://bugs.webkit.org/show_bug.cgi?id=146861
+
+ Reviewed by Darin Adler.
+
+ AttachmentViews exist only on WK1 so we need account for both platforms.
+
+ Test: platform/ios-simulator/accessibility/iframe-access.html
+
+ * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+ (-[WebAccessibilityObjectWrapper accessibilityElementAtIndex:]):
+
+2015-07-12 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r186712.
</span><span class="cx">
</span><span class="cx"> 2015-07-10 Simon Fraser <simon.fraser@apple.com>
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (186757 => 186758)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2015-07-13 06:56:28 UTC (rev 186757)
+++ branches/safari-601.1-branch/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2015-07-13 06:59:01 UTC (rev 186758)
</span><span class="lines">@@ -362,8 +362,10 @@
</span><span class="cx"> if (![self _prepareAccessibilityCall])
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- if ([self isAttachment] && [self attachmentView])
- return [[self attachmentView] accessibilityElementCount];
</del><ins>+ if ([self isAttachment]) {
+ if (id attachmentView = [self attachmentView])
+ return [attachmentView accessibilityElementCount];
+ }
</ins><span class="cx">
</span><span class="cx"> return m_object->children().size();
</span><span class="cx"> }
</span><span class="lines">@@ -373,8 +375,10 @@
</span><span class="cx"> if (![self _prepareAccessibilityCall])
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- if ([self isAttachment] && [self attachmentView])
- return [[self attachmentView] accessibilityElementAtIndex:index];
</del><ins>+ if ([self isAttachment]) {
+ if (id attachmentView = [self attachmentView])
+ return [attachmentView accessibilityElementAtIndex:index];
+ }
</ins><span class="cx">
</span><span class="cx"> const auto& children = m_object->children();
</span><span class="cx"> size_t elementIndex = static_cast<size_t>(index);
</span><span class="lines">@@ -382,8 +386,10 @@
</span><span class="cx"> return nil;
</span><span class="cx">
</span><span class="cx"> AccessibilityObjectWrapper* wrapper = children[elementIndex]->wrapper();
</span><del>- if (children[elementIndex]->isAttachment())
- return [wrapper attachmentView];
</del><ins>+ if (children[elementIndex]->isAttachment()) {
+ if (id attachmentView = [wrapper attachmentView])
+ return attachmentView;
+ }
</ins><span class="cx">
</span><span class="cx"> return wrapper;
</span><span class="cx"> }
</span><span class="lines">@@ -393,8 +399,10 @@
</span><span class="cx"> if (![self _prepareAccessibilityCall])
</span><span class="cx"> return NSNotFound;
</span><span class="cx">
</span><del>- if ([self isAttachment] && [self attachmentView])
- return [[self attachmentView] indexOfAccessibilityElement:element];
</del><ins>+ if ([self isAttachment]) {
+ if (id attachmentView = [self attachmentView])
+ return [attachmentView indexOfAccessibilityElement:element];
+ }
</ins><span class="cx">
</span><span class="cx"> const auto& children = m_object->children();
</span><span class="cx"> unsigned count = children.size();
</span></span></pre>
</div>
</div>
</body>
</html>