[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 ddb6d57056e24647117e39db353a794fafa7cfe8
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 4 09:59:46 2010 +0000

    2010-11-04  Chris Guillory  <chris.guillory at google.com>
    
            Reviewed by Chris Fleizach.
    
            Ignore static text children of text field controls in the accessibility tree.
            https://bugs.webkit.org/show_bug.cgi?id=48944
    
            * accessibility/AccessibilityRenderObject.cpp:
            (WebCore::AccessibilityRenderObject::accessibilityIsIgnored):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71317 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bf1439e..6ce8fb6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-04  Chris Guillory  <chris.guillory at google.com>
+
+        Reviewed by Chris Fleizach.
+
+        Ignore static text children of text field controls in the accessibility tree.
+        https://bugs.webkit.org/show_bug.cgi?id=48944
+
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::accessibilityIsIgnored):
+
 2010-11-04  Erik Arvidsson  <arv at chromium.org>
 
         Reviewed by Tony Chang.
diff --git a/WebCore/accessibility/AccessibilityRenderObject.cpp b/WebCore/accessibility/AccessibilityRenderObject.cpp
index efa2036..ef42272 100644
--- a/WebCore/accessibility/AccessibilityRenderObject.cpp
+++ b/WebCore/accessibility/AccessibilityRenderObject.cpp
@@ -1773,7 +1773,13 @@ bool AccessibilityRenderObject::accessibilityIsIgnored() const
         RenderText* renderText = toRenderText(m_renderer);
         if (m_renderer->isBR() || !renderText->firstTextBox())
             return true;
-        
+
+        // static text beneath TextControls is reported along with the text control text so it's ignored.
+        for (AccessibilityObject* parent = parentObject(); parent; parent = parent->parentObject()) { 
+            if (parent->roleValue() == TextFieldRole)
+                return true;
+        }
+
         // text elements that are just empty whitespace should not be returned
         return renderText->text()->containsOnlyWhitespace();
     }

-- 
WebKit Debian packaging