Diff
Modified: trunk/LayoutTests/ChangeLog (156202 => 156203)
--- trunk/LayoutTests/ChangeLog 2013-09-20 21:54:42 UTC (rev 156202)
+++ trunk/LayoutTests/ChangeLog 2013-09-20 21:56:10 UTC (rev 156203)
@@ -1,3 +1,24 @@
+2013-09-20 Mario Sanchez Prada <[email protected]>
+
+ [ATK] Do not expose aria-help in ATK based platforms
+ https://bugs.webkit.org/show_bug.cgi?id=121675
+
+ Reviewed by Chris Fleizach.
+
+ Moved test based in helpText() into the Mac directory, and update
+ expectations for platforms as needed.
+
+ * platform/mac/accessibility/aria-help-expected.txt: Renamed from LayoutTests/accessibility/aria-help-expected.txt.
+ * platform/mac/accessibility/aria-help.html: Renamed from LayoutTests/accessibility/aria-help.html.
+ * platform/gtk-wk2/TestExpectations: Removed failure expectation
+ for aria-help, now moved to Mac, and for aria-describedby-on-input,
+ which is now moved to the generic TestExpectations file for GTK.
+ * platform/gtk/TestExpectations: Added aria-describedby-on-input,
+ linking it to the newly filed bug 121684.
+ * platform/gtk-wk2/TestExpectations: Removed failure expectation.
+ * platform/win/TestExpectations: Removed failure expectation.
+ * platform/wincairo/TestExpectations: Ditto.
+
2013-09-20 Bem Jones-Bey <[email protected]>
Move tests to new import location
Deleted: trunk/LayoutTests/accessibility/aria-help-expected.txt (156202 => 156203)
--- trunk/LayoutTests/accessibility/aria-help-expected.txt 2013-09-20 21:54:42 UTC (rev 156202)
+++ trunk/LayoutTests/accessibility/aria-help-expected.txt 2013-09-20 21:56:10 UTC (rev 156203)
@@ -1,11 +0,0 @@
-button
-This tests that aria-help attribute works as expected.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS button.helpText is 'AXHelp: click here'
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/accessibility/aria-help.html (156202 => 156203)
--- trunk/LayoutTests/accessibility/aria-help.html 2013-09-20 21:54:42 UTC (rev 156202)
+++ trunk/LayoutTests/accessibility/aria-help.html 2013-09-20 21:56:10 UTC (rev 156203)
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<script src=""
-</head>
-<body id="body">
-
-<div id="button" tabindex=0 role="button" aria-label="title" aria-help="click here">
-button
-</div>
-
-<p id="description"></p>
-<div id="console"></div>
-
-<script>
-
- description("This tests that aria-help attribute works as expected.");
-
- if (window.accessibilityController) {
-
- document.getElementById("button").focus();
- var button = accessibilityController.focusedElement;
- shouldBe("button.helpText", "'AXHelp: click here'");
- }
-
-</script>
-
-<script src=""
-</body>
-</html>
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (156202 => 156203)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2013-09-20 21:54:42 UTC (rev 156202)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2013-09-20 21:56:10 UTC (rev 156203)
@@ -852,6 +852,7 @@
webkit.org/b/79757 fast/selectors/selection-window-inactive.html [ ImageOnlyFailure ]
+webkit.org/b/121684 accessibility/aria-describedby-on-input.html [ Failure ]
webkit.org/b/98355 accessibility/aria-link-supports-press.html [ Failure ]
webkit.org/b/98357 accessibility/aria-readonly.html [ Failure ]
webkit.org/b/98359 accessibility/aria-text-role.html [ Failure ]
Modified: trunk/LayoutTests/platform/gtk-wk2/TestExpectations (156202 => 156203)
--- trunk/LayoutTests/platform/gtk-wk2/TestExpectations 2013-09-20 21:54:42 UTC (rev 156202)
+++ trunk/LayoutTests/platform/gtk-wk2/TestExpectations 2013-09-20 21:56:10 UTC (rev 156203)
@@ -334,8 +334,6 @@
# accessibility/ failures
webkit.org/b/106334 accessibility/accessibility-node-memory-management.html [ Failure ]
webkit.org/b/106335 accessibility/accessibility-node-reparent.html [ Failure ]
-webkit.org/b/106336 accessibility/aria-describedby-on-input.html [ Failure ]
-webkit.org/b/106337 accessibility/aria-help.html [ Failure ]
webkit.org/b/106338 accessibility/aria-hidden-updates-alldescendants.html [ Failure ]
webkit.org/b/106340 accessibility/img-fallsback-to-title.html [ Failure ]
webkit.org/b/106343 accessibility/loading-iframe-sends-notification.html [ Failure ]
Copied: trunk/LayoutTests/platform/mac/accessibility/aria-help-expected.txt (from rev 156201, trunk/LayoutTests/accessibility/aria-help-expected.txt) (0 => 156203)
--- trunk/LayoutTests/platform/mac/accessibility/aria-help-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/accessibility/aria-help-expected.txt 2013-09-20 21:56:10 UTC (rev 156203)
@@ -0,0 +1,11 @@
+button
+This tests that aria-help attribute works as expected.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS button.helpText is 'AXHelp: click here'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Copied: trunk/LayoutTests/platform/mac/accessibility/aria-help.html (from rev 156201, trunk/LayoutTests/accessibility/aria-help.html) (0 => 156203)
--- trunk/LayoutTests/platform/mac/accessibility/aria-help.html (rev 0)
+++ trunk/LayoutTests/platform/mac/accessibility/aria-help.html 2013-09-20 21:56:10 UTC (rev 156203)
@@ -0,0 +1,30 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src=""
+</head>
+<body id="body">
+
+<div id="button" tabindex=0 role="button" aria-label="title" aria-help="click here">
+button
+</div>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This tests that aria-help attribute works as expected.");
+
+ if (window.accessibilityController) {
+
+ document.getElementById("button").focus();
+ var button = accessibilityController.focusedElement;
+ shouldBe("button.helpText", "'AXHelp: click here'");
+ }
+
+</script>
+
+<script src=""
+</body>
+</html>
Modified: trunk/LayoutTests/platform/win/TestExpectations (156202 => 156203)
--- trunk/LayoutTests/platform/win/TestExpectations 2013-09-20 21:54:42 UTC (rev 156202)
+++ trunk/LayoutTests/platform/win/TestExpectations 2013-09-20 21:56:10 UTC (rev 156203)
@@ -586,7 +586,6 @@
accessibility/aria-controls-with-tabs.html
accessibility/aria-describedby-on-input.html
accessibility/aria-disabled.html
-accessibility/aria-help.html
accessibility/aria-hidden.html
accessibility/aria-hidden-with-elements.html
accessibility/aria-invalid.html
Modified: trunk/LayoutTests/platform/wincairo/TestExpectations (156202 => 156203)
--- trunk/LayoutTests/platform/wincairo/TestExpectations 2013-09-20 21:54:42 UTC (rev 156202)
+++ trunk/LayoutTests/platform/wincairo/TestExpectations 2013-09-20 21:56:10 UTC (rev 156203)
@@ -1115,7 +1115,6 @@
accessibility/aria-controls-with-tabs.html
accessibility/aria-describedby-on-input.html
accessibility/aria-disabled.html
-accessibility/aria-help.html
accessibility/aria-hidden.html
accessibility/aria-hidden-with-elements.html
accessibility/aria-invalid.html
Modified: trunk/Source/WebCore/ChangeLog (156202 => 156203)
--- trunk/Source/WebCore/ChangeLog 2013-09-20 21:54:42 UTC (rev 156202)
+++ trunk/Source/WebCore/ChangeLog 2013-09-20 21:56:10 UTC (rev 156203)
@@ -1,3 +1,16 @@
+2013-09-20 Mario Sanchez Prada <[email protected]>
+
+ [ATK] Do not expose aria-help in ATK based platforms
+ https://bugs.webkit.org/show_bug.cgi?id=121675
+
+ Reviewed by Chris Fleizach.
+
+ Stop exposing the value for the 'aria-help' attribute as an
+ AtkObject attribute, based in AccessibilityObject::helpText().
+
+ * accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
+ (webkitAccessibleGetAttributes): Remove the mapping.
+
2013-09-20 Simon Fraser <[email protected]>
Scrollbars don't appear on long pages after r155660
Modified: trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp (156202 => 156203)
--- trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp 2013-09-20 21:54:42 UTC (rev 156202)
+++ trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp 2013-09-20 21:56:10 UTC (rev 156203)
@@ -495,10 +495,6 @@
if (!invalidStatus.isEmpty() && invalidStatus != "false")
attributeSet = addToAtkAttributeSet(attributeSet, "aria-invalid", coreObject->invalidStatus().string().utf8().data());
- String helpText = coreObject->helpText();
- if (!helpText.isEmpty())
- attributeSet = addToAtkAttributeSet(attributeSet, "aria-help", helpText.utf8().data());
-
AccessibilitySortDirection sortDirection = coreObject->sortDirection();
if (sortDirection != SortDirectionNone) {
attributeSet = addToAtkAttributeSet(attributeSet, "sort",
Modified: trunk/Source/WebKit/efl/ChangeLog (156202 => 156203)
--- trunk/Source/WebKit/efl/ChangeLog 2013-09-20 21:54:42 UTC (rev 156202)
+++ trunk/Source/WebKit/efl/ChangeLog 2013-09-20 21:56:10 UTC (rev 156203)
@@ -1,3 +1,16 @@
+2013-09-20 Mario Sanchez Prada <[email protected]>
+
+ [ATK] Do not expose aria-help in ATK based platforms
+ https://bugs.webkit.org/show_bug.cgi?id=121675
+
+ Reviewed by Chris Fleizach.
+
+ Removed accessibilityHelpText() helper method from
+ DumpRenderSupportEfl's API, since it's not longer needed.
+
+ * WebCoreSupport/DumpRenderTreeSupportEfl.cpp: Removed method.
+ * WebCoreSupport/DumpRenderTreeSupportEfl.h: Ditto.
+
2013-09-16 Enrica Casucci <[email protected]>
Remove unused function didSetSelectionTypesForPasteboard from EditorClient.
Modified: trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp (156202 => 156203)
--- trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp 2013-09-20 21:54:42 UTC (rev 156202)
+++ trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.cpp 2013-09-20 21:56:10 UTC (rev 156203)
@@ -736,18 +736,6 @@
}
#if HAVE(ACCESSIBILITY)
-String DumpRenderTreeSupportEfl::accessibilityHelpText(const AtkObject* axObject)
-{
- if (!axObject || !WEBKIT_IS_ACCESSIBLE(axObject))
- return String();
-
- WebCore::AccessibilityObject* coreObject = webkitAccessibleGetAccessibilityObject(WEBKIT_ACCESSIBLE(axObject));
- if (!coreObject)
- return String();
-
- return coreObject->helpText();
-}
-
AtkObject* DumpRenderTreeSupportEfl::rootAccessibleElement(const Evas_Object* ewkFrame)
{
DRT_SUPPORT_FRAME_GET_OR_RETURN(ewkFrame, frame, 0);
Modified: trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h (156202 => 156203)
--- trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h 2013-09-20 21:54:42 UTC (rev 156202)
+++ trunk/Source/WebKit/efl/WebCoreSupport/DumpRenderTreeSupportEfl.h 2013-09-20 21:56:10 UTC (rev 156203)
@@ -130,7 +130,6 @@
static int numberOfPendingGeolocationPermissionRequests(const Evas_Object*);
#if HAVE(ACCESSIBILITY)
- static String accessibilityHelpText(const AtkObject* axObject);
static AtkObject* focusedAccessibleElement(const Evas_Object*);
static AtkObject* rootAccessibleElement(const Evas_Object*);
#endif
Modified: trunk/Source/WebKit/gtk/ChangeLog (156202 => 156203)
--- trunk/Source/WebKit/gtk/ChangeLog 2013-09-20 21:54:42 UTC (rev 156202)
+++ trunk/Source/WebKit/gtk/ChangeLog 2013-09-20 21:56:10 UTC (rev 156203)
@@ -1,3 +1,16 @@
+2013-09-20 Mario Sanchez Prada <[email protected]>
+
+ [ATK] Do not expose aria-help in ATK based platforms
+ https://bugs.webkit.org/show_bug.cgi?id=121675
+
+ Reviewed by Chris Fleizach.
+
+ Removed accessibilityHelpText() helper method from
+ DumpRenderSupportGtk's API, since it's not longer needed.
+
+ * WebCoreSupport/DumpRenderTreeSupportGtk.cpp: Removed method.
+ * WebCoreSupport/DumpRenderTreeSupportGtk.h: Ditto.
+
2013-09-16 Enrica Casucci <[email protected]>
Remove unused function didSetSelectionTypesForPasteboard from EditorClient.
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp (156202 => 156203)
--- trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp 2013-09-20 21:54:42 UTC (rev 156202)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp 2013-09-20 21:56:10 UTC (rev 156203)
@@ -477,18 +477,6 @@
return core(webView)->findString(String::fromUTF8(targetString), findOptions);
}
-CString DumpRenderTreeSupportGtk::accessibilityHelpText(AtkObject* axObject)
-{
- if (!axObject || !WEBKIT_IS_ACCESSIBLE(axObject))
- return CString();
-
- AccessibilityObject* coreObject = webkitAccessibleGetAccessibilityObject(WEBKIT_ACCESSIBLE(axObject));
- if (!coreObject)
- return CString();
-
- return coreObject->helpText().utf8();
-}
-
void DumpRenderTreeSupportGtk::setValueForUser(JSContextRef context, JSValueRef nodeObject, JSStringRef value)
{
JSC::ExecState* exec = toJS(context);
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h (156202 => 156203)
--- trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h 2013-09-20 21:54:42 UTC (rev 156202)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h 2013-09-20 21:56:10 UTC (rev 156203)
@@ -78,9 +78,6 @@
static void setDefersLoading(WebKitWebView*, bool);
static void forceWebViewPaint(WebKitWebView*);
- // Accessibility
- static WTF::CString accessibilityHelpText(AtkObject*);
-
// TextInputController
static void setComposition(WebKitWebView*, const char*, int start, int length);
static bool hasComposition(WebKitWebView*);
Modified: trunk/Tools/ChangeLog (156202 => 156203)
--- trunk/Tools/ChangeLog 2013-09-20 21:54:42 UTC (rev 156202)
+++ trunk/Tools/ChangeLog 2013-09-20 21:56:10 UTC (rev 156203)
@@ -1,3 +1,29 @@
+2013-09-20 Mario Sanchez Prada <[email protected]>
+
+ [ATK] Do not expose aria-help in ATK based platforms
+ https://bugs.webkit.org/show_bug.cgi?id=121675
+
+ Reviewed by Chris Fleizach.
+
+ Remove the implementations for AccessibilityUIElement::helpText()
+ from DRT and WKTR for GTK and EFL, since they are based on the
+ AccessibilityObject::helpText() method and the 'aria-help'
+ attributes, which is wrong since they should not depend on that
+ but in ATK specific API (see also http://webkit.org/b/121684).
+
+ * DumpRenderTree/atk/AccessibilityUIElementAtk.cpp:
+ (AccessibilityUIElement::helpText): Added a new and empty
+ implementation, now that we are no longer using this in ATK.
+ * DumpRenderTree/efl/AccessibilityUIElementEfl.cpp: Removed file
+ as the only function provided here was helpText().
+ * DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp: Ditto.
+ * DumpRenderTree/efl/CMakeLists.txt: AccessibilityUIElementEfl.cpp
+ removed from the list of sources to compile.
+ * GNUmakefile.am: Likewise, but for AccessibilityUIElementGtk.cpp.
+ * WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:
+ (WTR::AccessibilityUIElement::helpText): Replaced old implementation
+ based in DumpRenderTreeSupportGtk with an empty one.
+
2013-09-20 Dan Bernstein <[email protected]>
Make extract-localizable-strings available to WebCore clients
Modified: trunk/Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp (156202 => 156203)
--- trunk/Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp 2013-09-20 21:54:42 UTC (rev 156202)
+++ trunk/Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp 2013-09-20 21:56:10 UTC (rev 156203)
@@ -536,6 +536,14 @@
return JSStringCreateWithUTF8CString(axValue.get());
}
+JSStringRef AccessibilityUIElement::helpText() const
+{
+ // FIXME: We need to provide a proper implementation for this that does
+ // not depend on Mac specific concepts such as ATK_RELATION_DESCRIBED_BY,
+ // once it's implemented (see http://webkit.org/b/121684).
+ return JSStringCreateWithCharacters(0, 0);
+}
+
double AccessibilityUIElement::x()
{
int x, y;
Deleted: trunk/Tools/DumpRenderTree/efl/AccessibilityUIElementEfl.cpp (156202 => 156203)
--- trunk/Tools/DumpRenderTree/efl/AccessibilityUIElementEfl.cpp 2013-09-20 21:54:42 UTC (rev 156202)
+++ trunk/Tools/DumpRenderTree/efl/AccessibilityUIElementEfl.cpp 2013-09-20 21:56:10 UTC (rev 156203)
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- * Copyright (C) 2009 Jan Michael Alonzo
- * Copyright (C) 2013 Samsung Electronics. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "AccessibilityUIElement.h"
-
-#if HAVE(ACCESSIBILITY)
-
-#include "WebCoreSupport/DumpRenderTreeSupportEfl.h"
-#include <_javascript_Core/JSStringRef.h>
-#include <atk/atk.h>
-#include <wtf/Assertions.h>
-#include <wtf/gobject/GOwnPtr.h>
-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/text/WTFString.h>
-#include <wtf/unicode/CharacterNames.h>
-
-JSStringRef AccessibilityUIElement::helpText() const
-{
- if (!m_element)
- return JSStringCreateWithCharacters(0, 0);
-
- ASSERT(ATK_IS_OBJECT(m_element));
-
- String helpText = DumpRenderTreeSupportEfl::accessibilityHelpText(ATK_OBJECT(m_element));
- GOwnPtr<gchar> axHelpText(g_strdup_printf("AXHelp: %s", helpText.utf8().data()));
- return JSStringCreateWithUTF8CString(axHelpText.get());
-}
-
-#endif
Modified: trunk/Tools/DumpRenderTree/efl/CMakeLists.txt (156202 => 156203)
--- trunk/Tools/DumpRenderTree/efl/CMakeLists.txt 2013-09-20 21:54:42 UTC (rev 156202)
+++ trunk/Tools/DumpRenderTree/efl/CMakeLists.txt 2013-09-20 21:56:10 UTC (rev 156203)
@@ -14,7 +14,6 @@
${TOOLS_DIR}/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp
${TOOLS_DIR}/DumpRenderTree/cairo/PixelDumpSupportCairo.cpp
${TOOLS_DIR}/DumpRenderTree/efl/AccessibilityControllerEfl.cpp
- ${TOOLS_DIR}/DumpRenderTree/efl/AccessibilityUIElementEfl.cpp
${TOOLS_DIR}/DumpRenderTree/efl/DumpHistoryItem.cpp
${TOOLS_DIR}/DumpRenderTree/efl/DumpRenderTree.cpp
${TOOLS_DIR}/DumpRenderTree/efl/DumpRenderTreeChrome.cpp
Deleted: trunk/Tools/DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp (156202 => 156203)
--- trunk/Tools/DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp 2013-09-20 21:54:42 UTC (rev 156202)
+++ trunk/Tools/DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp 2013-09-20 21:56:10 UTC (rev 156203)
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- * Copyright (C) 2009 Jan Michael Alonzo
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "AccessibilityUIElement.h"
-
-#include "WebCoreSupport/DumpRenderTreeSupportGtk.h"
-#include <_javascript_Core/JSStringRef.h>
-#include <atk/atk.h>
-#include <gtk/gtk.h>
-#include <wtf/Assertions.h>
-#include <wtf/gobject/GOwnPtr.h>
-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/text/WTFString.h>
-#include <wtf/unicode/CharacterNames.h>
-
-JSStringRef AccessibilityUIElement::helpText() const
-{
- 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());
-}
Modified: trunk/Tools/GNUmakefile.am (156202 => 156203)
--- trunk/Tools/GNUmakefile.am 2013-09-20 21:54:42 UTC (rev 156202)
+++ trunk/Tools/GNUmakefile.am 2013-09-20 21:56:10 UTC (rev 156203)
@@ -122,7 +122,6 @@
Tools/DumpRenderTree/cairo/PixelDumpSupportCairo.cpp \
Tools/DumpRenderTree/cairo/PixelDumpSupportCairo.h \
Tools/DumpRenderTree/gtk/AccessibilityControllerGtk.cpp \
- Tools/DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp \
Tools/DumpRenderTree/gtk/DumpRenderTree.cpp \
Tools/DumpRenderTree/gtk/DumpRenderTreeGtk.h \
Tools/DumpRenderTree/gtk/EditingCallbacks.h \
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp (156202 => 156203)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp 2013-09-20 21:54:42 UTC (rev 156202)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp 2013-09-20 21:56:10 UTC (rev 156203)
@@ -719,12 +719,10 @@
JSRetainPtr<JSStringRef> AccessibilityUIElement::helpText() const
{
- if (!m_element || !ATK_IS_OBJECT(m_element.get()))
- return JSStringCreateWithCharacters(0, 0);
-
- String attributeValue = getAttributeSetValueForId(ATK_OBJECT(m_element.get()), "aria-help");
- GOwnPtr<char> axValue(g_strdup_printf("AXHelp: %s", attributeValue.utf8().data()));
- return JSStringCreateWithUTF8CString(axValue.get());
+ // FIXME: We need to provide a proper implementation for this that does
+ // not depend on Mac specific concepts such as ATK_RELATION_DESCRIBED_BY,
+ // once it's implemented (see http://webkit.org/b/121684).
+ return JSStringCreateWithCharacters(0, 0);
}
double AccessibilityUIElement::x()
