Changeset 83747 in webkit

Timestamp:

Apr 13, 2011 9:33:02 AM (13 years ago)

Author:

mario@webkit.org

Message:

2011-04-13 Mario Sanchez Prada <​msanchez@igalia.com>

Reviewed by Martin Robinson.

[GTK] Consider editable and non editable nodes when calculating selection offsets
​https://bugs.webkit.org/show_bug.cgi?id=58431

Use firstPositionInOrBeforeNode() and lastPositionInOrAfterNode().

This is needed to ensure that getSelectionOffsetsForObject() works
well when non editable nodes are present in the selection, since
firstPositionInNode() and lastPositionInNode() don't work in those
cases (they assume the node is editable).

• accessibility/gtk/AccessibilityObjectWrapperAtk.cpp: (getSelectionOffsetsForObject): Updated calls.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/gtk/AccessibilityObjectWrapperAtk.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-13  Mario Sanchez Prada  <msanchez@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Consider editable and non editable nodes when calculating selection offsets
+        https://bugs.webkit.org/show_bug.cgi?id=58431
+
+        Use firstPositionInOrBeforeNode() and lastPositionInOrAfterNode().
+
+        This is needed to ensure that getSelectionOffsetsForObject() works
+        well when non editable nodes are present in the selection, since
+        firstPositionInNode() and lastPositionInNode() don't work in those
+        cases (they assume the node is editable).
+
+        * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
+        (getSelectionOffsetsForObject): Updated calls.
+
 2011-04-13  Mario Sanchez Prada  <msanchez@igalia.com>
 

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

@@ -64 +64 @@
 #include "TextIterator.h"
 #include "WebKitAccessibleHyperlink.h"
+#include "htmlediting.h"
 #include "visible_units.h"
 
@@ -1621 +1622 @@
     Node* firstLeafNode = node->firstDescendant();
     if (selRange->isPointInRange(firstLeafNode, 0, ec))
-        nodeRangeStart = firstPositionInNode(firstLeafNode);
+        nodeRangeStart = firstPositionInOrBeforeNode(firstLeafNode);
     else
         nodeRangeStart = selRange->startPosition();
@@ -1631 +1632 @@
     Node* lastLeafNode = node->lastDescendant();
     if (selRange->isPointInRange(lastLeafNode, lastOffsetInNode(lastLeafNode), ec))
-        nodeRangeEnd = lastPositionInNode(lastLeafNode);
+        nodeRangeEnd = lastPositionInOrAfterNode(lastLeafNode);
     else
         nodeRangeEnd = selRange->endPosition();
 
     // Calculate position of the selected range inside the object.
-    Position parentFirstPosition = firstPositionInNode(node);
+    Position parentFirstPosition = firstPositionInOrBeforeNode(node);
     RefPtr<Range> rangeInParent = Range::create(node->document(), parentFirstPosition, nodeRangeStart);