Diff
Modified: trunk/LayoutTests/ChangeLog (104590 => 104591)
--- trunk/LayoutTests/ChangeLog 2012-01-10 17:41:18 UTC (rev 104590)
+++ trunk/LayoutTests/ChangeLog 2012-01-10 17:44:21 UTC (rev 104591)
@@ -1,5 +1,18 @@
2012-01-10 Mario Sanchez Prada <[email protected]>
+ AX: support helpText() in DumpRenderTree
+ https://bugs.webkit.org/show_bug.cgi?id=40193
+
+ Reviewed by Chris Fleizach.
+
+ Unskip tests now passing.
+
+ * accessibility/aria-describedby-on-input-expected.txt: Moved from
+ LayoutTests/platform/mac/accessibility.
+ * platform/gtk/Skipped: Unskip tests.
+
+2012-01-10 Mario Sanchez Prada <[email protected]>
+
[GTK] platform/gtk/accessibility/unknown-roles-not-exposed.html is flaky
https://bugs.webkit.org/show_bug.cgi?id=74493
Copied: trunk/LayoutTests/accessibility/aria-describedby-on-input-expected.txt (from rev 104590, trunk/LayoutTests/platform/mac/accessibility/aria-describedby-on-input-expected.txt) (0 => 104591)
--- trunk/LayoutTests/accessibility/aria-describedby-on-input-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/aria-describedby-on-input-expected.txt 2012-01-10 17:44:21 UTC (rev 104591)
@@ -0,0 +1,4 @@
+This computer will self-destruct in minutes.
+Allows you to specify the number of minutes after which the computer will self-destruct.
+
+The accessibility description is "AXHelp: Allows you to specify the number of minutes after which the computer will self-destruct."
Modified: trunk/LayoutTests/platform/gtk/Skipped (104590 => 104591)
--- trunk/LayoutTests/platform/gtk/Skipped 2012-01-10 17:41:18 UTC (rev 104590)
+++ trunk/LayoutTests/platform/gtk/Skipped 2012-01-10 17:44:21 UTC (rev 104591)
@@ -388,7 +388,6 @@
# TESTS FAILING
###############################################################################
accessibility/aria-checkbox-sends-notification.html
-accessibility/aria-help.html
accessibility/aria-hidden.html
accessibility/aria-hidden-with-elements.html
accessibility/aria-labelledby-on-input.html
@@ -1124,9 +1123,6 @@
platform/gtk/accessibility/object-attributes.html
platform/gtk/accessibility/title-and-alt.html
-# [GTK] https://bugs.webkit.org/show_bug.cgi?id=40193
-accessibility/aria-describedby-on-input.html
-
# fails on 32-bits debug bot
# https://bugs.webkit.org/show_bug.cgi?id=50389
media/video-volume.html
Deleted: trunk/LayoutTests/platform/mac/accessibility/aria-describedby-on-input-expected.txt (104590 => 104591)
--- trunk/LayoutTests/platform/mac/accessibility/aria-describedby-on-input-expected.txt 2012-01-10 17:41:18 UTC (rev 104590)
+++ trunk/LayoutTests/platform/mac/accessibility/aria-describedby-on-input-expected.txt 2012-01-10 17:44:21 UTC (rev 104591)
@@ -1,4 +0,0 @@
-This computer will self-destruct in minutes.
-Allows you to specify the number of minutes after which the computer will self-destruct.
-
-The accessibility description is "AXHelp: Allows you to specify the number of minutes after which the computer will self-destruct."
Modified: trunk/Source/WebKit/gtk/ChangeLog (104590 => 104591)
--- trunk/Source/WebKit/gtk/ChangeLog 2012-01-10 17:41:18 UTC (rev 104590)
+++ trunk/Source/WebKit/gtk/ChangeLog 2012-01-10 17:44:21 UTC (rev 104591)
@@ -1,3 +1,18 @@
+2012-01-10 Mario Sanchez Prada <[email protected]>
+
+ AX: support helpText() in DumpRenderTree
+ https://bugs.webkit.org/show_bug.cgi?id=40193
+
+ Reviewed by Chris Fleizach.
+
+ Add support for retrieving WebCore's AccessibilityObject's
+ helpText from the GTK DumpRenderTree.
+
+ * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
+ (DumpRenderTreeSupportGtk::accessibilityHelpText): Returns result
+ of calling to helpText() over the core accessibility object's.
+ * WebCoreSupport/DumpRenderTreeSupportGtk.h:
+
2012-01-09 Mario Sanchez Prada <[email protected]>
[Gtk] Regression: text-inserted events lack text inserted and current line
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp (104590 => 104591)
--- trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp 2012-01-10 17:41:18 UTC (rev 104590)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp 2012-01-10 17:44:21 UTC (rev 104591)
@@ -24,6 +24,7 @@
#include "APICast.h"
#include "AXObjectCache.h"
+#include "AccessibilityObject.h"
#include "AccessibilityObjectWrapperAtk.h"
#include "AnimationController.h"
#include "DOMWrapperWorld.h"
@@ -780,6 +781,18 @@
modifyAccessibilityValue(axObject, false);
}
+CString DumpRenderTreeSupportGtk::accessibilityHelpText(AtkObject* axObject)
+{
+ if (!axObject || !WEBKIT_IS_ACCESSIBLE(axObject))
+ return CString();
+
+ AccessibilityObject* coreObject = webkit_accessible_get_accessibility_object(WEBKIT_ACCESSIBLE(axObject));
+ if (!coreObject)
+ return CString();
+
+ return coreObject->helpText().utf8();
+}
+
void DumpRenderTreeSupportGtk::setAutofilled(JSContextRef context, JSValueRef nodeObject, bool autofilled)
{
JSC::ExecState* exec = toJS(context);
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h (104590 => 104591)
--- trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h 2012-01-10 17:41:18 UTC (rev 104590)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h 2012-01-10 17:44:21 UTC (rev 104591)
@@ -101,6 +101,7 @@
// Accessibility
static void incrementAccessibilityValue(AtkObject*);
static void decrementAccessibilityValue(AtkObject*);
+ static WTF::CString accessibilityHelpText(AtkObject*);
// TextInputController
static void setComposition(WebKitWebView*, const char*, int start, int length);
Modified: trunk/Tools/ChangeLog (104590 => 104591)
--- trunk/Tools/ChangeLog 2012-01-10 17:41:18 UTC (rev 104590)
+++ trunk/Tools/ChangeLog 2012-01-10 17:44:21 UTC (rev 104591)
@@ -1,3 +1,13 @@
+2012-01-10 Mario Sanchez Prada <[email protected]>
+
+ AX: support helpText() in DumpRenderTree
+ https://bugs.webkit.org/show_bug.cgi?id=40193
+
+ Reviewed by Chris Fleizach.
+
+ * DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp:
+ (AccessibilityUIElement::helpText): Implemented.
+
2012-01-10 Sheriff Bot <[email protected]>
Unreviewed, rolling out r104572.
Modified: trunk/Tools/DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp (104590 => 104591)
--- trunk/Tools/DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp 2012-01-10 17:41:18 UTC (rev 104590)
+++ trunk/Tools/DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp 2012-01-10 17:44:21 UTC (rev 104591)
@@ -259,7 +259,14 @@
JSStringRef AccessibilityUIElement::helpText() const
{
- return 0;
+ if (!m_element)
+ return JSStringCreateWithCharacters(0, 0);
+
+ ASSERT(ATK_IS_OBJECT(m_element));
+
+ CString helpText = DumpRenderTreeSupportGtk::accessibilityHelpText(ATK_OBJECT(m_element));
+ GOwnPtr<gchar> axHelpText(g_strdup_printf("AXHelp: %s", helpText.data()));
+ return JSStringCreateWithUTF8CString(axHelpText.get());
}
double AccessibilityUIElement::x()
