<!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>[175899] releases/WebKitGTK/webkit-2.6</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/175899">175899</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-11-11 03:58:08 -0800 (Tue, 11 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/174992">r174992</a> - AX: [ATK] CSS-generated text content not exposed to assistive technologies
https://bugs.webkit.org/show_bug.cgi?id=137669
Reviewed by Chris Fleizach.
Source/WebCore:
Do not use a text iterator to get the text for elements which include
pseudo elements.
Test: accessibility/css-content-attribute.html
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::textUnderElement):
LayoutTests:
Moved the Mac platform test and modified it to dump the accessible tree
and string values rather than a platform-specific hierarchy so that it
could be shared across platforms.
* accessibility/css-content-attribute.html: Added.
* platform/gtk/accessibility/css-content-attribute-expected.txt: Added.
* platform/mac/accessibility/css-content-attribute-expected.txt: Modified to reflect new output.
* platform/mac/accessibility/css-content-attribute.html: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsplatformmacaccessibilitycsscontentattributeexpectedtxt">releases/WebKitGTK/webkit-2.6/LayoutTests/platform/mac/accessibility/css-content-attribute-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreaccessibilityAccessibilityRenderObjectcpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/accessibility/AccessibilityRenderObject.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsaccessibilitycsscontentattributehtml">releases/WebKitGTK/webkit-2.6/LayoutTests/accessibility/css-content-attribute.html</a></li>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsplatformgtkaccessibilitycsscontentattributeexpectedtxt">releases/WebKitGTK/webkit-2.6/LayoutTests/platform/gtk/accessibility/css-content-attribute-expected.txt</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsplatformmacaccessibilitycsscontentattributehtml">releases/WebKitGTK/webkit-2.6/LayoutTests/platform/mac/accessibility/css-content-attribute.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit26LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog (175898 => 175899)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog 2014-11-11 11:55:42 UTC (rev 175898)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog 2014-11-11 11:58:08 UTC (rev 175899)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-10-21 Joanmarie Diggs <jdiggs@igalia.com>
+
+ AX: [ATK] CSS-generated text content not exposed to assistive technologies
+ https://bugs.webkit.org/show_bug.cgi?id=137669
+
+ Reviewed by Chris Fleizach.
+
+ Moved the Mac platform test and modified it to dump the accessible tree
+ and string values rather than a platform-specific hierarchy so that it
+ could be shared across platforms.
+
+ * accessibility/css-content-attribute.html: Added.
+ * platform/gtk/accessibility/css-content-attribute-expected.txt: Added.
+ * platform/mac/accessibility/css-content-attribute-expected.txt: Modified to reflect new output.
+ * platform/mac/accessibility/css-content-attribute.html: Removed.
+
</ins><span class="cx"> 2014-10-21 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION: Google Search (mobile) video thumbnails are too large.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestsaccessibilitycsscontentattributehtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.6/LayoutTests/accessibility/css-content-attribute.html (0 => 175899)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/accessibility/css-content-attribute.html (rev 0)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/accessibility/css-content-attribute.html 2014-11-11 11:58:08 UTC (rev 175899)
</span><span class="lines">@@ -0,0 +1,54 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<script>
+ function dumpAccessibilityChildren(element, level) {
+ if (element.stringValue.indexOf('End of test') >= 0)
+ return false;
+
+ var indent = "";
+ for (var k = 0; k < level; k++) { indent += " "; }
+ debug(indent + element.role + " " + element.stringValue);
+ var childrenCount = element.childrenCount;
+ for (var k = 0; k < childrenCount; k++) {
+ if (!dumpAccessibilityChildren(element.childAtIndex(k), level+1))
+ return false;
+ }
+ return true;
+ }
+</script>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+
+ <style type="text/css">
+
+ h1:before {
+ content: 'This is a';
+ }
+
+ h1:after {
+ content: 'Headline';
+ }
+
+ </style>
+
+</head>
+<body id="body">
+<h1>SAMPLE</h1>
+<div>End of test</div>
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This tests that when the content attribute in CSS is used, the correct values are returned.");
+
+ if (window.accessibilityController) {
+ document.getElementById("body").focus();
+ dumpAccessibilityChildren(accessibilityController.focusedElement, 0);
+ }
+
+</script>
+
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestsplatformgtkaccessibilitycsscontentattributeexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.6/LayoutTests/platform/gtk/accessibility/css-content-attribute-expected.txt (0 => 175899)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/platform/gtk/accessibility/css-content-attribute-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/platform/gtk/accessibility/css-content-attribute-expected.txt 2014-11-11 11:58:08 UTC (rev 175899)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+SAMPLE
+
+End of test
+This tests that when the content attribute in CSS is used, the correct values are returned.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+AXRole: AXWebArea
+ AXRole: AXHeading AXValue: This is a SAMPLE Headline
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestsplatformmacaccessibilitycsscontentattributeexpectedtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/LayoutTests/platform/mac/accessibility/css-content-attribute-expected.txt (175898 => 175899)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/platform/mac/accessibility/css-content-attribute-expected.txt 2014-11-11 11:55:42 UTC (rev 175898)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/platform/mac/accessibility/css-content-attribute-expected.txt 2014-11-11 11:58:08 UTC (rev 175899)
</span><span class="lines">@@ -1,16 +1,17 @@
</span><span class="cx"> SAMPLE
</span><span class="cx">
</span><ins>+End of test
</ins><span class="cx"> This tests that when the content attribute in CSS is used, the correct values are returned.
</span><span class="cx">
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-PASS body.childAtIndex(0).childAtIndex(0).role is 'AXRole: AXStaticText'
-PASS body.childAtIndex(0).childAtIndex(1).role is 'AXRole: AXStaticText'
-PASS body.childAtIndex(0).childAtIndex(2).role is 'AXRole: AXStaticText'
-PASS body.childAtIndex(0).childAtIndex(0).stringValue is 'AXValue: This is a'
-PASS body.childAtIndex(0).childAtIndex(1).stringValue is 'AXValue: SAMPLE'
-PASS body.childAtIndex(0).childAtIndex(2).stringValue is 'AXValue: Headline'
</del><ins>+AXRole: AXWebArea AXValue:
+ AXRole: AXHeading AXValue: 1
+ AXRole: AXStaticText AXValue: This is a
+ AXRole: AXStaticText AXValue: SAMPLE
+ AXRole: AXStaticText AXValue: Headline
+ AXRole: AXGroup AXValue:
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestsplatformmacaccessibilitycsscontentattributehtml"></a>
<div class="delfile"><h4>Deleted: releases/WebKitGTK/webkit-2.6/LayoutTests/platform/mac/accessibility/css-content-attribute.html (175898 => 175899)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/platform/mac/accessibility/css-content-attribute.html 2014-11-11 11:55:42 UTC (rev 175898)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/platform/mac/accessibility/css-content-attribute.html 2014-11-11 11:58:08 UTC (rev 175899)
</span><span class="lines">@@ -1,48 +0,0 @@
</span><del>-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<script src="../../../resources/js-test-pre.js"></script>
-
- <style type="text/css">
-
- h1:before {
- content: 'This is a';
- }
-
- h1:after {
- content: 'Headline';
- }
-
- </style>
-
-</head>
-<body id="body">
-<h1>SAMPLE</h1>
-
-<p id="description"></p>
-<div id="console"></div>
-
-<script>
-
- description("This tests that when the content attribute in CSS is used, the correct values are returned.");
-
- if (window.accessibilityController) {
-
- document.getElementById("body").focus();
- var body = accessibilityController.focusedElement;
-
- // Test that all three children in the header appear with the correct values.
- shouldBe("body.childAtIndex(0).childAtIndex(0).role", "'AXRole: AXStaticText'");
- shouldBe("body.childAtIndex(0).childAtIndex(1).role", "'AXRole: AXStaticText'");
- shouldBe("body.childAtIndex(0).childAtIndex(2).role", "'AXRole: AXStaticText'");
-
- shouldBe("body.childAtIndex(0).childAtIndex(0).stringValue", "'AXValue: This is a'");
- shouldBe("body.childAtIndex(0).childAtIndex(1).stringValue", "'AXValue: SAMPLE'");
- shouldBe("body.childAtIndex(0).childAtIndex(2).stringValue", "'AXValue: Headline'");
- }
-
-</script>
-
-<script src="../../../resources/js-test-post.js"></script>
-</body>
-</html>
</del></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (175898 => 175899)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-11-11 11:55:42 UTC (rev 175898)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-11-11 11:58:08 UTC (rev 175899)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-10-21 Joanmarie Diggs <jdiggs@igalia.com>
+
+ AX: [ATK] CSS-generated text content not exposed to assistive technologies
+ https://bugs.webkit.org/show_bug.cgi?id=137669
+
+ Reviewed by Chris Fleizach.
+
+ Do not use a text iterator to get the text for elements which include
+ pseudo elements.
+
+ Test: accessibility/css-content-attribute.html
+
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::textUnderElement):
+
</ins><span class="cx"> 2014-10-21 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION: Google Search (mobile) video thumbnails are too large.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreaccessibilityAccessibilityRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (175898 => 175899)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2014-11-11 11:55:42 UTC (rev 175898)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2014-11-11 11:58:08 UTC (rev 175899)
</span><span class="lines">@@ -650,6 +650,10 @@
</span><span class="cx"> return toRenderText(*m_renderer).text();
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ // rangeOfContents does not include CSS-generated content.
+ if (m_renderer->isBeforeOrAfterContent())
+ return AccessibilityNodeObject::textUnderElement(mode);
+
</ins><span class="cx"> // We use a text iterator for text objects AND for those cases where we are
</span><span class="cx"> // explicitly asking for the full text under a given element.
</span><span class="cx"> if (m_renderer->isText() || mode.childrenInclusion == AccessibilityTextUnderElementMode::TextUnderElementModeIncludeAllChildren) {
</span><span class="lines">@@ -658,6 +662,12 @@
</span><span class="cx"> Document* nodeDocument = nullptr;
</span><span class="cx"> RefPtr<Range> textRange;
</span><span class="cx"> if (Node* node = m_renderer->node()) {
</span><ins>+ // rangeOfContents does not include CSS-generated content.
+ Node* firstChild = node->pseudoAwareFirstChild();
+ Node* lastChild = node->pseudoAwareLastChild();
+ if ((firstChild && firstChild->isPseudoElement()) || (lastChild && lastChild->isPseudoElement()))
+ return AccessibilityNodeObject::textUnderElement(mode);
+
</ins><span class="cx"> nodeDocument = &node->document();
</span><span class="cx"> textRange = rangeOfContents(*node);
</span><span class="cx"> } else {
</span></span></pre>
</div>
</div>
</body>
</html>