Changeset 77817 in webkit

Timestamp:

Feb 7, 2011 8:23:10 AM (13 years ago)

Author:

mario@webkit.org

Message:

2011-02-07 Mario Sanchez Prada <​msanchez@igalia.com>

Reviewed by Xan Lopez.

[Gtk] atk_text_get_caret_offset fails for list items
​https://bugs.webkit.org/show_bug.cgi?id=53436

Consider list item markers when calculating the offset.

• accessibility/gtk/AccessibilityObjectWrapperAtk.cpp: (webkit_accessible_text_get_caret_offset): Adjust the offset with the item marker's length for list items. (webkit_accessible_text_set_caret_offset): Replace usage of g_utf8_strlen() by calling to markerText.length().

2011-02-07 Mario Sanchez Prada <​msanchez@igalia.com>

Reviewed by Xan Lopez.

[Gtk] atk_text_get_caret_offset fails for list items
​https://bugs.webkit.org/show_bug.cgi?id=53436

Update unit test to check the fix for this bug.

• tests/testatk.c: (testWebkitAtkCaretOffsets): Check that the caret offset returned match the value previously set.

Location:

trunk/Source

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-07  Mario Sanchez Prada  <msanchez@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [Gtk] atk_text_get_caret_offset fails for list items
+        https://bugs.webkit.org/show_bug.cgi?id=53436
+
+        Consider list item markers when calculating the offset.
+
+        * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
+        (webkit_accessible_text_get_caret_offset): Adjust the offset
+        with the item marker's length for list items.
+        (webkit_accessible_text_set_caret_offset): Replace usage of
+        g_utf8_strlen() by calling to markerText.length().
+
 2011-02-07  Yi Shen  <yi.4.shen@nokia.com>
 

trunk/Source/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp

@@ -1210 +1210 @@
     // focusedObject is the object with the caret. It is likely ignored -- unless it's a link.
     AccessibilityObject* coreObject = core(text);
+    if (!coreObject->isAccessibilityRenderObject())
+        return 0;
+
     Node* focusedNode = coreObject->selection().end().node();
-
     if (!focusedNode)
         return 0;
@@ -1222 +1224 @@
     if (!objectAndOffsetUnignored(focusedObject, offset, !coreObject->isLink()))
         return 0;
+
+    RenderObject* renderer = toAccessibilityRenderObject(coreObject)->renderer();
+    if (renderer && renderer->isListItem()) {
+        String markerText = toRenderListItem(renderer)->markerTextWithSuffix();
+
+        // We need to adjust the offset for the list item marker.
+        offset += markerText.length();
+    }
 
     // TODO: Verify this for RTL text.
@@ -1707 +1717 @@
     if (renderer && renderer->isListItem()) {
         String markerText = toRenderListItem(renderer)->markerTextWithSuffix();
-        int markerLength = g_utf8_strlen(markerText.utf8().data(), -1);
+        int markerLength = markerText.length();
         if (offset < markerLength)
             return FALSE;

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2011-02-07  Mario Sanchez Prada  <msanchez@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [Gtk] atk_text_get_caret_offset fails for list items
+        https://bugs.webkit.org/show_bug.cgi?id=53436
+
+        Update unit test to check the fix for this bug.
+
+        * tests/testatk.c:
+        (testWebkitAtkCaretOffsets): Check that the caret offset returned
+        match the value previously set.
+
 2011-02-04  Joone Hur  <joone.hur@collabora.co.uk>
 

trunk/Source/WebKit/gtk/tests/testatk.c

@@ -296 +296 @@
     result = atk_text_set_caret_offset(ATK_TEXT(listItem), 5);
     g_assert_cmpint(result, ==, TRUE);
-
-    /* Uncomment the following two lines when fixing bug 53436. */
-    /* offset = atk_text_get_caret_offset(ATK_TEXT(listItem)); */
-    /* g_assert_cmpint(offset, ==, 5); */
+    offset = atk_text_get_caret_offset(ATK_TEXT(listItem));
+    g_assert_cmpint(offset, ==, 5);
 
     AtkObject* panel = atk_object_ref_accessible_child(object, 3);