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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 3570add8b46fd4448388564cb7cfc213dfecfc1c
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 5 07:55:30 2010 +0000

    2010-08-05  Mario Sanchez Prada  <msanchez at igalia.com>
    
            Reviewed by Xan Lopez.
    
            [GTK] Extra check needed at AccessibilityObject::visiblePositionRangeForRange
            https://bugs.webkit.org/show_bug.cgi?id=43418
    
            Ensure the renderer is a RenderText before calling toRenderText()
    
            Also, simplified code a bit to avoid so many nested if's in that
            part of the code, while keeping the same logic.
    
            * accessibility/AccessibilityObject.cpp:
            (WebCore::AccessibilityObject::visiblePositionRangeForRange):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64721 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7af2785..bd5b1a1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-05  Mario Sanchez Prada  <msanchez at igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Extra check needed at AccessibilityObject::visiblePositionRangeForRange
+        https://bugs.webkit.org/show_bug.cgi?id=43418
+
+        Ensure the renderer is a RenderText before calling toRenderText()
+
+        Also, simplified code a bit to avoid so many nested if's in that
+        part of the code, while keeping the same logic.
+
+        * accessibility/AccessibilityObject.cpp:
+        (WebCore::AccessibilityObject::visiblePositionRangeForRange):
+
 2010-08-05  Kwang Yul Seo  <skyul at company100.net>
 
         Reviewed by Kent Tamura.
diff --git a/WebCore/accessibility/AccessibilityObject.cpp b/WebCore/accessibility/AccessibilityObject.cpp
index b0ae86b..30fba31 100644
--- a/WebCore/accessibility/AccessibilityObject.cpp
+++ b/WebCore/accessibility/AccessibilityObject.cpp
@@ -378,16 +378,15 @@ VisiblePositionRange AccessibilityObject::visiblePositionRangeForRange(const Pla
     // Gtk ATs need this for all text objects; not just text controls.
     if (!textLength) {
         Node* node = this->node();
-        if (node) {
-            RenderText* renderText = toRenderText(node->renderer());
-            if (renderText)
-                textLength = renderText->textLength();
-
-            // Get the text length from the elements under the
-            // accessibility object if not a RenderText object.
-            if (!textLength && allowsTextRanges())
-                textLength = textUnderElement().length();
+        RenderObject* renderer = node ? node->renderer() : 0;
+        if (renderer && renderer->isText()) {
+            RenderText* renderText = toRenderText(renderer);
+            textLength = renderText ? renderText->textLength() : 0;
         }
+        // Get the text length from the elements under the
+        // accessibility object if the value is still zero.
+        if (!textLength && allowsTextRanges())
+            textLength = textUnderElement().length();
     }
 #endif
     if (range.start + range.length > textLength)

-- 
WebKit Debian packaging