[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

mario at webkit.org mario at webkit.org
Mon Feb 21 00:30:25 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit b3feee54ca72f0a8625349e098820a46156c14b9
Author: mario at webkit.org <mario at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 1 09:58:30 2011 +0000

    2011-02-01  Mario Sanchez Prada  <msanchez at igalia.com>
    
            Reviewed by Martin Robinson.
    
            [Gtk] atk_text_set_caret_offset fails for list items
            https://bugs.webkit.org/show_bug.cgi?id=53388
    
            Allow using text ranges across list items.
    
            * accessibility/gtk/AccessibilityObjectAtk.cpp:
            (WebCore::AccessibilityObject::allowsTextRanges): Add list items
            to the list of accessibility objects supporting text ranges.
    2011-02-01  Mario Sanchez Prada  <msanchez at igalia.com>
    
            Reviewed by Martin Robinson.
    
            [Gtk] atk_text_set_caret_offset fails for list items
            https://bugs.webkit.org/show_bug.cgi?id=53388
    
            Update unit test to check the fix for this bug.
    
            * tests/testatk.c:
            (testWebkitAtkCaretOffsets): Ensure setting the caret in a list
            item through the AtkText interface is possible.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77235 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 6a10852..4f6af61 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -2,6 +2,19 @@
 
         Reviewed by Martin Robinson.
 
+        [Gtk] atk_text_set_caret_offset fails for list items
+        https://bugs.webkit.org/show_bug.cgi?id=53388
+
+        Allow using text ranges across list items.
+
+        * accessibility/gtk/AccessibilityObjectAtk.cpp:
+        (WebCore::AccessibilityObject::allowsTextRanges): Add list items
+        to the list of accessibility objects supporting text ranges.
+
+2011-02-01  Mario Sanchez Prada  <msanchez at 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
 
diff --git a/Source/WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp b/Source/WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp
index 9772b43..c8c1951 100644
--- a/Source/WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp
+++ b/Source/WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp
@@ -105,7 +105,7 @@ void AccessibilityObject::setWrapper(AccessibilityObjectWrapper* wrapper)
 
 bool AccessibilityObject::allowsTextRanges() const
 {
-    return isTextControl() || isWebArea() || isGroup() || isLink() || isHeading();
+    return isTextControl() || isWebArea() || isGroup() || isLink() || isHeading() || isListItem();
 }
 
 unsigned AccessibilityObject::getLengthForTextRange() const
diff --git a/Source/WebKit/gtk/ChangeLog b/Source/WebKit/gtk/ChangeLog
index 95f48ae..0e5debc 100644
--- a/Source/WebKit/gtk/ChangeLog
+++ b/Source/WebKit/gtk/ChangeLog
@@ -2,6 +2,19 @@
 
         Reviewed by Martin Robinson.
 
+        [Gtk] atk_text_set_caret_offset fails for list items
+        https://bugs.webkit.org/show_bug.cgi?id=53388
+
+        Update unit test to check the fix for this bug.
+
+        * tests/testatk.c:
+        (testWebkitAtkCaretOffsets): Ensure setting the caret in a list
+        item through the AtkText interface is possible.
+
+2011-02-01  Mario Sanchez Prada  <msanchez at 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
 
diff --git a/Source/WebKit/gtk/tests/testatk.c b/Source/WebKit/gtk/tests/testatk.c
index b823283..2e05aa2 100644
--- a/Source/WebKit/gtk/tests/testatk.c
+++ b/Source/WebKit/gtk/tests/testatk.c
@@ -292,9 +292,13 @@ static void testWebkitAtkCaretOffsets()
     result = atk_text_set_caret_offset(ATK_TEXT(listItem), 1);
     g_assert_cmpint(result, ==, FALSE);
 
-    /* TODO: Check here that it's possible to set the caret in the
-       middle of the text for a list item when fixing bug 53388.
-       https://bugs.webkit.org/show_bug.cgi?id=53388 */
+    /* It should be possible to place the caret inside an item's text. */
+    result = atk_text_set_caret_offset(ATK_TEXT(listItem), 5);
+    g_assert_cmpint(result, ==, TRUE);
+
+    /* Uncomment the following two lines when fixing bug 53436. */
+    /* offset = atk_text_get_caret_offset(ATK_TEXT(listItem)); */
+    /* g_assert_cmpint(offset, ==, 5); */
 
     AtkObject* panel = atk_object_ref_accessible_child(object, 3);
     g_assert(ATK_IS_OBJECT(panel));

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list