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

[kov at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 38fe0c6179f2c393b6f359be00118fef94392e1f
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 12 00:42:08 2010 +0000

    2010-01-11  Gustavo Noronha Silva  <gns at gnome.org>
    
            Reviewed by Eric Seidel.
    
            [GTK] Debug bots crashing in plugins/iframe-shims.html
            https://bugs.webkit.org/show_bug.cgi?id=33472
    
            Call computeOffsetInContainerNode() instead of
            offsetInContainerNode(), since we are not sure this is always
            parent-anchored.
    
            plugins/iframe-shims.html no longer ASSERTS
    
            * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
            (objectAndOffsetUnignored):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53111 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 13c95b2..1edc325 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-01-11  Gustavo Noronha Silva  <gns at gnome.org>
+
+        Reviewed by Eric Seidel.
+
+        [GTK] Debug bots crashing in plugins/iframe-shims.html
+        https://bugs.webkit.org/show_bug.cgi?id=33472
+
+        Call computeOffsetInContainerNode() instead of
+        offsetInContainerNode(), since we are not sure this is always
+        parent-anchored.
+
+        plugins/iframe-shims.html no longer ASSERTS
+
+        * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
+        (objectAndOffsetUnignored):
+
 2010-01-11  Simon Fraser  <simon.fraser at apple.com>
 
         Reviewed by Kevin Decker.
diff --git a/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp b/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
index 4cf353a..5118891 100644
--- a/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
+++ b/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
@@ -1746,7 +1746,7 @@ AtkObject* webkit_accessible_get_focused_element(WebKitAccessible* accessible)
 AccessibilityObject* objectAndOffsetUnignored(AccessibilityObject* coreObject, int& offset, bool ignoreLinks)
 {
     Node* endNode = static_cast<AccessibilityRenderObject*>(coreObject)->renderer()->node();
-    int endOffset = coreObject->selection().end().offsetInContainerNode();
+    int endOffset = coreObject->selection().end().computeOffsetInContainerNode();
 
     AccessibilityObject* realObject = coreObject;
     if (realObject->accessibilityIsIgnored())

-- 
WebKit Debian packaging