Changeset 77233 in webkit

Timestamp:

Feb 1, 2011 1:49:25 AM (13 years ago)

Author:

mario@webkit.org

Message:

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

Reviewed by Martin Robinson.

[GTK] Caret Offset is one off at the end of wrapped lines
​https://bugs.webkit.org/show_bug.cgi?id=53300

Consider linebreaks as special cases.

• accessibility/gtk/AccessibilityObjectWrapperAtk.cpp: (objectAndOffsetUnignored): In order to avoid getting wrong values when around linebreaks, we need to workaround this by explicitly avoiding those '\n' text nodes from affecting the result of calling to TextIterator:rangeLength().

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

Reviewed by Martin Robinson.

[GTK] Caret Offset is one off at the end of wrapped lines
​https://bugs.webkit.org/show_bug.cgi?id=53300

Update unit test to check the fix for this bug.

• tests/testatk.c: (testWebkitAtkCaretOffsetsAndExtranousWhiteSpaces): Set and get the caret offset at the edge of the line.

Location:

trunk/Source

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-01  Mario Sanchez Prada  <msanchez@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Caret Offset is one off at the end of wrapped lines
+        https://bugs.webkit.org/show_bug.cgi?id=53300
+
+        Consider linebreaks as special cases.
+
+        * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
+        (objectAndOffsetUnignored): In order to avoid getting wrong values
+        when around linebreaks, we need to workaround this by explicitly
+        avoiding those '\n' text nodes from affecting the result of
+        calling to TextIterator:rangeLength().
+
 2011-02-01  Roland Steiner  <rolandsteiner@chromium.org>
 

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

@@ -64 +64 @@
 #include "TextIterator.h"
 #include "WebKitAccessibleHyperlink.h"
+#include "visible_units.h"
 
 #include <atk/atk.h>
@@ -2490 +2491 @@
     Node* node = realObject->node();
     if (node) {
-        RefPtr<Range> range = Range::create(node->document(), firstPositionInNode(node), realObject->selection().end());
-        offset = TextIterator::rangeLength(range.get());
+        VisiblePosition startPosition = VisiblePosition(node, 0, DOWNSTREAM);
+        VisiblePosition endPosition = realObject->selection().visibleEnd();
+
+        if (startPosition == endPosition)
+            offset = 0;
+        else if (!isStartOfLine(endPosition)) {
+            RefPtr<Range> range = makeRange(startPosition, endPosition.previous());
+            offset = TextIterator::rangeLength(range.get()) + 1;
+        } else {
+            RefPtr<Range> range = makeRange(startPosition, endPosition);
+            offset = TextIterator::rangeLength(range.get());
+        }
+
     }
 

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2011-02-01  Mario Sanchez Prada  <msanchez@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Caret Offset is one off at the end of wrapped lines
+        https://bugs.webkit.org/show_bug.cgi?id=53300
+
+        Update unit test to check the fix for this bug.
+
+        * tests/testatk.c:
+        (testWebkitAtkCaretOffsetsAndExtranousWhiteSpaces): Set and get
+        the caret offset at the edge of the line.
+
 2011-01-31  Mario Sanchez Prada  <msanchez@igalia.com>
 

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

@@ -368 +368 @@
     gint caretOffset = atk_text_get_caret_offset(textObject);
     g_assert_cmpint(caretOffset, ==, characterCount - 1);
+
+    result = atk_text_set_caret_offset(textObject, characterCount);
+    g_assert_cmpint(result, ==, TRUE);
+
+    caretOffset = atk_text_get_caret_offset(textObject);
+    g_assert_cmpint(caretOffset, ==, characterCount);
 
     g_object_unref(webView);