Changeset 152561 in webkit

Timestamp:

Jul 11, 2013, 1:36:15 AM (12 years ago)

Author:

mario@webkit.org

Message:

[ATK] Refactor code for translating offsets between WebCore a11y and ATK
​https://bugs.webkit.org/show_bug.cgi?id=118179

Reviewed by Chris Fleizach.

Encapsulate better and make more clear the translation of offsets
between our ATK implementation and WebCore's accessibility layer.

Values for offsets can differ sometimes between those two worlds
due to some extra flattening we need to do in ATK based ports to
properly expose the accessibility hierarchy to ATs, which
sometimes means adding extra text elements in the exposed text
through the AtkText interface (e.g. list items markers).

• accessibility/atk/WebKitAccessibleInterfaceText.cpp:

(offsetAdjustmentForListItem): Helper function to refactor code
needed to translate offsets from WebCore to ATK worlds. Currently
related to considering list item markers in LTR text only.
(webCoreOffsetToAtkOffset): Convenience function for code
readability purposes. It just calls offsetAdjustmentForListItem.
(atkOffsetToWebCoreOffset): Likewise.
(getSelectionOffsetsForObject): Use webCoreOffsetToAtkOffset.
(webkitAccessibleTextGetCaretOffset): Use webCoreOffsetToAtkOffset
to translate an offset from WebCore to ATK before returning it.
(webkitAccessibleTextSetSelection): Use atkOffsetToWebCoreOffset
to translate an offset from WebCore to ATK before using it.
(webkitAccessibleTextSetCaretOffset): Likewise.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/atk/WebKitAccessibleInterfaceText.cpp (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-07-11  Mario Sanchez Prada  <mario.prada@samsung.com>
+
+        [ATK] Refactor code for translating offsets between WebCore a11y and ATK
+        https://bugs.webkit.org/show_bug.cgi?id=118179
+
+        Reviewed by Chris Fleizach.
+
+        Encapsulate better and make more clear the translation of offsets
+        between our ATK implementation and WebCore's accessibility layer.
+
+        Values for offsets can differ sometimes between those two worlds
+        due to some extra flattening we need to do in ATK based ports to
+        properly expose the accessibility hierarchy to ATs, which
+        sometimes means adding extra text elements in the exposed text
+        through the AtkText interface (e.g. list items markers).
+
+        * accessibility/atk/WebKitAccessibleInterfaceText.cpp:
+        (offsetAdjustmentForListItem): Helper function to refactor code
+        needed to translate offsets from WebCore to ATK worlds. Currently
+        related to considering list item markers in LTR text only.
+        (webCoreOffsetToAtkOffset): Convenience function for code
+        readability purposes. It just calls offsetAdjustmentForListItem.
+        (atkOffsetToWebCoreOffset): Likewise.
+        (getSelectionOffsetsForObject): Use webCoreOffsetToAtkOffset.
+        (webkitAccessibleTextGetCaretOffset): Use webCoreOffsetToAtkOffset
+        to translate an offset from WebCore to ATK before returning it.
+        (webkitAccessibleTextSetSelection): Use atkOffsetToWebCoreOffset
+        to translate an offset from WebCore to ATK before using it.
+        (webkitAccessibleTextSetCaretOffset): Likewise.
+
 2013-07-10  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp

@@ -473 +473 @@
 }
 
+static int offsetAdjustmentForListItem(const AccessibilityObject* object)
+{
+    // We need to adjust the offsets for the list item marker in
+    // Left-To-Right text, since we expose it together with the text.
+    RenderObject* renderer = object->renderer();
+    if (renderer && renderer->isListItem() && renderer->style()->direction() == LTR)
+        return toRenderListItem(renderer)->markerTextWithSuffix().length();
+
+    return 0;
+}
+
+static int webCoreOffsetToAtkOffset(const AccessibilityObject* object, int offset)
+{
+    if (!object->isListItem())
+        return offset;
+
+    return offset + offsetAdjustmentForListItem(object);
+}
+
+static int atkOffsetToWebCoreOffset(AtkText* text, int offset)
+{
+    AccessibilityObject* coreObject = core(text);
+    if (!coreObject || !coreObject->isListItem())
+        return offset;
+
+    return offset - offsetAdjustmentForListItem(coreObject);
+}
+
 static void getSelectionOffsetsForObject(AccessibilityObject* coreObject, VisibleSelection& selection, gint& startOffset, gint& endOffset)
 {
@@ -514 +542 @@
     RefPtr<Range> rangeInParent = Range::create(node->document(), parentFirstPosition, nodeRangeStart);
 
+
     // Set values for start and end offsets.
-    startOffset = TextIterator::rangeLength(rangeInParent.get(), true);
-
-    // We need to adjust the offsets for the list item marker.
-    RenderObject* renderer = coreObject->renderer();
-    if (renderer && renderer->isListItem()) {
-        String markerText = toRenderListItem(renderer)->markerTextWithSuffix();
-        startOffset += markerText.length();
-    }
+    startOffset = webCoreOffsetToAtkOffset(coreObject, TextIterator::rangeLength(rangeInParent.get(), true));
 
     RefPtr<Range> nodeRange = Range::create(node->document(), nodeRangeStart, nodeRangeEnd);
@@ -681 +703 @@
         return 0;
 
-    RenderObject* renderer = 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.
-    return offset;
+    return webCoreOffsetToAtkOffset(coreObject, offset);
 }
 
@@ -822 +835 @@
 
     // We need to adjust the offsets for the list item marker.
-    RenderObject* renderer = coreObject->renderer();
-    if (renderer && renderer->isListItem()) {
-        String markerText = toRenderListItem(renderer)->markerTextWithSuffix();
-        int markerLength = markerText.length();
-        if (startOffset < markerLength || endOffset < markerLength)
+    int offsetAdjustment = offsetAdjustmentForListItem(coreObject);
+    if (offsetAdjustment) {
+        if (startOffset < offsetAdjustment || endOffset < offsetAdjustment)
             return FALSE;
 
-        startOffset -= markerLength;
-        endOffset -= markerLength;
+        startOffset = atkOffsetToWebCoreOffset(text, startOffset);
+        endOffset = atkOffsetToWebCoreOffset(text, endOffset);
     }
 
@@ -865 +876 @@
         return FALSE;
 
-    RenderObject* renderer = coreObject->renderer();
-    if (renderer && renderer->isListItem()) {
-        String markerText = toRenderListItem(renderer)->markerTextWithSuffix();
-        int markerLength = markerText.length();
-        if (offset < markerLength)
+    // We need to adjust the offsets for the list item marker.
+    int offsetAdjustment = offsetAdjustmentForListItem(coreObject);
+    if (offsetAdjustment) {
+        if (offset < offsetAdjustment)
             return FALSE;
 
-        // We need to adjust the offset for list items.
-        offset -= markerLength;
+        offset = atkOffsetToWebCoreOffset(text, offset);
     }