[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 ee60124ef931ca2ed30200aef827ad34eecba1bb
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 4 18:29:10 2010 +0000

    2010-08-04  Mario Sanchez Prada  <msanchez at igalia.com>
    
            Reviewed by Jeremy Orlow.
    
            [Gtk] Make sure DRT return the right AXTitle for controls
            https://bugs.webkit.org/show_bug.cgi?id=39997
    
            Added expected results file to the GTK port and removed the new
            test from the Skipped file.
    
            * platform/gtk/Skipped:
            * platform/gtk/accessibility/aria-checkbox-text-expected.txt: Copied from LayoutTests/platform/mac/accessibility/aria-checkbox-text-expected.txt.
    2010-08-04  Mario Sanchez Prada  <msanchez at igalia.com>
    
            Reviewed by Jeremy Orlow.
    
            [Gtk] Make sure DRT return the right AXTitle for controls
            https://bugs.webkit.org/show_bug.cgi?id=39997
    
            Fallback to the text under the given element as its name in case
            it's a control element and has no associated label for it.
    
            * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
            (webkit_accessible_get_name):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64659 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 14bf926..6e21182 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-04  Mario Sanchez Prada  <msanchez at igalia.com>
+
+        Reviewed by Jeremy Orlow.
+
+        [Gtk] Make sure DRT return the right AXTitle for controls
+        https://bugs.webkit.org/show_bug.cgi?id=39997
+
+        Added expected results file to the GTK port and removed the new
+        test from the Skipped file.
+
+        * platform/gtk/Skipped:
+        * platform/gtk/accessibility/aria-checkbox-text-expected.txt: Copied from LayoutTests/platform/mac/accessibility/aria-checkbox-text-expected.txt.
+
 2010-08-04  Abhishek Arya  <inferno at chromium.org>
 
         Unreviewed. QT expectation fix.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index dadb38b..7ea1708 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -56,7 +56,6 @@ http/tests/incremental/split-hex-entities.pl
 # Tests in accessibility/ directory
 # An implementation of accessibilityController is required.
 #   Tests failing
-accessibility/aria-checkbox-text.html
 accessibility/aria-combobox.html
 accessibility/aria-disabled.html
 accessibility/aria-help.html
diff --git a/LayoutTests/platform/mac/accessibility/aria-checkbox-text-expected.txt b/LayoutTests/platform/gtk/accessibility/aria-checkbox-text-expected.txt
similarity index 100%
copy from LayoutTests/platform/mac/accessibility/aria-checkbox-text-expected.txt
copy to LayoutTests/platform/gtk/accessibility/aria-checkbox-text-expected.txt
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d5a54f3..89e80b9 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-04  Mario Sanchez Prada  <msanchez at igalia.com>
+
+        Reviewed by Jeremy Orlow.
+
+        [Gtk] Make sure DRT return the right AXTitle for controls
+        https://bugs.webkit.org/show_bug.cgi?id=39997
+
+        Fallback to the text under the given element as its name in case
+        it's a control element and has no associated label for it.
+
+        * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
+        (webkit_accessible_get_name):
+
 2010-08-02  Kenneth Russell  <kbr at google.com>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp b/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
index 716188a..fd5d6bb 100644
--- a/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
+++ b/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
@@ -160,6 +160,11 @@ static const gchar* webkit_accessible_get_name(AtkObject* object)
             if (ATK_IS_TEXT(atkObject))
                 return webkit_accessible_text_get_text(ATK_TEXT(atkObject), 0, -1);
         }
+
+        // Try text under the node
+        String textUnder = renderObject->textUnderElement();
+        if (textUnder.length())
+            return returnString(textUnder);
     }
 
     if (renderObject->isImage() || renderObject->isInputImage()) {

-- 
WebKit Debian packaging