[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit c8803da8e3b1b9af17d4b93f988346a9ba90c79d
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 12 10:09:56 2010 +0000

    2010-01-12  Joanmarie Diggs  <joanmarie.diggs at gmail.com>
    
            Reviewed by Gustavo Noronha Silva.
    
            https://bugs.webkit.org/show_bug.cgi?id=30883
            [Gtk] Implement AtkText for HTML elements which contain text
    
            Tweak/correction: Eliminate a needless variable.
    
            * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
            (webkit_accessible_text_get_caret_offset):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53124 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1d8b560..7bc6ca0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-12  Joanmarie Diggs  <joanmarie.diggs at gmail.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30883
+        [Gtk] Implement AtkText for HTML elements which contain text
+
+        Tweak/correction: Eliminate a needless variable.
+
+        * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
+        (webkit_accessible_text_get_caret_offset):
+
 2010-01-12  Yury Semikhatsky  <yurys at chromium.org>
 
         Reviewed by Geoffrey Garen.
diff --git a/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp b/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
index 5118891..9b534e6 100644
--- a/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
+++ b/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
@@ -988,7 +988,7 @@ static gint webkit_accessible_text_get_caret_offset(AtkText* text)
 
     int offset;
     // Don't ignore links if the offset is being requested for a link.
-    AccessibilityObject* object = objectAndOffsetUnignored(focusedObject, offset, !coreObject->isLink());
+    objectAndOffsetUnignored(focusedObject, offset, !coreObject->isLink());
 
     // TODO: Verify this for RTL text.
     return offset;

-- 
WebKit Debian packaging