Changeset 155428 in webkit

Timestamp:

Sep 10, 2013, 1:52:07 AM (13 years ago)

Author:

mario@webkit.org

Message:

[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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/accessibility/paragraph-with-linebreaks.html (added)
• LayoutTests/platform/efl/accessibility/paragraph-with-linebreaks-expected.txt (added)
• LayoutTests/platform/gtk/accessibility/paragraph-with-linebreaks-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityNodeObject.cpp (modified) (5 diffs)
• Source/WebCore/accessibility/AccessibilityRenderObject.cpp (modified) (2 diffs)
• Source/WebCore/html/parser/HTMLParserIdioms.h (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/run-gtk-tests (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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.
+
 2013-09-10  Arpita Bahuguna  <a.bah@samsung.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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().
+
 2013-09-10  Arpita Bahuguna  <a.bah@samsung.com>
 

trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp

@@ -55 +55 @@
 #include "HTMLOptionElement.h"
 #include "HTMLOptionsCollection.h"
+#include "HTMLParserIdioms.h"
 #include "HTMLPlugInImageElement.h"
 #include "HTMLSelectElement.h"
@@ -1543 +1544 @@
 }
 
+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]));
+}
+
 String AccessibilityNodeObject::textUnderElement(AccessibilityTextUnderElementMode mode) const
 {
@@ -1558 +1568 @@
             toAccessibilityNodeObject(child)->alternativeText(textOrder);
             if (textOrder.size() > 0 && textOrder[0].text.length()) {
-                if (builder.length())
+                if (shouldAddSpaceBeforeAppendingNextElement(builder, textOrder[0].text))
                     builder.append(' ');
                 builder.append(textOrder[0].text);
@@ -1567 +1577 @@
         String childText = child->textUnderElement(mode);
         if (childText.length()) {
-            if (builder.length())
+            if (shouldAddSpaceBeforeAppendingNextElement(builder, childText))
                 builder.append(' ');
             builder.append(childText);
@@ -1573 +1583 @@
     }
 
-    return builder.toString().stripWhiteSpace().simplifyWhiteSpace();
+    return builder.toString().stripWhiteSpace().simplifyWhiteSpace(isHTMLSpaceButNotLineBreak);
 }
 

trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

@@ -66 +66 @@
 #include "Page.h"
 #include "ProgressTracker.h"
+#include "RenderBR.h"
 #include "RenderButton.h"
 #include "RenderFieldset.h"
@@ -631 +632 @@
         return toRenderFileUploadControl(m_renderer)->buttonValue();
     
+    // Reflect when a content author has explicitly marked a line break.
+    if (m_renderer->isBR())
+        return toRenderBR(*m_renderer).text();
+
 #if ENABLE(MATHML)
     // Math operators create RenderText nodes on the fly that are not tied into the DOM in a reasonable way,

trunk/Source/WebCore/html/parser/HTMLParserIdioms.h

@@ -39 +39 @@
 bool isHTMLLineBreak(UChar);
 bool isNotHTMLSpace(UChar);
+bool isHTMLSpaceButNotLineBreak(UChar character);
 
 // Strip leading and trailing whitespace as defined by the HTML specification. 
@@ -93 +94 @@
 }
 
+inline bool isHTMLSpaceButNotLineBreak(UChar character)
+{
+    return isHTMLSpace(character) && !isHTMLLineBreak(character);
+}
+
 bool threadSafeMatch(const QualifiedName&, const QualifiedName&);
 #if ENABLE(THREADED_HTML_PARSER)

trunk/Tools/ChangeLog

@@ +1 @@
+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.
+
 2013-09-09  Mark Lam  <mark.lam@apple.com>
 

trunk/Tools/Scripts/run-gtk-tests

@@ -67 +67 @@
         SkippedTest("unittests/testwebresource", "/webkit/webresource/sub_resource_loading", "Test fails in GTK Linux 64-bit Release bot", 82330),
         SkippedTest("unittests/testwebview", "/webkit/webview/icon-uri", "Test times out in GTK Linux 64-bit Release bot", 82328),
-        SkippedTest("unittests/testatk", "/webkit/atk/getTextInParagraphAndBodyModerate", "Test fails", 105538),
         SkippedTest("WebKit2APITests/TestResources", "/webkit2/WebKitWebView/resources", "Test is flaky in GTK Linux 32-bit Release bot", 82868),
         SkippedTest("WebKit2APITests/TestWebKitWebView", SkippedTest.ENTIRE_SUITE, "Test times out after r150890", 117689),