[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[mrobinson at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit bc2c5f2c09bb01628a7e032681a25fe8409bad66
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 29 17:58:13 2010 +0000

    2010-09-29  Martin Robinson  <mrobinson at igalia.com>
    
            Reviewed by Chris Fleizach.
    
            [GTK] editing/selection/selection-modify-crash.html crashes when run in Xvfb
            https://bugs.webkit.org/show_bug.cgi?id=46822
    
            * platform/gtk/Skipped: Unskip a test which is no longer crashing.
    2010-09-29  Martin Robinson  <mrobinson at igalia.com>
    
            Reviewed by Chris Fleizach.
    
            [GTK] editing/selection/selection-modify-crash.html crashes when run in Xvfb
            https://bugs.webkit.org/show_bug.cgi?id=46822
    
            When parentObjectUnignored returns null in objectAndOffsetUnignored consider that
            a failure case. Handle this failure appropriately at all call sites.
    
            * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
            (webkit_accessible_text_get_caret_offset): Handle the failure of objectAndOffsetUnignored.
            (objectAndOffsetUnignored): Always check the return value of parentObjectUnignored and
            return 0 to indicate failure when that happens.
            * editing/gtk/SelectionControllerGtk.cpp:
            (WebCore::SelectionController::notifyAccessibilityForSelectionChange): Handle the failure
            case of objectAndOffsetUnignored.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68665 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 242a828..f81e1ac 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-29  Martin Robinson  <mrobinson at igalia.com>
+
+        Reviewed by Chris Fleizach.
+
+        [GTK] editing/selection/selection-modify-crash.html crashes when run in Xvfb
+        https://bugs.webkit.org/show_bug.cgi?id=46822
+
+        * platform/gtk/Skipped: Unskip a test which is no longer crashing.
+
 2010-09-29  Anantanarayanan G Iyengar  <ananta at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 0f74f29..7a2e2c0 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -1001,7 +1001,6 @@ editing/selection/select-from-textfield-outwards.html
 editing/selection/select-missing-image.html
 editing/selection/selection-3748164-fix.html
 editing/selection/selection-background.html
-editing/selection/selection-modify-crash.html
 editing/selection/table-caret-1.html
 editing/selection/table-caret-2.html
 editing/selection/table-caret-3.html
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 41b5bb5..aedc75e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2010-09-29  Martin Robinson  <mrobinson at igalia.com>
+
+        Reviewed by Chris Fleizach.
+
+        [GTK] editing/selection/selection-modify-crash.html crashes when run in Xvfb
+        https://bugs.webkit.org/show_bug.cgi?id=46822
+
+        When parentObjectUnignored returns null in objectAndOffsetUnignored consider that
+        a failure case. Handle this failure appropriately at all call sites.
+
+        * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
+        (webkit_accessible_text_get_caret_offset): Handle the failure of objectAndOffsetUnignored.
+        (objectAndOffsetUnignored): Always check the return value of parentObjectUnignored and
+        return 0 to indicate failure when that happens.
+        * editing/gtk/SelectionControllerGtk.cpp:
+        (WebCore::SelectionController::notifyAccessibilityForSelectionChange): Handle the failure
+        case of objectAndOffsetUnignored.
+
 2010-09-29  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r68657.
diff --git a/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp b/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
index 3575afe..c9d13cc 100644
--- a/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
+++ b/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
@@ -1032,7 +1032,8 @@ 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.
-    objectAndOffsetUnignored(focusedObject, offset, !coreObject->isLink());
+    if (!objectAndOffsetUnignored(focusedObject, offset, !coreObject->isLink()))
+        return 0;
 
     // TODO: Verify this for RTL text.
     return offset;
@@ -2179,9 +2180,13 @@ AccessibilityObject* objectAndOffsetUnignored(AccessibilityObject* coreObject, i
     AccessibilityObject* realObject = coreObject;
     if (realObject->accessibilityIsIgnored())
         realObject = realObject->parentObjectUnignored();
+    if (!realObject)
+        return 0;
 
     if (ignoreLinks && realObject->isLink())
         realObject = realObject->parentObjectUnignored();
+    if (!realObject)
+        return 0;
 
     Node* node = static_cast<AccessibilityRenderObject*>(realObject)->renderer()->node();
     if (node) {
diff --git a/WebCore/editing/gtk/SelectionControllerGtk.cpp b/WebCore/editing/gtk/SelectionControllerGtk.cpp
index 9d52c1a..5626110 100644
--- a/WebCore/editing/gtk/SelectionControllerGtk.cpp
+++ b/WebCore/editing/gtk/SelectionControllerGtk.cpp
@@ -41,6 +41,9 @@ void SelectionController::notifyAccessibilityForSelectionChange()
         int offset;
         // Always report the events w.r.t. the non-linked unignored parent. (i.e. ignoreLinks == true)
         AccessibilityObject* object = objectAndOffsetUnignored(accessibilityObject, offset, true);
+        if (!object)
+            return;
+
         AtkObject* wrapper = object->wrapper();
         if (ATK_IS_TEXT(wrapper)) {
             g_signal_emit_by_name(wrapper, "text-caret-moved", offset);

-- 
WebKit Debian packaging