Changeset 77234 in webkit

Timestamp:

Feb 1, 2011 1:54:23 AM (13 years ago)

Author:

mario@webkit.org

Message:

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

Reviewed by Martin Robinson.

[GTK] character range extents is off when the end of a wrapped line is included
​https://bugs.webkit.org/show_bug.cgi?id=53323

Fixed wrong calculation getting the range extents.

• accessibility/gtk/AccessibilityObjectWrapperAtk.cpp: (webkit_accessible_text_get_range_extents): Removed '+1' since the requested interval shouldn't include the last character.

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

Reviewed by Martin Robinson.

[GTK] character range extents is off when the end of a wrapped line is included
​https://bugs.webkit.org/show_bug.cgi?id=53323

Update unit test to check the fix for this bug.

• tests/testatk.c: (testWebkitAtkGetExtents): Check that the extent for a full line are the same height than for a partial section of the same line.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp (modified) (1 diff)
• 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] character range extents is off when the end of a wrapped line is included
+        https://bugs.webkit.org/show_bug.cgi?id=53323
+
+        Fixed wrong calculation getting the range extents.
+
+        * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
+        (webkit_accessible_text_get_range_extents): Removed '+1' since the
+        requested interval shouldn't include the last character.
+
 2011-02-01  Mario Sanchez Prada  <msanchez@igalia.com>
 

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

@@ -1545 +1545 @@
 static void webkit_accessible_text_get_range_extents(AtkText* text, gint startOffset, gint endOffset, AtkCoordType coords, AtkTextRectangle* rect)
 {
-    IntRect extents = textExtents(text, startOffset, endOffset - startOffset + 1, coords);
+    IntRect extents = textExtents(text, startOffset, endOffset - startOffset, coords);
     rect->x = extents.x();
     rect->y = extents.y();

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2011-02-01  Mario Sanchez Prada  <msanchez@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] character range extents is off when the end of a wrapped line is included
+        https://bugs.webkit.org/show_bug.cgi?id=53323
+
+        Update unit test to check the fix for this bug.
+
+        * tests/testatk.c:
+        (testWebkitAtkGetExtents): Check that the extent for a full line
+        are the same height than for a partial section of the same line.
+
 2011-02-01  Mario Sanchez Prada  <msanchez@igalia.com>
 

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

@@ -1193 +1193 @@
     g_assert_cmpint(y, ==, mline_window.y + mline_window.height - height);
     g_assert_cmpint(height, <=, mline_window.height);
+
+    /* Check that extent for a full line are the same height than for
+       a partial section of the same line */
+    gint startOffset;
+    gint endOffset;
+    gchar* text = atk_text_get_text_at_offset(multilineText, 0, ATK_TEXT_BOUNDARY_LINE_START, &startOffset, &endOffset);
+    g_free(text);
+
+    AtkTextRectangle fline_window;
+    AtkTextRectangle afline_window;
+    atk_text_get_range_extents(multilineText, startOffset, endOffset, ATK_XY_WINDOW, &fline_window);
+    atk_text_get_range_extents(multilineText, startOffset, endOffset - 1, ATK_XY_WINDOW, &afline_window);
+    g_assert_cmpint(fline_window.x, ==, afline_window.x);
+    g_assert_cmpint(fline_window.y, ==, afline_window.y);
+    g_assert_cmpint(fline_window.height, ==, afline_window.height);
 
     g_object_unref(shortText1);