<!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>[162327] releases/WebKitGTK/webkit-2.2</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/162327">162327</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-20 03:07:32 -0800 (Mon, 20 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/155428">r155428</a> - [GTK] Test /webkit/atk/getTextInParagraphAndBodyModerate fails
https://bugs.webkit.org/show_bug.cgi?id=105538
Reviewed by Chris Fleizach.
Source/WebCore:
Expose '\n' for linebreaks when they were explicitly set by the
author of the web content with a <br> tag.
Tests: accessibility/paragraph-with-linebreaks.html
* accessibility/AccessibilityNodeObject.cpp:
(WebCore::shouldAddSpaceBeforeAppendingNextElement): Helper
function to decide when to append spaces when building the text
under an element, considering line breaks.
(WebCore::AccessibilityNodeObject::textUnderElement): Use the
shouldAddSpaceBeforeAppendingNextElement() function here.
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::textUnderElement): Return the
renderer's text for accessibility objects exposing <br> elements.
* html/parser/HTMLParserIdioms.h:
(WebCore::isHTMLSpaceButNotLineBreak): New helper function, useful
to be passed to other functions like simplifyWhiteSpace().
Tools:
Unskip passing test getTextInParagraphAndBodyModerate.
* Scripts/run-gtk-tests:
(TestRunner): Unskip pasing test.
LayoutTests:
Added new Layout test and platform specific expectations.
* platform/efl/accessibility/paragraph-with-linebreaks-expected.txt: Added.
* platform/gtk/accessibility/paragraph-with-linebreaks-expected.txt: Added.
* accessibility/paragraph-with-linebreaks.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit22LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.2/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit22SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.2/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit22SourceWebCoreaccessibilityAccessibilityNodeObjectcpp">releases/WebKitGTK/webkit-2.2/Source/WebCore/accessibility/AccessibilityNodeObject.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit22SourceWebCoreaccessibilityAccessibilityRenderObjectcpp">releases/WebKitGTK/webkit-2.2/Source/WebCore/accessibility/AccessibilityRenderObject.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit22SourceWebCorehtmlparserHTMLParserIdiomsh">releases/WebKitGTK/webkit-2.2/Source/WebCore/html/parser/HTMLParserIdioms.h</a></li>
<li><a href="#releasesWebKitGTKwebkit22ToolsChangeLog">releases/WebKitGTK/webkit-2.2/Tools/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit22ToolsScriptsrungtktests">releases/WebKitGTK/webkit-2.2/Tools/Scripts/run-gtk-tests</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit22LayoutTestsaccessibilityparagraphwithlinebreakshtml">releases/WebKitGTK/webkit-2.2/LayoutTests/accessibility/paragraph-with-linebreaks.html</a></li>
<li><a href="#releasesWebKitGTKwebkit22LayoutTestsplatformeflaccessibilityparagraphwithlinebreaksexpectedtxt">releases/WebKitGTK/webkit-2.2/LayoutTests/platform/efl/accessibility/paragraph-with-linebreaks-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit22LayoutTestsplatformgtkaccessibilityparagraphwithlinebreaksexpectedtxt">releases/WebKitGTK/webkit-2.2/LayoutTests/platform/gtk/accessibility/paragraph-with-linebreaks-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit22LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.2/LayoutTests/ChangeLog (162326 => 162327)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/LayoutTests/ChangeLog 2014-01-20 10:57:02 UTC (rev 162326)
+++ releases/WebKitGTK/webkit-2.2/LayoutTests/ChangeLog 2014-01-20 11:07:32 UTC (rev 162327)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2013-09-10 Mario Sanchez Prada <mario.prada@samsung.com>
+
+ [GTK] Test /webkit/atk/getTextInParagraphAndBodyModerate fails
+ https://bugs.webkit.org/show_bug.cgi?id=105538
+
+ Reviewed by Chris Fleizach.
+
+ Added new Layout test and platform specific expectations.
+
+ * platform/efl/accessibility/paragraph-with-linebreaks-expected.txt: Added.
+ * platform/gtk/accessibility/paragraph-with-linebreaks-expected.txt: Added.
+ * accessibility/paragraph-with-linebreaks.html: Added.
+
</ins><span class="cx"> 2013-08-28 Allan Sandfeld Jensen <allan.jensen@digia.com>
</span><span class="cx">
</span><span class="cx"> Http tests fails on Debian with Apache 2.4
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit22LayoutTestsaccessibilityparagraphwithlinebreakshtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.2/LayoutTests/accessibility/paragraph-with-linebreaks.html (0 => 162327)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/LayoutTests/accessibility/paragraph-with-linebreaks.html (rev 0)
+++ releases/WebKitGTK/webkit-2.2/LayoutTests/accessibility/paragraph-with-linebreaks.html 2014-01-20 11:07:32 UTC (rev 162327)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+<html>
+<head>
+<script src="../fast/js/resources/js-test-pre.js"></script>
+</head>
+<body>
+
+<p>
+ Lorem ipsum dolor sit amet,<br>
+ consectetur adipiscing elit.<br>
+ Aliquam faucibus diam sit amet nunc vestibulum auctor.
+</p>
+
+<p style="max-width:150px;">
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam faucibus diam sit amet nunc vestibulum auctor.
+</p>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+description("This test checks that linebreaks explicitly set by the author are properly exposed to ATs.");
+
+if (window.testRunner) {
+ testRunner.dumpAsText();
+
+ if (window.accessibilityController) {
+
+ document.body.focus();
+ var webArea = accessibilityController.focusedElement;
+
+ var brokenParagraph = webArea.childAtIndex(0);
+ debug("Role of the paragraph with break lines: " + brokenParagraph.role);
+ debug("Value of the paragraph with break lines: " + brokenParagraph.stringValue);
+ debug("<br>");
+
+ var wrappedParagraph = webArea.childAtIndex(1);
+ debug("Role of the paragraph with wrapped lines: " + wrappedParagraph.role);
+ debug("Value of the paragraph with wrapped lines: " + wrappedParagraph.stringValue);
+ debug("<br>");
+ }
+}
+</script>
+
+<script src="../fast/js/resources/js-test-post.js"></script>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit22LayoutTestsplatformeflaccessibilityparagraphwithlinebreaksexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.2/LayoutTests/platform/efl/accessibility/paragraph-with-linebreaks-expected.txt (0 => 162327)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/LayoutTests/platform/efl/accessibility/paragraph-with-linebreaks-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.2/LayoutTests/platform/efl/accessibility/paragraph-with-linebreaks-expected.txt 2014-01-20 11:07:32 UTC (rev 162327)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+Lorem ipsum dolor sit amet,
+consectetur adipiscing elit.
+Aliquam faucibus diam sit amet nunc vestibulum auctor.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam faucibus diam sit amet nunc vestibulum auctor.
+
+This test checks that linebreaks explicitly set by the author are properly exposed to ATs.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Role of the paragraph with break lines: AXRole: AXParagraph
+Value of the paragraph with break lines: AXValue: Lorem ipsum dolor sit amet,<\n>consectetur adipiscing elit.<\n>Aliquam faucibus diam sit amet nunc vestibulum auctor.
+
+
+Role of the paragraph with wrapped lines: AXRole: AXParagraph
+Value of the paragraph with wrapped lines: AXValue: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam faucibus diam sit amet nunc vestibulum auctor.
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit22LayoutTestsplatformgtkaccessibilityparagraphwithlinebreaksexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.2/LayoutTests/platform/gtk/accessibility/paragraph-with-linebreaks-expected.txt (0 => 162327)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/LayoutTests/platform/gtk/accessibility/paragraph-with-linebreaks-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.2/LayoutTests/platform/gtk/accessibility/paragraph-with-linebreaks-expected.txt 2014-01-20 11:07:32 UTC (rev 162327)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+Lorem ipsum dolor sit amet,
+consectetur adipiscing elit.
+Aliquam faucibus diam sit amet nunc vestibulum auctor.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam faucibus diam sit amet nunc vestibulum auctor.
+
+This test checks that linebreaks explicitly set by the author are properly exposed to ATs.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Role of the paragraph with break lines: AXRole: AXParagraph
+Value of the paragraph with break lines: AXValue: Lorem ipsum dolor sit amet,<\n>consectetur adipiscing elit.<\n>Aliquam faucibus diam sit amet nunc vestibulum auctor.
+
+
+Role of the paragraph with wrapped lines: AXRole: AXParagraph
+Value of the paragraph with wrapped lines: AXValue: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam faucibus diam sit amet nunc vestibulum auctor.
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit22SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.2/Source/WebCore/ChangeLog (162326 => 162327)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/Source/WebCore/ChangeLog 2014-01-20 10:57:02 UTC (rev 162326)
+++ releases/WebKitGTK/webkit-2.2/Source/WebCore/ChangeLog 2014-01-20 11:07:32 UTC (rev 162327)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2013-09-10 Mario Sanchez Prada <mario.prada@samsung.com>
+
+ [GTK] Test /webkit/atk/getTextInParagraphAndBodyModerate fails
+ https://bugs.webkit.org/show_bug.cgi?id=105538
+
+ Reviewed by Chris Fleizach.
+
+ Expose '\n' for linebreaks when they were explicitly set by the
+ author of the web content with a <br> tag.
+
+ Tests: accessibility/paragraph-with-linebreaks.html
+
+ * accessibility/AccessibilityNodeObject.cpp:
+ (WebCore::shouldAddSpaceBeforeAppendingNextElement): Helper
+ function to decide when to append spaces when building the text
+ under an element, considering line breaks.
+ (WebCore::AccessibilityNodeObject::textUnderElement): Use the
+ shouldAddSpaceBeforeAppendingNextElement() function here.
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::textUnderElement): Return the
+ renderer's text for accessibility objects exposing <br> elements.
+ * html/parser/HTMLParserIdioms.h:
+ (WebCore::isHTMLSpaceButNotLineBreak): New helper function, useful
+ to be passed to other functions like simplifyWhiteSpace().
+
</ins><span class="cx"> 2013-12-06 Roger Fong <roger_fong@apple.com>
</span><span class="cx">
</span><span class="cx"> Hook into some shader symbol logic following the ANGLE update in r159533.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit22SourceWebCoreaccessibilityAccessibilityNodeObjectcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.2/Source/WebCore/accessibility/AccessibilityNodeObject.cpp (162326 => 162327)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2014-01-20 10:57:02 UTC (rev 162326)
+++ releases/WebKitGTK/webkit-2.2/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2014-01-20 11:07:32 UTC (rev 162327)
</span><span class="lines">@@ -54,6 +54,7 @@
</span><span class="cx"> #include "HTMLOptGroupElement.h"
</span><span class="cx"> #include "HTMLOptionElement.h"
</span><span class="cx"> #include "HTMLOptionsCollection.h"
</span><ins>+#include "HTMLParserIdioms.h"
</ins><span class="cx"> #include "HTMLPlugInImageElement.h"
</span><span class="cx"> #include "HTMLSelectElement.h"
</span><span class="cx"> #include "HTMLTextAreaElement.h"
</span><span class="lines">@@ -1545,6 +1546,15 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool shouldAddSpaceBeforeAppendingNextElement(StringBuilder& builder, String& childText)
+{
+ if (!builder.length() || !childText.length())
+ return false;
+
+ // We don't need to add an additional space before or after a line break.
+ return !(isHTMLLineBreak(childText[0]) || isHTMLLineBreak(builder[builder.length() - 1]));
+}
+
</ins><span class="cx"> String AccessibilityNodeObject::textUnderElement(AccessibilityTextUnderElementMode mode) const
</span><span class="cx"> {
</span><span class="cx"> Node* node = this->node();
</span><span class="lines">@@ -1560,7 +1570,7 @@
</span><span class="cx"> Vector<AccessibilityText> textOrder;
</span><span class="cx"> toAccessibilityNodeObject(child)->alternativeText(textOrder);
</span><span class="cx"> if (textOrder.size() > 0 && textOrder[0].text.length()) {
</span><del>- if (builder.length())
</del><ins>+ if (shouldAddSpaceBeforeAppendingNextElement(builder, textOrder[0].text))
</ins><span class="cx"> builder.append(' ');
</span><span class="cx"> builder.append(textOrder[0].text);
</span><span class="cx"> continue;
</span><span class="lines">@@ -1569,13 +1579,13 @@
</span><span class="cx">
</span><span class="cx"> String childText = child->textUnderElement(mode);
</span><span class="cx"> if (childText.length()) {
</span><del>- if (builder.length())
</del><ins>+ if (shouldAddSpaceBeforeAppendingNextElement(builder, childText))
</ins><span class="cx"> builder.append(' ');
</span><span class="cx"> builder.append(childText);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return builder.toString().stripWhiteSpace().simplifyWhiteSpace();
</del><ins>+ return builder.toString().stripWhiteSpace().simplifyWhiteSpace(isHTMLSpaceButNotLineBreak);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String AccessibilityNodeObject::title() const
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit22SourceWebCoreaccessibilityAccessibilityRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.2/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (162326 => 162327)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2014-01-20 10:57:02 UTC (rev 162326)
+++ releases/WebKitGTK/webkit-2.2/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2014-01-20 11:07:32 UTC (rev 162327)
</span><span class="lines">@@ -65,6 +65,7 @@
</span><span class="cx"> #include "NodeList.h"
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "ProgressTracker.h"
</span><ins>+#include "RenderBR.h"
</ins><span class="cx"> #include "RenderButton.h"
</span><span class="cx"> #include "RenderFieldset.h"
</span><span class="cx"> #include "RenderFileUploadControl.h"
</span><span class="lines">@@ -630,6 +631,10 @@
</span><span class="cx"> if (m_renderer->isFileUploadControl())
</span><span class="cx"> return toRenderFileUploadControl(m_renderer)->buttonValue();
</span><span class="cx">
</span><ins>+ // Reflect when a content author has explicitly marked a line break.
+ if (m_renderer->isBR())
+ return toRenderBR(m_renderer)->text();
+
</ins><span class="cx"> #if ENABLE(MATHML)
</span><span class="cx"> // Math operators create RenderText nodes on the fly that are not tied into the DOM in a reasonable way,
</span><span class="cx"> // so rangeOfContents does not work for them (nor does regular text selection).
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit22SourceWebCorehtmlparserHTMLParserIdiomsh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.2/Source/WebCore/html/parser/HTMLParserIdioms.h (162326 => 162327)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/Source/WebCore/html/parser/HTMLParserIdioms.h 2014-01-20 10:57:02 UTC (rev 162326)
+++ releases/WebKitGTK/webkit-2.2/Source/WebCore/html/parser/HTMLParserIdioms.h 2014-01-20 11:07:32 UTC (rev 162327)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> bool isHTMLSpace(UChar);
</span><span class="cx"> bool isHTMLLineBreak(UChar);
</span><span class="cx"> bool isNotHTMLSpace(UChar);
</span><ins>+bool isHTMLSpaceButNotLineBreak(UChar character);
</ins><span class="cx">
</span><span class="cx"> // Strip leading and trailing whitespace as defined by the HTML specification.
</span><span class="cx"> String stripLeadingAndTrailingHTMLSpaces(const String&);
</span><span class="lines">@@ -92,6 +93,11 @@
</span><span class="cx"> return !isHTMLSpace(character);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline bool isHTMLSpaceButNotLineBreak(UChar character)
+{
+ return isHTMLSpace(character) && !isHTMLLineBreak(character);
+}
+
</ins><span class="cx"> bool threadSafeMatch(const QualifiedName&, const QualifiedName&);
</span><span class="cx"> #if ENABLE(THREADED_HTML_PARSER)
</span><span class="cx"> bool threadSafeMatch(const HTMLIdentifier&, const QualifiedName&);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit22ToolsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.2/Tools/ChangeLog (162326 => 162327)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/Tools/ChangeLog 2014-01-20 10:57:02 UTC (rev 162326)
+++ releases/WebKitGTK/webkit-2.2/Tools/ChangeLog 2014-01-20 11:07:32 UTC (rev 162327)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2013-09-10 Mario Sanchez Prada <mario.prada@samsung.com>
+
+ [GTK] Test /webkit/atk/getTextInParagraphAndBodyModerate fails
+ https://bugs.webkit.org/show_bug.cgi?id=105538
+
+ Reviewed by Chris Fleizach.
+
+ Unskip passing test getTextInParagraphAndBodyModerate.
+
+ * Scripts/run-gtk-tests:
+ (TestRunner): Unskip pasing test.
+
</ins><span class="cx"> 2013-12-23 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] run-gtk-tests should always run glib tests with -k option
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit22ToolsScriptsrungtktests"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.2/Tools/Scripts/run-gtk-tests (162326 => 162327)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/Tools/Scripts/run-gtk-tests 2014-01-20 10:57:02 UTC (rev 162326)
+++ releases/WebKitGTK/webkit-2.2/Tools/Scripts/run-gtk-tests 2014-01-20 11:07:32 UTC (rev 162327)
</span><span class="lines">@@ -66,7 +66,6 @@
</span><span class="cx"> SkippedTest("unittests/testwebresource", "/webkit/webresource/loading", "Test fails", 104689),
</span><span class="cx"> SkippedTest("unittests/testwebresource", "/webkit/webresource/sub_resource_loading", "Test fails in GTK Linux 64-bit Release bot", 82330),
</span><span class="cx"> SkippedTest("unittests/testwebview", "/webkit/webview/icon-uri", "Test times out in GTK Linux 64-bit Release bot", 82328),
</span><del>- SkippedTest("unittests/testatk", "/webkit/atk/getTextInParagraphAndBodyModerate", "Test fails", 105538),
</del><span class="cx"> SkippedTest("WebKit2APITests/TestResources", "/webkit2/WebKitWebView/resources", "Test is flaky in GTK Linux 32-bit Release bot", 82868),
</span><span class="cx"> SkippedTest("WebKit2APITests/TestWebKitAccessibility", "/webkit2/WebKitAccessibility/atspi-basic-hierarchy", "Test fails", 100408),
</span><span class="cx"> SkippedTest("WebKit2APITests/TestWebKitWebView", SkippedTest.ENTIRE_SUITE, "Test times out after r150890", 117689),
</span></span></pre>
</div>
</div>
</body>
</html>