Diff
Modified: trunk/LayoutTests/ChangeLog (161665 => 161666)
--- trunk/LayoutTests/ChangeLog 2014-01-10 21:08:51 UTC (rev 161665)
+++ trunk/LayoutTests/ChangeLog 2014-01-10 21:10:57 UTC (rev 161666)
@@ -1,3 +1,19 @@
+2014-01-10 Mario Sanchez Prada <[email protected]>
+
+ Move platformName property from testRunner to accessibilityController
+ https://bugs.webkit.org/show_bug.cgi?id=126689
+
+ Reviewed by Chris Fleizach.
+
+ Updated tests and expectations affected by the move of
+ platformName from TestRunner to AccessibilityController.
+
+ * accessibility/canvas-fallback-content.html:
+ * accessibility/ignore-spacer-elements.html:
+ * accessibility/platform-name.html:
+ * platform/efl/accessibility/platform-name-expected.txt:
+ * platform/gtk/accessibility/platform-name-expected.txt:
+
2014-01-10 Anders Carlsson <[email protected]>
Remove supportMultipleWindows setting
Modified: trunk/LayoutTests/accessibility/canvas-fallback-content.html (161665 => 161666)
--- trunk/LayoutTests/accessibility/canvas-fallback-content.html 2014-01-10 21:08:51 UTC (rev 161665)
+++ trunk/LayoutTests/accessibility/canvas-fallback-content.html 2014-01-10 21:10:57 UTC (rev 161666)
@@ -52,7 +52,7 @@
debug("");
}
- var comboBoxRole = (testRunner.platformName == "gtk" || testRunner.platformName == "efl") ? "AXRole: AXComboBox" : "AXRole: AXPopUpButton";
+ var comboBoxRole = accessibilityController.platformName == "atk" ? "AXRole: AXComboBox" : "AXRole: AXPopUpButton";
// Check rendered controls.
check("link1", "AXRole: AXLink");
Modified: trunk/LayoutTests/accessibility/ignore-spacer-elements.html (161665 => 161666)
--- trunk/LayoutTests/accessibility/ignore-spacer-elements.html 2014-01-10 21:08:51 UTC (rev 161665)
+++ trunk/LayoutTests/accessibility/ignore-spacer-elements.html 2014-01-10 21:10:57 UTC (rev 161666)
@@ -25,7 +25,7 @@
var container = accessibilityController.focusedElement.childAtIndex(0);
// The Gtk and EFL ports ATs expect the bold inline text to not have accessible objects.
- var expectedCount = (testRunner.platformName == "gtk" || testRunner.platformName == "efl") ? 2 : 4;
+ var expectedCount = accessibilityController.platformName == "atk" ? 2 : 4;
if (container.childrenCount == expectedCount) {
result.innerText += "Test passed\n";
}
Modified: trunk/LayoutTests/accessibility/platform-name.html (161665 => 161666)
--- trunk/LayoutTests/accessibility/platform-name.html 2014-01-10 21:08:51 UTC (rev 161665)
+++ trunk/LayoutTests/accessibility/platform-name.html 2014-01-10 21:10:57 UTC (rev 161666)
@@ -8,10 +8,10 @@
<div id="console"></div>
<script>
description("This test just prints the name of the current platform.");
-if (window.testRunner) {
+if (window.testRunner && window.accessibilityController) {
testRunner.dumpAsText();
- debug("Platform name: " + testRunner.platformName);
+ debug("Platform name: " + accessibilityController.platformName);
}
</script>
<script src=""
Modified: trunk/LayoutTests/platform/efl/accessibility/platform-name-expected.txt (161665 => 161666)
--- trunk/LayoutTests/platform/efl/accessibility/platform-name-expected.txt 2014-01-10 21:08:51 UTC (rev 161665)
+++ trunk/LayoutTests/platform/efl/accessibility/platform-name-expected.txt 2014-01-10 21:10:57 UTC (rev 161666)
@@ -3,7 +3,7 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-Platform name: efl
+Platform name: atk
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/platform/gtk/accessibility/platform-name-expected.txt (161665 => 161666)
--- trunk/LayoutTests/platform/gtk/accessibility/platform-name-expected.txt 2014-01-10 21:08:51 UTC (rev 161665)
+++ trunk/LayoutTests/platform/gtk/accessibility/platform-name-expected.txt 2014-01-10 21:10:57 UTC (rev 161666)
@@ -3,7 +3,7 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-Platform name: gtk
+Platform name: atk
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/Tools/ChangeLog (161665 => 161666)
--- trunk/Tools/ChangeLog 2014-01-10 21:08:51 UTC (rev 161665)
+++ trunk/Tools/ChangeLog 2014-01-10 21:10:57 UTC (rev 161666)
@@ -1,3 +1,74 @@
+2014-01-10 Mario Sanchez Prada <[email protected]>
+
+ Move platformName property from testRunner to accessibilityController
+ https://bugs.webkit.org/show_bug.cgi?id=126689
+
+ Reviewed by Chris Fleizach.
+
+ Move the platformName property from the testRunner into
+ accessibilityController, since this is a concept that has only be
+ used by accessibility tests since it got added, and also because
+ the real intention was not to distinguish among "ports" (mac, win,
+ gtk, efl) but between platforms (atk, mac, win).
+
+ This change will be very useful to merge GTK's roles-exposed.html
+ and Mac's role-subrole-roledescription.html into one single test,
+ since we will be specifying in the test itself which elements are
+ supported in which accessibility "platform". In this context,
+ being able to check accessibilityController.platformName directly
+ against a list of supported accessibility platforms (e.g. "atk,mac")
+ will certainly maintain the code cleaner and simpler.
+
+ * DumpRenderTree/TestRunner.h:
+ (TestRunner::platformName): Removed.
+ * DumpRenderTree/TestRunner.cpp:
+ (getPlatformNameCallback): Removed.
+ (TestRunner::staticValues): Removed platformName
+ * DumpRenderTree/efl/TestRunnerEfl.cpp:
+ (TestRunner::platformName): Removed.
+ * DumpRenderTree/gtk/TestRunnerGtk.cpp:
+ (TestRunner::platformName): Removed.
+ * DumpRenderTree/mac/TestRunnerMac.mm:
+ (TestRunner::platformName): Removed.
+ * DumpRenderTree/win/TestRunnerWin.cpp:
+ (TestRunner::platformName): Removed.
+
+ * DumpRenderTree/AccessibilityController.h:
+ (AccessibilityController::platformName): Added.
+ * DumpRenderTree/AccessibilityController.cpp:
+ (getPlatformNameCallback): Added.
+ (AccessibilityController::getJSClass): Added platformName.
+ * DumpRenderTree/atk/AccessibilityControllerAtk.cpp:
+ (AccessibilityController::platformName): Added, returning "atk".
+ * DumpRenderTree/mac/AccessibilityControllerMac.mm:
+ (AccessibilityController::platformName): Ditto, returning "mac".
+ * DumpRenderTree/ios/AccessibilityControllerIOS.mm:
+ (AccessibilityController::platformName): Ditto, returning "ios".
+ * DumpRenderTree/win/AccessibilityControllerWin.cpp:
+ (AccessibilityController::platformName): Ditto, returning "win".
+
+ * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
+ (platformName): Removed.
+ * WebKitTestRunner/InjectedBundle/TestRunner.h:
+ (TestRunner::platformName): Removed.
+ * WebKitTestRunner/InjectedBundle/efl/TestRunnerEfl.cpp:
+ (TestRunner::platformName): Removed.
+ * WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp:
+ (TestRunner::platformName): Removed.
+ * WebKitTestRunner/InjectedBundle/mac/TestRunnerMac.mm:
+ (TestRunner::platformName): Removed.
+ * WebKitTestRunner/InjectedBundle/win/TestRunnerWin.cpp:
+ (TestRunner::platformName): Removed.
+
+ * WebKitTestRunner/InjectedBundle/AccessibilityController.h:
+ (WTR:AccessibilityController::platformName): Added.
+ * WebKitTestRunner/InjectedBundle/Bindings/AccessibilityController.idl:
+ (platformName): Added.
+ * WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp:
+ (WTR::AccessibilityController::platformName): Added, returning "atk".
+ * WebKitTestRunner/InjectedBundle/mac/AccessibilityControllerMac.mm:
+ (WTR::AccessibilityController::platformName): Added, returning "mac".
+
2014-01-10 Benjamin Poulain <[email protected]>
Remove the BlackBerry port from trunk
Modified: trunk/Tools/DumpRenderTree/AccessibilityController.cpp (161665 => 161666)
--- trunk/Tools/DumpRenderTree/AccessibilityController.cpp 2014-01-10 21:08:51 UTC (rev 161665)
+++ trunk/Tools/DumpRenderTree/AccessibilityController.cpp 2014-01-10 21:10:57 UTC (rev 161666)
@@ -130,6 +130,15 @@
return JSValueMakeUndefined(context);
}
+static JSValueRef getPlatformNameCallback(JSContextRef context, JSObjectRef thisObject, JSStringRef propertyName, JSValueRef* exception)
+{
+ AccessibilityController* controller = static_cast<AccessibilityController*>(JSObjectGetPrivate(thisObject));
+ JSRetainPtr<JSStringRef> platformName(controller->platformName());
+ if (!platformName.get())
+ return JSValueMakeUndefined(context);
+ return JSValueMakeString(context, platformName.get());
+}
+
JSClassRef AccessibilityController::getJSClass()
{
static JSStaticFunction staticFunctions[] = {
@@ -147,6 +156,7 @@
static JSStaticValue staticValues[] = {
{ "focusedElement", getFocusedElementCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "rootElement", getRootElementCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
+ { "platformName", getPlatformNameCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ 0, 0, 0, 0 }
};
Modified: trunk/Tools/DumpRenderTree/AccessibilityController.h (161665 => 161666)
--- trunk/Tools/DumpRenderTree/AccessibilityController.h 2014-01-10 21:08:51 UTC (rev 161665)
+++ trunk/Tools/DumpRenderTree/AccessibilityController.h 2014-01-10 21:10:57 UTC (rev 161666)
@@ -28,6 +28,7 @@
#include "AccessibilityUIElement.h"
#include <_javascript_Core/JSObjectRef.h>
+#include <_javascript_Core/JSRetainPtr.h>
#include <string>
#include <wtf/HashMap.h>
#include <wtf/Platform.h>
@@ -63,6 +64,8 @@
bool addNotificationListener(JSObjectRef functionCallback);
void removeNotificationListener();
+ JSRetainPtr<JSStringRef> platformName() const;
+
#if PLATFORM(WIN)
// Helper methods so this class can add the listeners on behalf of AccessibilityUIElement.
void winAddNotificationListener(PlatformUIElement, JSObjectRef functionCallback);
Modified: trunk/Tools/DumpRenderTree/TestRunner.cpp (161665 => 161666)
--- trunk/Tools/DumpRenderTree/TestRunner.cpp 2014-01-10 21:08:51 UTC (rev 161665)
+++ trunk/Tools/DumpRenderTree/TestRunner.cpp 2014-01-10 21:10:57 UTC (rev 161666)
@@ -1844,17 +1844,6 @@
return JSValueMakeNumber(context, controller->webHistoryItemCount());
}
-#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(WIN) || PLATFORM(EFL)
-static JSValueRef getPlatformNameCallback(JSContextRef context, JSObjectRef thisObject, JSStringRef propertyName, JSValueRef* exception)
-{
- TestRunner* controller = static_cast<TestRunner*>(JSObjectGetPrivate(thisObject));
- JSRetainPtr<JSStringRef> platformName(controller->platformName());
- if (!platformName.get())
- return JSValueMakeUndefined(context);
- return JSValueMakeString(context, platformName.get());
-}
-#endif
-
static JSValueRef getSecureEventInputIsEnabledCallback(JSContextRef context, JSObjectRef thisObject, JSStringRef propertyName, JSValueRef* exception)
{
#if PLATFORM(MAC)
@@ -2060,9 +2049,6 @@
static JSStaticValue staticValues[] = {
{ "globalFlag", getGlobalFlagCallback, setGlobalFlagCallback, kJSPropertyAttributeNone },
{ "webHistoryItemCount", getWebHistoryItemCountCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
-#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(WIN) || PLATFORM(EFL)
- { "platformName", getPlatformNameCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
-#endif
{ "secureEventInputIsEnabled", getSecureEventInputIsEnabledCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "titleTextDirection", getTitleTextDirectionCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
{ "databaseDefaultQuota", getDatabaseDefaultQuotaCallback, setDatabaseDefaultQuotaCallback, kJSPropertyAttributeNone },
Modified: trunk/Tools/DumpRenderTree/TestRunner.h (161665 => 161666)
--- trunk/Tools/DumpRenderTree/TestRunner.h 2014-01-10 21:08:51 UTC (rev 161665)
+++ trunk/Tools/DumpRenderTree/TestRunner.h 2014-01-10 21:10:57 UTC (rev 161666)
@@ -30,7 +30,6 @@
#define TestRunner_h
#include <_javascript_Core/JSObjectRef.h>
-#include <_javascript_Core/JSRetainPtr.h>
#include <map>
#include <set>
#include <string>
@@ -130,10 +129,6 @@
void setTextAutosizingEnabled(bool);
#endif
-#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(WIN) || PLATFORM(EFL)
- JSRetainPtr<JSStringRef> platformName() const;
-#endif
-
// Legacy here refers to the old TestRunner API for handling web notifications, not the legacy web notification API.
void ignoreLegacyWebNotificationPermissionRequests();
// Legacy here refers to the old TestRunner API for handling web notifications, not the legacy web notification API.
Modified: trunk/Tools/DumpRenderTree/atk/AccessibilityControllerAtk.cpp (161665 => 161666)
--- trunk/Tools/DumpRenderTree/atk/AccessibilityControllerAtk.cpp 2014-01-10 21:08:51 UTC (rev 161665)
+++ trunk/Tools/DumpRenderTree/atk/AccessibilityControllerAtk.cpp 2014-01-10 21:10:57 UTC (rev 161666)
@@ -103,6 +103,12 @@
m_globalNotificationHandler = nullptr;
}
+JSRetainPtr<JSStringRef> AccessibilityController::platformName() const
+{
+ JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("atk"));
+ return platformName;
+}
+
AtkObject* AccessibilityController::childElementById(AtkObject* parent, const char* id)
{
if (!ATK_IS_OBJECT(parent))
Modified: trunk/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp (161665 => 161666)
--- trunk/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp 2014-01-10 21:08:51 UTC (rev 161665)
+++ trunk/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp 2014-01-10 21:10:57 UTC (rev 161666)
@@ -833,9 +833,3 @@
{
notImplemented();
}
-
-JSRetainPtr<JSStringRef> TestRunner::platformName() const
-{
- JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("efl"));
- return platformName;
-}
Modified: trunk/Tools/DumpRenderTree/gtk/TestRunnerGtk.cpp (161665 => 161666)
--- trunk/Tools/DumpRenderTree/gtk/TestRunnerGtk.cpp 2014-01-10 21:08:51 UTC (rev 161665)
+++ trunk/Tools/DumpRenderTree/gtk/TestRunnerGtk.cpp 2014-01-10 21:10:57 UTC (rev 161666)
@@ -122,12 +122,6 @@
webkit_web_back_forward_list_get_forward_length(list);
}
-JSRetainPtr<JSStringRef> TestRunner::platformName() const
-{
- JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("gtk"));
- return platformName;
-}
-
void TestRunner::notifyDone()
{
if (m_waitToDump && !topLoadingFrame && !WorkQueue::shared()->count())
Modified: trunk/Tools/DumpRenderTree/ios/AccessibilityControllerIOS.mm (161665 => 161666)
--- trunk/Tools/DumpRenderTree/ios/AccessibilityControllerIOS.mm 2014-01-10 21:08:51 UTC (rev 161665)
+++ trunk/Tools/DumpRenderTree/ios/AccessibilityControllerIOS.mm 2014-01-10 21:10:57 UTC (rev 161666)
@@ -125,4 +125,10 @@
{
}
+JSRetainPtr<JSStringRef> AccessibilityController::platformName() const
+{
+ JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("ios"));
+ return platformName;
+}
+
#endif // PLATFORM(IOS)
Modified: trunk/Tools/DumpRenderTree/mac/AccessibilityControllerMac.mm (161665 => 161666)
--- trunk/Tools/DumpRenderTree/mac/AccessibilityControllerMac.mm 2014-01-10 21:08:51 UTC (rev 161665)
+++ trunk/Tools/DumpRenderTree/mac/AccessibilityControllerMac.mm 2014-01-10 21:10:57 UTC (rev 161666)
@@ -141,3 +141,9 @@
ASSERT(m_globalNotificationHandler);
m_globalNotificationHandler.clear();
}
+
+JSRetainPtr<JSStringRef> AccessibilityController::platformName() const
+{
+ JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("mac"));
+ return platformName;
+}
Modified: trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm (161665 => 161666)
--- trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm 2014-01-10 21:08:51 UTC (rev 161665)
+++ trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm 2014-01-10 21:10:57 UTC (rev 161666)
@@ -285,12 +285,6 @@
return [[[WebHistory optionalSharedHistory] allItems] count];
}
-JSRetainPtr<JSStringRef> TestRunner::platformName() const
-{
- JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("mac"));
- return platformName;
-}
-
void TestRunner::notifyDone()
{
if (m_waitToDump && !topLoadingFrame && !WorkQueue::shared()->count())
Modified: trunk/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp (161665 => 161666)
--- trunk/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp 2014-01-10 21:08:51 UTC (rev 161665)
+++ trunk/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp 2014-01-10 21:10:57 UTC (rev 161666)
@@ -389,3 +389,9 @@
JSValueProtect(frame->globalContext(), functionCallback);
m_notificationListeners.add(element, functionCallback);
}
+
+JSRetainPtr<JSStringRef> AccessibilityController::platformName() const
+{
+ JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("win"));
+ return platformName;
+}
Modified: trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp (161665 => 161666)
--- trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp 2014-01-10 21:08:51 UTC (rev 161665)
+++ trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp 2014-01-10 21:10:57 UTC (rev 161666)
@@ -192,12 +192,6 @@
return count;
}
-JSRetainPtr<JSStringRef> TestRunner::platformName() const
-{
- JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("win"));
- return platformName;
-}
-
void TestRunner::notifyDone()
{
// Same as on mac. This can be shared.
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.h (161665 => 161666)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.h 2014-01-10 21:08:51 UTC (rev 161665)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.h 2014-01-10 21:10:57 UTC (rev 161666)
@@ -44,6 +44,8 @@
void makeWindowObject(JSContextRef, JSObjectRef windowObject, JSValueRef* exception);
virtual JSClassRef wrapperClass();
+ JSRetainPtr<JSStringRef> platformName();
+
// Controller Methods - platform-independent implementations.
PassRefPtr<AccessibilityUIElement> rootElement();
PassRefPtr<AccessibilityUIElement> focusedElement();
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityController.idl (161665 => 161666)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityController.idl 2014-01-10 21:08:51 UTC (rev 161665)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityController.idl 2014-01-10 21:10:57 UTC (rev 161666)
@@ -24,6 +24,7 @@
*/
interface AccessibilityController {
+ readonly attribute DOMString platformName;
readonly attribute AccessibilityUIElement rootElement;
readonly attribute AccessibilityUIElement focusedElement;
AccessibilityUIElement elementAtPoint(int x, int y);
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl (161665 => 161666)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2014-01-10 21:08:51 UTC (rev 161665)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2014-01-10 21:10:57 UTC (rev 161666)
@@ -155,8 +155,6 @@
void setPageVisibility(DOMString state);
void resetPageVisibility();
- readonly attribute DOMString platformName;
-
// Control full screen behavior.
void setHasCustomFullScreenBehavior(boolean value);
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (161665 => 161666)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2014-01-10 21:08:51 UTC (rev 161665)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2014-01-10 21:10:57 UTC (rev 161666)
@@ -257,8 +257,6 @@
void setMockGeolocationPosition(double latitude, double longitude, double accuracy, JSValueRef altitude, JSValueRef altitudeAccuracy, JSValueRef heading, JSValueRef speed);
void setMockGeolocationPositionUnavailableError(JSStringRef message);
- JSRetainPtr<JSStringRef> platformName();
-
void setPageVisibility(JSStringRef state);
void resetPageVisibility();
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp (161665 => 161666)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp 2014-01-10 21:08:51 UTC (rev 161665)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp 2014-01-10 21:10:57 UTC (rev 161666)
@@ -114,6 +114,12 @@
return nullptr;
}
+JSRetainPtr<JSStringRef> AccessibilityController::platformName()
+{
+ JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("atk"));
+ return platformName;
+}
+
PassRefPtr<AccessibilityUIElement> AccessibilityController::rootElement()
{
WKBundlePageRef page = InjectedBundle::shared().page()->page();
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/efl/TestRunnerEfl.cpp (161665 => 161666)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/efl/TestRunnerEfl.cpp 2014-01-10 21:08:51 UTC (rev 161665)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/efl/TestRunnerEfl.cpp 2014-01-10 21:10:57 UTC (rev 161666)
@@ -83,10 +83,4 @@
return JSStringCreateWithUTF8CString(fullPathToUrl.utf8().data());
}
-JSRetainPtr<JSStringRef> TestRunner::platformName()
-{
- JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("efl"));
- return platformName;
-}
-
} // namespace WTR
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp (161665 => 161666)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp 2014-01-10 21:08:51 UTC (rev 161665)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp 2014-01-10 21:10:57 UTC (rev 161666)
@@ -78,10 +78,4 @@
return JSStringCreateWithUTF8CString(testURI.get());
}
-JSRetainPtr<JSStringRef> TestRunner::platformName()
-{
- JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("gtk"));
- return platformName;
-}
-
} // namespace WTR
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityControllerMac.mm (161665 => 161666)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityControllerMac.mm 2014-01-10 21:08:51 UTC (rev 161665)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityControllerMac.mm 2014-01-10 21:10:57 UTC (rev 161666)
@@ -112,6 +112,12 @@
return nullptr;
}
+JSRetainPtr<JSStringRef> AccessibilityController::platformName()
+{
+ JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("mac"));
+ return platformName;
+}
+
} // namespace WTR
#endif // HAVE(ACCESSIBILITY)
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/TestRunnerMac.mm (161665 => 161666)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/mac/TestRunnerMac.mm 2014-01-10 21:08:51 UTC (rev 161665)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/mac/TestRunnerMac.mm 2014-01-10 21:10:57 UTC (rev 161666)
@@ -60,11 +60,5 @@
{
return JSStringRetain(url); // Do nothing on mac.
}
-
-JSRetainPtr<JSStringRef> TestRunner::platformName()
-{
- JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("mac"));
- return platformName;
-}
} // namespace WTR
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/win/TestRunnerWin.cpp (161665 => 161666)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/win/TestRunnerWin.cpp 2014-01-10 21:08:51 UTC (rev 161665)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/win/TestRunnerWin.cpp 2014-01-10 21:10:57 UTC (rev 161666)
@@ -64,10 +64,4 @@
return JSStringRetain(url); // TODO.
}
-JSRetainPtr<JSStringRef> TestRunner::platformName()
-{
- JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("win"));
- return platformName;
-}
-
} // namespace WTR
