Changeset 72284 in webkit

Timestamp:

Nov 18, 2010 4:42:08 AM (13 years ago)

Author:

mario@webkit.org

Message:

2010-11-18 Mario Sanchez Prada <​msanchez@igalia.com>

Reviewed by Martin Robinson.

[Gtk] atk_text_get_selection returns the wrong offsets after a link
​https://bugs.webkit.org/show_bug.cgi?id=49514

Consider possible embedded objects to calculate startOffset.

So far we were using offsetInContainerNode() to calculate the
value of startOffset when checking the offsets for the current
selection, which was wrong because that wouldn't work ok if any
embedded object was present in the paragraph before the
selection. Thus, we need to consider this fact when calculating
the startOffset from the point of view of the object this function
is called on, in order to return the right and actual values.

• accessibility/gtk/AccessibilityObjectWrapperAtk.cpp: (getSelectionOffsetsForObject): Check range length from the first position in the object the function is called on until the first position of current selection, and use it as startOffset.

2010-11-18 Mario Sanchez Prada <​msanchez@igalia.com>

Reviewed by Martin Robinson.

[Gtk] atk_text_get_selection returns the wrong offsets after a link
​https://bugs.webkit.org/show_bug.cgi?id=49514

Updated test case to also chech this specific subcase.

We need to explicitly check the case of having a selection in a
paragraph after an embedded object (i.e. a link) to make sure the
right calculations are being done when the paragraph is composed
of more than just one text object, and the current selection is
made only in one of them.

• tests/testatk.c: (testWebkitAtkTextSelections): Make sure that a selection after a link in a paragraph is working ok when asking for the text selection from the point of view of the paragraph.

Location:

trunk

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-11-18  Mario Sanchez Prada  <msanchez@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [Gtk]  atk_text_get_selection returns the wrong offsets after a link
+        https://bugs.webkit.org/show_bug.cgi?id=49514
+
+        Consider possible embedded objects to calculate startOffset.
+
+        So far we were using offsetInContainerNode() to calculate the
+        value of startOffset when checking the offsets for the current
+        selection, which was wrong because that wouldn't work ok if any
+        embedded object was present in the paragraph before the
+        selection. Thus, we need to consider this fact when calculating
+        the startOffset from the point of view of the object this function
+        is called on, in order to return the right and actual values.
+
+        * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
+        (getSelectionOffsetsForObject): Check range length from the first
+        position in the object the function is called on until the first
+        position of current selection, and use it as startOffset.
+
 2010-11-12  Stephen White  <senorblanco@chromium.org>
 

trunk/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp

@@ -1434 +1434 @@
         return;
 
-    // Early return if the selection doesn't affect the selected node
+    // Early return if the selection doesn't affect the selected node.
     if (!selectionBelongsToObject(coreObject, selection))
         return;
@@ -1440 +1440 @@
     // We need to find the exact start and end positions in the
     // selected node that intersects the selection, to later on get
-    // the right values for the effective start and end offsets
+    // the right values for the effective start and end offsets.
     ExceptionCode ec = 0;
     Position nodeRangeStart;
@@ -1450 +1450 @@
     // possible position is also in the selection, we must set
     // nodeRangeStart to that position, otherwise to the selection's
-    // start position (it would belong to the node anyway)
+    // start position (it would belong to the node anyway).
     Node* firstLeafNode = node->firstDescendant();
     if (selRange->isPointInRange(firstLeafNode, 0, ec))
@@ -1460 +1460 @@
     // possible position is also in the selection, we must set
     // nodeRangeEnd to that position, otherwise to the selection's
-    // end position (it would belong to the node anyway)
+    // end position (it would belong to the node anyway).
     Node* lastLeafNode = node->lastDescendant();
     if (selRange->isPointInRange(lastLeafNode, lastOffsetInNode(lastLeafNode), ec))
@@ -1467 +1467 @@
         nodeRangeEnd = selRange->endPosition();
 
-    // Set values for start and end offsets
+    // Calculate position of the selected range inside the object.
+    Position parentFirstPosition = firstPositionInNode(node);
+    RefPtr<Range> rangeInParent = Range::create(node->document(), parentFirstPosition, nodeRangeStart);
+
+    // Set values for start and end offsets.
+    startOffset = TextIterator::rangeLength(rangeInParent.get());
     RefPtr<Range> nodeRange = Range::create(node->document(), nodeRangeStart, nodeRangeEnd);
-    startOffset = nodeRangeStart.offsetInContainerNode();
     endOffset = startOffset + TextIterator::rangeLength(nodeRange.get());
 }

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2010-11-18  Mario Sanchez Prada  <msanchez@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [Gtk]  atk_text_get_selection returns the wrong offsets after a link
+        https://bugs.webkit.org/show_bug.cgi?id=49514
+
+        Updated test case to also chech this specific subcase.
+
+        We need to explicitly check the case of having a selection in a
+        paragraph after an embedded object (i.e. a link) to make sure the
+        right calculations are being done when the paragraph is composed
+        of more than just one text object, and the current selection is
+        made only in one of them.
+
+        * tests/testatk.c:
+        (testWebkitAtkTextSelections): Make sure that a selection after a
+        link in a paragraph is working ok when asking for the text
+        selection from the point of view of the paragraph.
+
 2010-11-17  Martin Robinson  <mrobinson@igalia.com>
 

trunk/WebKit/gtk/tests/testatk.c

@@ -775 +775 @@
     g_assert_cmpint(endOffset, ==, 4);
     g_assert_cmpstr(selectedText, ==, "a li");
+    g_free (selectedText);
+
+    /* Make a selection after the link and check selection for the whole paragraph. */
+    result = atk_text_set_selection(paragraph2, 0, 27, 37);
+    g_assert(result);
+    g_assert_cmpint(atk_text_get_n_selections(paragraph2), ==, 1);
+    selectedText = atk_text_get_selection(paragraph2, 0, &startOffset, &endOffset);
+    g_assert_cmpint(startOffset, ==, 27);
+    g_assert_cmpint(endOffset, ==, 37);
+    g_assert_cmpstr(selectedText, ==, "the middle");
     g_free (selectedText);