Changeset 156551 in webkit

Timestamp:

Sep 27, 2013 9:59:49 AM (11 years ago)

Author:

mario@webkit.org

Message:

[GTK] GTK does not expose heading level correctly. Was: accessibility/heading-level.html is failing
​https://bugs.webkit.org/show_bug.cgi?id=106924

Reviewed by Chris Fleizach.

Tools:

Consider headings levels as values to be returned in intValue()
both in DRT and WKTR, so we can share more tests with other ports.

• DumpRenderTree/atk/AccessibilityUIElementAtk.cpp:

(AccessibilityUIElement::intValue): Consider headings too.

• WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:

(WTR::AccessibilityUIElement::intValue): Ditto.

LayoutTests:

Removed accesibility/heading-level.html from failure expectations.

• platform/gtk/TestExpectations: Removed test now passing.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/TestExpectations (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-09-27  Mario Sanchez Prada  <mario.prada@samsung.com>
+
+        [GTK] GTK does not expose heading level correctly. Was: accessibility/heading-level.html is failing
+        https://bugs.webkit.org/show_bug.cgi?id=106924
+
+        Reviewed by Chris Fleizach.
+
+        Removed accesibility/heading-level.html from failure expectations.
+
+        * platform/gtk/TestExpectations: Removed test now passing.
+
 2013-09-27  Jer Noble  <jer.noble@apple.com>
 

trunk/LayoutTests/platform/gtk/TestExpectations

@@ -1225 +1225 @@
 webkit.org/b/106316 accessibility/render-counter-text.html [ Failure ]
 
-webkit.org/b/106924 accessibility/heading-level.html [ Failure ]
-
 webkit.org/b/103927 http/tests/w3c/webperf/submission/Intel/resource-timing/test_resource_timing_cross_origin_resource_request.html [ Failure ]
 webkit.org/b/103927 http/tests/w3c/webperf/submission/Intel/resource-timing/test_resource_timing_timing_allow_cross_origin_resource_request.html [ Failure ]

trunk/Tools/ChangeLog

@@ +1 @@
+2013-09-27  Mario Sanchez Prada  <mario.prada@samsung.com>
+
+        [GTK] GTK does not expose heading level correctly. Was: accessibility/heading-level.html is failing
+        https://bugs.webkit.org/show_bug.cgi?id=106924
+
+        Reviewed by Chris Fleizach.
+
+        Consider headings levels as values to be returned in intValue()
+        both in DRT and WKTR, so we can share more tests with other ports.
+
+        * DumpRenderTree/atk/AccessibilityUIElementAtk.cpp:
+        (AccessibilityUIElement::intValue): Consider headings too.
+        * WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:
+        (WTR::AccessibilityUIElement::intValue): Ditto.
+
 2013-09-26  Darin Adler  <darin@apple.com>
 

trunk/Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp

@@ -629 +629 @@
 double AccessibilityUIElement::intValue() const
 {
-    if (!ATK_IS_VALUE(m_element))
-        return 0;
-
-    GValue value = G_VALUE_INIT;
-    atk_value_get_current_value(ATK_VALUE(m_element), &value);
-    if (!G_VALUE_HOLDS_FLOAT(&value))
-        return 0;
-    return g_value_get_float(&value);
+    if (!ATK_IS_OBJECT(m_element))
+        return 0;
+
+    if (ATK_IS_VALUE(m_element)) {
+        GValue value = G_VALUE_INIT;
+        atk_value_get_current_value(ATK_VALUE(m_element), &value);
+        if (!G_VALUE_HOLDS_FLOAT(&value))
+            return 0;
+        return g_value_get_float(&value);
+    }
+
+    // Consider headings as an special case when returning the "int value" of
+    // an AccessibilityUIElement, so we can reuse some tests to check the level
+    // both for HTML headings and objects with the aria-level attribute.
+    if (atk_object_get_role(ATK_OBJECT(m_element)) == ATK_ROLE_HEADING) {
+        String headingLevel = getAttributeSetValueForId(ATK_OBJECT(m_element), "level");
+        bool ok;
+        double headingLevelValue = headingLevel.toDouble(&ok);
+        if (ok)
+            return headingLevelValue;
+    }
+
+    return 0;
 }
 

trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp

@@ -793 +793 @@
 double AccessibilityUIElement::intValue() const
 {
-    if (!ATK_IS_VALUE(m_element.get()))
-        return 0;
-
-    GValue value = G_VALUE_INIT;
-    atk_value_get_current_value(ATK_VALUE(m_element.get()), &value);
-    if (!G_VALUE_HOLDS_FLOAT(&value))
-        return 0;
-
-    return g_value_get_float(&value);
+    if (!ATK_IS_OBJECT(m_element.get()))
+        return 0;
+
+    if (ATK_IS_VALUE(m_element.get())) {
+        GValue value = G_VALUE_INIT;
+        atk_value_get_current_value(ATK_VALUE(m_element.get()), &value);
+        if (!G_VALUE_HOLDS_FLOAT(&value))
+            return 0;
+        return g_value_get_float(&value);
+    }
+
+    // Consider headings as an special case when returning the "int value" of
+    // an AccessibilityUIElement, so we can reuse some tests to check the level
+    // both for HTML headings and objects with the aria-level attribute.
+    if (atk_object_get_role(ATK_OBJECT(m_element.get())) == ATK_ROLE_HEADING) {
+        String headingLevel = getAttributeSetValueForId(ATK_OBJECT(m_element.get()), "level");
+        bool ok;
+        double headingLevelValue = headingLevel.toDouble(&ok);
+        if (ok)
+            return headingLevelValue;
+    }
+
+    return 0;
 }