<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[161666] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/161666">161666</a></dd>
<dt>Author</dt> <dd>mario.prada@samsung.com</dd>
<dt>Date</dt> <dd>2014-01-10 13:10:57 -0800 (Fri, 10 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move platformName property from testRunner to accessibilityController
https://bugs.webkit.org/show_bug.cgi?id=126689
Reviewed by Chris Fleizach.
Tools:
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".
LayoutTests:
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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsaccessibilitycanvasfallbackcontenthtml">trunk/LayoutTests/accessibility/canvas-fallback-content.html</a></li>
<li><a href="#trunkLayoutTestsaccessibilityignorespacerelementshtml">trunk/LayoutTests/accessibility/ignore-spacer-elements.html</a></li>
<li><a href="#trunkLayoutTestsaccessibilityplatformnamehtml">trunk/LayoutTests/accessibility/platform-name.html</a></li>
<li><a href="#trunkLayoutTestsplatformeflaccessibilityplatformnameexpectedtxt">trunk/LayoutTests/platform/efl/accessibility/platform-name-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformgtkaccessibilityplatformnameexpectedtxt">trunk/LayoutTests/platform/gtk/accessibility/platform-name-expected.txt</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeAccessibilityControllercpp">trunk/Tools/DumpRenderTree/AccessibilityController.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreeAccessibilityControllerh">trunk/Tools/DumpRenderTree/AccessibilityController.h</a></li>
<li><a href="#trunkToolsDumpRenderTreeTestRunnercpp">trunk/Tools/DumpRenderTree/TestRunner.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreeTestRunnerh">trunk/Tools/DumpRenderTree/TestRunner.h</a></li>
<li><a href="#trunkToolsDumpRenderTreeatkAccessibilityControllerAtkcpp">trunk/Tools/DumpRenderTree/atk/AccessibilityControllerAtk.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreeeflTestRunnerEflcpp">trunk/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreegtkTestRunnerGtkcpp">trunk/Tools/DumpRenderTree/gtk/TestRunnerGtk.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreeiosAccessibilityControllerIOSmm">trunk/Tools/DumpRenderTree/ios/AccessibilityControllerIOS.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreemacAccessibilityControllerMacmm">trunk/Tools/DumpRenderTree/mac/AccessibilityControllerMac.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreemacTestRunnerMacmm">trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreewinAccessibilityControllerWincpp">trunk/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreewinTestRunnerWincpp">trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleAccessibilityControllerh">trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.h</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleBindingsAccessibilityControlleridl">trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityController.idl</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleBindingsTestRunneridl">trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleTestRunnerh">trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleatkAccessibilityControllerAtkcpp">trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleeflTestRunnerEflcpp">trunk/Tools/WebKitTestRunner/InjectedBundle/efl/TestRunnerEfl.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundlegtkTestRunnerGtkcpp">trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundlemacAccessibilityControllerMacmm">trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityControllerMac.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundlemacTestRunnerMacmm">trunk/Tools/WebKitTestRunner/InjectedBundle/mac/TestRunnerMac.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundlewinTestRunnerWincpp">trunk/Tools/WebKitTestRunner/InjectedBundle/win/TestRunnerWin.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (161665 => 161666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-01-10 21:08:51 UTC (rev 161665)
+++ trunk/LayoutTests/ChangeLog 2014-01-10 21:10:57 UTC (rev 161666)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-01-10 Mario Sanchez Prada <mario.prada@samsung.com>
+
+ 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:
+
</ins><span class="cx"> 2014-01-10 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove supportMultipleWindows setting
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitycanvasfallbackcontenthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/canvas-fallback-content.html (161665 => 161666)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> debug("");
</span><span class="cx"> }
</span><span class="cx">
</span><del>- var comboBoxRole = (testRunner.platformName == "gtk" || testRunner.platformName == "efl") ? "AXRole: AXComboBox" : "AXRole: AXPopUpButton";
</del><ins>+ var comboBoxRole = accessibilityController.platformName == "atk" ? "AXRole: AXComboBox" : "AXRole: AXPopUpButton";
</ins><span class="cx">
</span><span class="cx"> // Check rendered controls.
</span><span class="cx"> check("link1", "AXRole: AXLink");
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityignorespacerelementshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/ignore-spacer-elements.html (161665 => 161666)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> var container = accessibilityController.focusedElement.childAtIndex(0);
</span><span class="cx">
</span><span class="cx"> // The Gtk and EFL ports ATs expect the bold inline text to not have accessible objects.
</span><del>- var expectedCount = (testRunner.platformName == "gtk" || testRunner.platformName == "efl") ? 2 : 4;
</del><ins>+ var expectedCount = accessibilityController.platformName == "atk" ? 2 : 4;
</ins><span class="cx"> if (container.childrenCount == expectedCount) {
</span><span class="cx"> result.innerText += "Test passed\n";
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityplatformnamehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/platform-name.html (161665 => 161666)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -8,10 +8,10 @@
</span><span class="cx"> <div id="console"></div>
</span><span class="cx"> <script>
</span><span class="cx"> description("This test just prints the name of the current platform.");
</span><del>-if (window.testRunner) {
</del><ins>+if (window.testRunner && window.accessibilityController) {
</ins><span class="cx"> testRunner.dumpAsText();
</span><span class="cx">
</span><del>- debug("Platform name: " + testRunner.platformName);
</del><ins>+ debug("Platform name: " + accessibilityController.platformName);
</ins><span class="cx"> }
</span><span class="cx"> </script>
</span><span class="cx"> <script src="../resources/js-test-post.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestsplatformeflaccessibilityplatformnameexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/efl/accessibility/platform-name-expected.txt (161665 => 161666)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-Platform name: efl
</del><ins>+Platform name: atk
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkaccessibilityplatformnameexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/accessibility/platform-name-expected.txt (161665 => 161666)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-Platform name: gtk
</del><ins>+Platform name: atk
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (161665 => 161666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-01-10 21:08:51 UTC (rev 161665)
+++ trunk/Tools/ChangeLog 2014-01-10 21:10:57 UTC (rev 161666)
</span><span class="lines">@@ -1,3 +1,74 @@
</span><ins>+2014-01-10 Mario Sanchez Prada <mario.prada@samsung.com>
+
+ 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".
+
</ins><span class="cx"> 2014-01-10 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove the BlackBerry port from trunk
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeAccessibilityControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/AccessibilityController.cpp (161665 => 161666)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -130,6 +130,15 @@
</span><span class="cx"> return JSValueMakeUndefined(context);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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());
+}
+
</ins><span class="cx"> JSClassRef AccessibilityController::getJSClass()
</span><span class="cx"> {
</span><span class="cx"> static JSStaticFunction staticFunctions[] = {
</span><span class="lines">@@ -147,6 +156,7 @@
</span><span class="cx"> static JSStaticValue staticValues[] = {
</span><span class="cx"> { "focusedElement", getFocusedElementCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "rootElement", getRootElementCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><ins>+ { "platformName", getPlatformNameCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</ins><span class="cx"> { 0, 0, 0, 0 }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeAccessibilityControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/AccessibilityController.h (161665 => 161666)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "AccessibilityUIElement.h"
</span><span class="cx"> #include <JavaScriptCore/JSObjectRef.h>
</span><ins>+#include <JavaScriptCore/JSRetainPtr.h>
</ins><span class="cx"> #include <string>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/Platform.h>
</span><span class="lines">@@ -63,6 +64,8 @@
</span><span class="cx"> bool addNotificationListener(JSObjectRef functionCallback);
</span><span class="cx"> void removeNotificationListener();
</span><span class="cx">
</span><ins>+ JSRetainPtr<JSStringRef> platformName() const;
+
</ins><span class="cx"> #if PLATFORM(WIN)
</span><span class="cx"> // Helper methods so this class can add the listeners on behalf of AccessibilityUIElement.
</span><span class="cx"> void winAddNotificationListener(PlatformUIElement, JSObjectRef functionCallback);
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeTestRunnercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/TestRunner.cpp (161665 => 161666)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1844,17 +1844,6 @@
</span><span class="cx"> return JSValueMakeNumber(context, controller->webHistoryItemCount());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#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
-
</del><span class="cx"> static JSValueRef getSecureEventInputIsEnabledCallback(JSContextRef context, JSObjectRef thisObject, JSStringRef propertyName, JSValueRef* exception)
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="lines">@@ -2060,9 +2049,6 @@
</span><span class="cx"> static JSStaticValue staticValues[] = {
</span><span class="cx"> { "globalFlag", getGlobalFlagCallback, setGlobalFlagCallback, kJSPropertyAttributeNone },
</span><span class="cx"> { "webHistoryItemCount", getWebHistoryItemCountCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><del>-#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(WIN) || PLATFORM(EFL)
- { "platformName", getPlatformNameCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
-#endif
</del><span class="cx"> { "secureEventInputIsEnabled", getSecureEventInputIsEnabledCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "titleTextDirection", getTitleTextDirectionCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "databaseDefaultQuota", getDatabaseDefaultQuotaCallback, setDatabaseDefaultQuotaCallback, kJSPropertyAttributeNone },
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeTestRunnerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/TestRunner.h (161665 => 161666)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #define TestRunner_h
</span><span class="cx">
</span><span class="cx"> #include <JavaScriptCore/JSObjectRef.h>
</span><del>-#include <JavaScriptCore/JSRetainPtr.h>
</del><span class="cx"> #include <map>
</span><span class="cx"> #include <set>
</span><span class="cx"> #include <string>
</span><span class="lines">@@ -130,10 +129,6 @@
</span><span class="cx"> void setTextAutosizingEnabled(bool);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(WIN) || PLATFORM(EFL)
- JSRetainPtr<JSStringRef> platformName() const;
-#endif
-
</del><span class="cx"> // Legacy here refers to the old TestRunner API for handling web notifications, not the legacy web notification API.
</span><span class="cx"> void ignoreLegacyWebNotificationPermissionRequests();
</span><span class="cx"> // Legacy here refers to the old TestRunner API for handling web notifications, not the legacy web notification API.
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeatkAccessibilityControllerAtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/atk/AccessibilityControllerAtk.cpp (161665 => 161666)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -103,6 +103,12 @@
</span><span class="cx"> m_globalNotificationHandler = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+JSRetainPtr<JSStringRef> AccessibilityController::platformName() const
+{
+ JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("atk"));
+ return platformName;
+}
+
</ins><span class="cx"> AtkObject* AccessibilityController::childElementById(AtkObject* parent, const char* id)
</span><span class="cx"> {
</span><span class="cx"> if (!ATK_IS_OBJECT(parent))
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeeflTestRunnerEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/efl/TestRunnerEfl.cpp (161665 => 161666)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -833,9 +833,3 @@
</span><span class="cx"> {
</span><span class="cx"> notImplemented();
</span><span class="cx"> }
</span><del>-
-JSRetainPtr<JSStringRef> TestRunner::platformName() const
-{
- JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("efl"));
- return platformName;
-}
</del></span></pre></div>
<a id="trunkToolsDumpRenderTreegtkTestRunnerGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/gtk/TestRunnerGtk.cpp (161665 => 161666)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -122,12 +122,6 @@
</span><span class="cx"> webkit_web_back_forward_list_get_forward_length(list);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSRetainPtr<JSStringRef> TestRunner::platformName() const
-{
- JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("gtk"));
- return platformName;
-}
-
</del><span class="cx"> void TestRunner::notifyDone()
</span><span class="cx"> {
</span><span class="cx"> if (m_waitToDump && !topLoadingFrame && !WorkQueue::shared()->count())
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeiosAccessibilityControllerIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/ios/AccessibilityControllerIOS.mm (161665 => 161666)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -125,4 +125,10 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+JSRetainPtr<JSStringRef> AccessibilityController::platformName() const
+{
+ JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("ios"));
+ return platformName;
+}
+
</ins><span class="cx"> #endif // PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacAccessibilityControllerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/AccessibilityControllerMac.mm (161665 => 161666)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -141,3 +141,9 @@
</span><span class="cx"> ASSERT(m_globalNotificationHandler);
</span><span class="cx"> m_globalNotificationHandler.clear();
</span><span class="cx"> }
</span><ins>+
+JSRetainPtr<JSStringRef> AccessibilityController::platformName() const
+{
+ JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("mac"));
+ return platformName;
+}
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreemacTestRunnerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm (161665 => 161666)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -285,12 +285,6 @@
</span><span class="cx"> return [[[WebHistory optionalSharedHistory] allItems] count];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSRetainPtr<JSStringRef> TestRunner::platformName() const
-{
- JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("mac"));
- return platformName;
-}
-
</del><span class="cx"> void TestRunner::notifyDone()
</span><span class="cx"> {
</span><span class="cx"> if (m_waitToDump && !topLoadingFrame && !WorkQueue::shared()->count())
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinAccessibilityControllerWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp (161665 => 161666)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -389,3 +389,9 @@
</span><span class="cx"> JSValueProtect(frame->globalContext(), functionCallback);
</span><span class="cx"> m_notificationListeners.add(element, functionCallback);
</span><span class="cx"> }
</span><ins>+
+JSRetainPtr<JSStringRef> AccessibilityController::platformName() const
+{
+ JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("win"));
+ return platformName;
+}
</ins></span></pre></div>
<a id="trunkToolsDumpRenderTreewinTestRunnerWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp (161665 => 161666)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -192,12 +192,6 @@
</span><span class="cx"> return count;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSRetainPtr<JSStringRef> TestRunner::platformName() const
-{
- JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("win"));
- return platformName;
-}
-
</del><span class="cx"> void TestRunner::notifyDone()
</span><span class="cx"> {
</span><span class="cx"> // Same as on mac. This can be shared.
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleAccessibilityControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityController.h (161665 => 161666)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -44,6 +44,8 @@
</span><span class="cx"> void makeWindowObject(JSContextRef, JSObjectRef windowObject, JSValueRef* exception);
</span><span class="cx"> virtual JSClassRef wrapperClass();
</span><span class="cx">
</span><ins>+ JSRetainPtr<JSStringRef> platformName();
+
</ins><span class="cx"> // Controller Methods - platform-independent implementations.
</span><span class="cx"> PassRefPtr<AccessibilityUIElement> rootElement();
</span><span class="cx"> PassRefPtr<AccessibilityUIElement> focusedElement();
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleBindingsAccessibilityControlleridl"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityController.idl (161665 => 161666)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> interface AccessibilityController {
</span><ins>+ readonly attribute DOMString platformName;
</ins><span class="cx"> readonly attribute AccessibilityUIElement rootElement;
</span><span class="cx"> readonly attribute AccessibilityUIElement focusedElement;
</span><span class="cx"> AccessibilityUIElement elementAtPoint(int x, int y);
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleBindingsTestRunneridl"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl (161665 => 161666)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -155,8 +155,6 @@
</span><span class="cx"> void setPageVisibility(DOMString state);
</span><span class="cx"> void resetPageVisibility();
</span><span class="cx">
</span><del>- readonly attribute DOMString platformName;
-
</del><span class="cx"> // Control full screen behavior.
</span><span class="cx"> void setHasCustomFullScreenBehavior(boolean value);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleTestRunnerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (161665 => 161666)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -257,8 +257,6 @@
</span><span class="cx"> void setMockGeolocationPosition(double latitude, double longitude, double accuracy, JSValueRef altitude, JSValueRef altitudeAccuracy, JSValueRef heading, JSValueRef speed);
</span><span class="cx"> void setMockGeolocationPositionUnavailableError(JSStringRef message);
</span><span class="cx">
</span><del>- JSRetainPtr<JSStringRef> platformName();
-
</del><span class="cx"> void setPageVisibility(JSStringRef state);
</span><span class="cx"> void resetPageVisibility();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleatkAccessibilityControllerAtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp (161665 => 161666)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -114,6 +114,12 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+JSRetainPtr<JSStringRef> AccessibilityController::platformName()
+{
+ JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("atk"));
+ return platformName;
+}
+
</ins><span class="cx"> PassRefPtr<AccessibilityUIElement> AccessibilityController::rootElement()
</span><span class="cx"> {
</span><span class="cx"> WKBundlePageRef page = InjectedBundle::shared().page()->page();
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleeflTestRunnerEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/efl/TestRunnerEfl.cpp (161665 => 161666)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -83,10 +83,4 @@
</span><span class="cx"> return JSStringCreateWithUTF8CString(fullPathToUrl.utf8().data());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSRetainPtr<JSStringRef> TestRunner::platformName()
-{
- JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("efl"));
- return platformName;
-}
-
</del><span class="cx"> } // namespace WTR
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundlegtkTestRunnerGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp (161665 => 161666)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -78,10 +78,4 @@
</span><span class="cx"> return JSStringCreateWithUTF8CString(testURI.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSRetainPtr<JSStringRef> TestRunner::platformName()
-{
- JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("gtk"));
- return platformName;
-}
-
</del><span class="cx"> } // namespace WTR
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundlemacAccessibilityControllerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityControllerMac.mm (161665 => 161666)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -112,6 +112,12 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+JSRetainPtr<JSStringRef> AccessibilityController::platformName()
+{
+ JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("mac"));
+ return platformName;
+}
+
</ins><span class="cx"> } // namespace WTR
</span><span class="cx">
</span><span class="cx"> #endif // HAVE(ACCESSIBILITY)
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundlemacTestRunnerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/TestRunnerMac.mm (161665 => 161666)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -60,11 +60,5 @@
</span><span class="cx"> {
</span><span class="cx"> return JSStringRetain(url); // Do nothing on mac.
</span><span class="cx"> }
</span><del>-
-JSRetainPtr<JSStringRef> TestRunner::platformName()
-{
- JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("mac"));
- return platformName;
-}
</del><span class="cx">
</span><span class="cx"> } // namespace WTR
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundlewinTestRunnerWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/win/TestRunnerWin.cpp (161665 => 161666)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -64,10 +64,4 @@
</span><span class="cx"> return JSStringRetain(url); // TODO.
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSRetainPtr<JSStringRef> TestRunner::platformName()
-{
- JSRetainPtr<JSStringRef> platformName(Adopt, JSStringCreateWithUTF8CString("win"));
- return platformName;
-}
-
</del><span class="cx"> } // namespace WTR
</span></span></pre>
</div>
</div>
</body>
</html>