Changeset 52890 in webkit

Timestamp:

Jan 6, 2010 6:05:01 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-01-06 Joanmarie Diggs <​joanmarie.diggs@gmail.com>

Reviewed by Xan Lopez.

​https://bugs.webkit.org/show_bug.cgi?id=30883
[Gtk] Implement AtkText for HTML elements which contain text

• accessibility/gtk/AccessibilityObjectWrapperAtk.cpp: (getInterfaceMaskFromObject): (getPangoLayoutForAtk): (webkit_accessible_text_get_text):
• accessibility/gtk/AccessibilityObjectAtk.cpp: (AccessibilityObject::accessibilityPlatformIncludesObject):

2010-01-06 Joanmarie Diggs <​joanmarie.diggs@gmail.com>

Reviewed by Xan Lopez.

​https://bugs.webkit.org/show_bug.cgi?id=30883
[Gtk] Implement AtkText for HTML elements which contain text

• tests/testatk.c (test_webkit_atk_get_text_at_offset): (test_webkit_atk_get_text_at_offset_forms): (test_webkit_atk_get_text_at_offset_newlines):

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp (modified) (1 diff)
• WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp (modified) (4 diffs)
• WebKit/gtk/ChangeLog (modified) (1 diff)
• WebKit/gtk/tests/testatk.c (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-06  Joanmarie Diggs  <joanmarie.diggs@gmail.com>
+
+        Reviewed by Xan Lopez.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30883
+        [Gtk] Implement AtkText for HTML elements which contain text
+
+        * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
+        (getInterfaceMaskFromObject):
+        (getPangoLayoutForAtk):
+        (webkit_accessible_text_get_text):
+        * accessibility/gtk/AccessibilityObjectAtk.cpp:
+        (AccessibilityObject::accessibilityPlatformIncludesObject):
+
 2010-01-06  Dan Bernstein  <mitz@apple.com>
 

trunk/WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp

@@ -48 +48 @@
         return IgnoreObject;
 
+    // The object containing the text should implement AtkText itself.
+    if (roleValue() == StaticTextRole)
+        return IgnoreObject;
+
     return DefaultBehavior;
 }

trunk/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp

@@ -821 +821 @@
     String ret;
     unsigned start = startOffset;
-    if (endOffset == -1)
+    if (endOffset == -1) {
         endOffset = coreObject->stringValue().length();
+        if (!endOffset)
+            endOffset = coreObject->textUnderElement().length();
+    }
     int length = endOffset - startOffset;
 
@@ -904 +907 @@
     if (!accObject)
         return 0;
-    RenderText* renderText = toRenderText(accObject->renderer());
-    if (!renderText)
-        return 0;
 
     // Create a string with the layout as it appears on the screen
+    // For text controls, we can get the text line by line.
     if (accObject->isTextControl()) {
         unsigned textLength = accObject->textLength();
@@ -923 +924 @@
         }
     } else {
-        InlineTextBox* box = renderText->firstTextBox();
-        while (box) {
-            gchar* text = convertUniCharToUTF8(renderText->characters(), renderText->textLength(), box->start(), box->end());
-            g_string_append(str, text);
-            // Newline chars in the source result in separate text boxes, so check
-            // before adding a newline in the layout. See bug 25415 comment #78.
-            if (!box->nextOnLineExists())
+        // For RenderBlocks, piece together the text from the RenderText objects they contain.
+        for (RenderObject* obj = accObject->renderer()->firstChild(); obj; obj = obj->nextSibling()) {
+            if (obj->isBR()) {
                 g_string_append(str, "\n");
-            box = box->nextTextBox();
+                continue;
+            }
+
+            RenderText* renderText = toRenderText(obj);
+            // Be sure we have a RenderText object we can work with.
+            if (!renderText || !obj->isText()) {
+                // Handle RenderInlines (and any other similiar RenderObjects).
+                renderText = toRenderText(obj->firstChild());
+                if (!renderText)
+                    continue;
+            }
+
+            InlineTextBox* box = renderText->firstTextBox();
+            while (box) {
+                gchar* text = convertUniCharToUTF8(renderText->characters(), renderText->textLength(), box->start(), box->end());
+                g_string_append(str, text);
+                // Newline chars in the source result in separate text boxes, so check
+                // before adding a newline in the layout. See bug 25415 comment #78.
+                if (!box->nextOnLineExists())
+                    g_string_append(str, "\n");
+                box = box->nextTextBox();
+            }
         }
     }
@@ -1611 +1629 @@
     if (role == StaticTextRole)
         interfaceMask |= 1 << WAI_TEXT;
-    else if (coreObject->isAccessibilityRenderObject() && coreObject->isTextControl()) {
-        interfaceMask |= 1 << WAI_TEXT;
-        if (!coreObject->isReadOnly())
-            interfaceMask |= 1 << WAI_EDITABLE_TEXT;
-    }
+    else if (coreObject->isAccessibilityRenderObject())
+        if (coreObject->isTextControl()) {
+            interfaceMask |= 1 << WAI_TEXT;
+            if (!coreObject->isReadOnly())
+                interfaceMask |= 1 << WAI_EDITABLE_TEXT;
+        } else if (static_cast<AccessibilityRenderObject*>(coreObject)->renderer()->childrenInline())
+            interfaceMask |= 1 << WAI_TEXT;
 
     // Image

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2010-01-06  Joanmarie Diggs  <joanmarie.diggs@gmail.com>
+
+        Reviewed by Xan Lopez.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30883
+        [Gtk] Implement AtkText for HTML elements which contain text
+
+        * tests/testatk.c
+        (test_webkit_atk_get_text_at_offset):
+        (test_webkit_atk_get_text_at_offset_forms):
+        (test_webkit_atk_get_text_at_offset_newlines):
+
 2010-01-05  Gustavo Noronha Silva  <gns@gnome.org>
 

trunk/WebKit/gtk/tests/testatk.c

@@ -222 +222 @@
     obj = atk_object_ref_accessible_child(obj, 0);
     g_assert(obj);
-    obj = atk_object_ref_accessible_child(obj, 0);
-    g_assert(obj);
 
     text_obj = ATK_TEXT(obj);
@@ -255 +253 @@
     obj = atk_object_ref_accessible_child(obj, 0);
     g_assert(obj);
-    obj = atk_object_ref_accessible_child(obj, 0);
-    g_assert(obj);
 
     text_obj = ATK_TEXT(obj);
@@ -285 +281 @@
     /* Get to the inner AtkText object */
     obj = gtk_widget_get_accessible(GTK_WIDGET(webView));
-    g_assert(obj);
-    obj = atk_object_ref_accessible_child(obj, 0);
     g_assert(obj);
     obj = atk_object_ref_accessible_child(obj, 0);