Diff
Modified: trunk/Tools/ChangeLog (140276 => 140277)
--- trunk/Tools/ChangeLog 2013-01-20 20:06:05 UTC (rev 140276)
+++ trunk/Tools/ChangeLog 2013-01-20 20:16:24 UTC (rev 140277)
@@ -1,5 +1,42 @@
2013-01-20 Jochen Eisinger <[email protected]>
+ [chromium] move speech related methods to TestRunner library
+ https://bugs.webkit.org/show_bug.cgi?id=107266
+
+ Reviewed by Adam Barth.
+
+ * DumpRenderTree/chromium/DRTTestRunner.cpp:
+ (DRTTestRunner::DRTTestRunner):
+ (DRTTestRunner::displayInvalidatedRegion):
+ * DumpRenderTree/chromium/DRTTestRunner.h:
+ (DRTTestRunner):
+ * DumpRenderTree/chromium/TestRunner/public/WebTestDelegate.h:
+ (WebTestDelegate):
+ (WebTestRunner::WebTestDelegate::addMockSpeechInputResult):
+ (WebTestRunner::WebTestDelegate::setMockSpeechInputDumpRect):
+ (WebTestRunner::WebTestDelegate::addMockSpeechRecognitionResult):
+ (WebTestRunner::WebTestDelegate::setMockSpeechRecognitionError):
+ (WebTestRunner::WebTestDelegate::wasMockSpeechRecognitionAborted):
+ * DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp:
+ (WebTestRunner::TestRunner::TestRunner):
+ (WebTestRunner):
+ (WebTestRunner::TestRunner::addMockSpeechInputResult):
+ (WebTestRunner::TestRunner::setMockSpeechInputDumpRect):
+ (WebTestRunner::TestRunner::addMockSpeechRecognitionResult):
+ (WebTestRunner::TestRunner::setMockSpeechRecognitionError):
+ (WebTestRunner::TestRunner::wasMockSpeechRecognitionAborted):
+ * DumpRenderTree/chromium/TestRunner/src/TestRunner.h:
+ (TestRunner):
+ * DumpRenderTree/chromium/WebViewHost.cpp:
+ (WebViewHost::addMockSpeechInputResult):
+ (WebViewHost::setMockSpeechInputDumpRect):
+ (WebViewHost::addMockSpeechRecognitionResult):
+ (WebViewHost::setMockSpeechRecognitionError):
+ (WebViewHost::wasMockSpeechRecognitionAborted):
+ * DumpRenderTree/chromium/WebViewHost.h:
+
+2013-01-20 Jochen Eisinger <[email protected]>
+
[chromium] move notification related methods to TestRunner
https://bugs.webkit.org/show_bug.cgi?id=107269
Modified: trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.cpp (140276 => 140277)
--- trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.cpp 2013-01-20 20:06:05 UTC (rev 140276)
+++ trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.cpp 2013-01-20 20:16:24 UTC (rev 140277)
@@ -34,8 +34,6 @@
#include "DRTTestRunner.h"
#include "DRTDevToolsAgent.h"
-#include "MockWebSpeechInputController.h"
-#include "MockWebSpeechRecognizer.h"
#include "Task.h"
#include "TestShell.h"
#include "WebAnimationController.h"
@@ -90,15 +88,6 @@
// they will use when called by _javascript_. The actual binding of those
// names to their methods will be done by calling bindToJavaScript() (defined
// by CppBoundClass, the parent to DRTTestRunner).
-#if ENABLE(INPUT_SPEECH)
- bindMethod("addMockSpeechInputResult", &DRTTestRunner::addMockSpeechInputResult);
- bindMethod("setMockSpeechInputDumpRect", &DRTTestRunner::setMockSpeechInputDumpRect);
-#endif
-#if ENABLE(SCRIPTED_SPEECH)
- bindMethod("addMockSpeechRecognitionResult", &DRTTestRunner::addMockSpeechRecognitionResult);
- bindMethod("setMockSpeechRecognitionError", &DRTTestRunner::setMockSpeechRecognitionError);
- bindMethod("wasMockSpeechRecognitionAborted", &DRTTestRunner::wasMockSpeechRecognitionAborted);
-#endif
bindMethod("display", &DRTTestRunner::display);
bindMethod("displayInvalidatedRegion", &DRTTestRunner::displayInvalidatedRegion);
bindMethod("notifyDone", &DRTTestRunner::notifyDone);
@@ -461,54 +450,3 @@
host->displayRepaintMask();
result->setNull();
}
-
-#if ENABLE(INPUT_SPEECH)
-void DRTTestRunner::addMockSpeechInputResult(const CppArgumentList& arguments, CppVariant* result)
-{
- result->setNull();
- if (arguments.size() < 3 || !arguments[0].isString() || !arguments[1].isNumber() || !arguments[2].isString())
- return;
-
- if (MockWebSpeechInputController* controller = m_shell->webViewHost()->speechInputControllerMock())
- controller->addMockRecognitionResult(cppVariantToWebString(arguments[0]), arguments[1].toDouble(), cppVariantToWebString(arguments[2]));
-}
-
-void DRTTestRunner::setMockSpeechInputDumpRect(const CppArgumentList& arguments, CppVariant* result)
-{
- result->setNull();
- if (arguments.size() < 1 || !arguments[0].isBool())
- return;
-
- if (MockWebSpeechInputController* controller = m_shell->webViewHost()->speechInputControllerMock())
- controller->setDumpRect(arguments[0].value.boolValue);
-}
-#endif
-
-#if ENABLE(SCRIPTED_SPEECH)
-void DRTTestRunner::addMockSpeechRecognitionResult(const CppArgumentList& arguments, CppVariant* result)
-{
- result->setNull();
- if (arguments.size() < 2 || !arguments[0].isString() || !arguments[1].isNumber())
- return;
-
- if (MockWebSpeechRecognizer* recognizer = m_shell->webViewHost()->mockSpeechRecognizer())
- recognizer->addMockResult(cppVariantToWebString(arguments[0]), arguments[1].toDouble());
-}
-
-void DRTTestRunner::setMockSpeechRecognitionError(const CppArgumentList& arguments, CppVariant* result)
-{
- result->setNull();
- if (arguments.size() != 2 || !arguments[0].isString() || !arguments[1].isString())
- return;
-
- if (MockWebSpeechRecognizer* recognizer = m_shell->webViewHost()->mockSpeechRecognizer())
- recognizer->setError(cppVariantToWebString(arguments[0]), cppVariantToWebString(arguments[1]));
-}
-
-void DRTTestRunner::wasMockSpeechRecognitionAborted(const CppArgumentList&, CppVariant* result)
-{
- result->set(false);
- if (MockWebSpeechRecognizer* recognizer = m_shell->webViewHost()->mockSpeechRecognizer())
- result->set(recognizer->wasAborted());
-}
-#endif
Modified: trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.h (140276 => 140277)
--- trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.h 2013-01-20 20:06:05 UTC (rev 140276)
+++ trunk/Tools/DumpRenderTree/chromium/DRTTestRunner.h 2013-01-20 20:16:24 UTC (rev 140277)
@@ -110,17 +110,6 @@
void display(const CppArgumentList&, CppVariant*);
void displayInvalidatedRegion(const CppArgumentList&, CppVariant*);
- // Speech input related functions.
-#if ENABLE(INPUT_SPEECH)
- void addMockSpeechInputResult(const CppArgumentList&, CppVariant*);
- void setMockSpeechInputDumpRect(const CppArgumentList&, CppVariant*);
-#endif
-#if ENABLE(SCRIPTED_SPEECH)
- void addMockSpeechRecognitionResult(const CppArgumentList&, CppVariant*);
- void setMockSpeechRecognitionError(const CppArgumentList&, CppVariant*);
- void wasMockSpeechRecognitionAborted(const CppArgumentList&, CppVariant*);
-#endif
-
public:
// The following methods are not exposed to _javascript_.
void setWorkQueueFrozen(bool frozen) { m_workQueue.setFrozen(frozen); }
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestDelegate.h (140276 => 140277)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestDelegate.h 2013-01-20 20:06:05 UTC (rev 140276)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestDelegate.h 2013-01-20 20:16:24 UTC (rev 140277)
@@ -103,10 +103,14 @@
virtual void setGeolocationPermission(bool) { }
virtual void setMockGeolocationPosition(double, double, double) { }
virtual void setMockGeolocationPositionUnavailableError(const std::string&) { }
-#if ENABLE(NOTIFICATIONS)
virtual void grantWebNotificationPermission(const std::string&) { }
virtual bool simulateLegacyWebNotificationClick(const std::string&) { return false; }
-#endif
+ virtual void addMockSpeechInputResult(const std::string&, double, const std::string&) { }
+ virtual void setMockSpeechInputDumpRect(bool) { }
+ virtual void addMockSpeechRecognitionResult(const std::string&, double) { }
+ virtual void setMockSpeechRecognitionError(const std::string&, const std::string&) { }
+ virtual bool wasMockSpeechRecognitionAborted() { return false; }
+
};
}
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp (140276 => 140277)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp 2013-01-20 20:06:05 UTC (rev 140276)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.cpp 2013-01-20 20:16:24 UTC (rev 140277)
@@ -225,6 +225,15 @@
bindMethod("grantWebNotificationPermission", &TestRunner::grantWebNotificationPermission);
bindMethod("simulateLegacyWebNotificationClick", &TestRunner::simulateLegacyWebNotificationClick);
#endif
+#if ENABLE(INPUT_SPEECH)
+ bindMethod("addMockSpeechInputResult", &TestRunner::addMockSpeechInputResult);
+ bindMethod("setMockSpeechInputDumpRect", &TestRunner::setMockSpeechInputDumpRect);
+#endif
+#if ENABLE(SCRIPTED_SPEECH)
+ bindMethod("addMockSpeechRecognitionResult", &TestRunner::addMockSpeechRecognitionResult);
+ bindMethod("setMockSpeechRecognitionError", &TestRunner::setMockSpeechRecognitionError);
+ bindMethod("wasMockSpeechRecognitionAborted", &TestRunner::wasMockSpeechRecognitionAborted);
+#endif
// Properties.
bindProperty("workerThreadCount", &TestRunner::workerThreadCount);
@@ -1487,6 +1496,51 @@
}
#endif
+#if ENABLE(INPUT_SPEECH)
+void TestRunner::addMockSpeechInputResult(const CppArgumentList& arguments, CppVariant* result)
+{
+ result->setNull();
+ if (arguments.size() < 3 || !arguments[0].isString() || !arguments[1].isNumber() || !arguments[2].isString())
+ return;
+
+ m_delegate->addMockSpeechInputResult(arguments[0].toString(), arguments[1].toDouble(), arguments[2].toString());
+}
+
+void TestRunner::setMockSpeechInputDumpRect(const CppArgumentList& arguments, CppVariant* result)
+{
+ result->setNull();
+ if (arguments.size() < 1 || !arguments[0].isBool())
+ return;
+
+ m_delegate->setMockSpeechInputDumpRect(arguments[0].toBoolean());
+}
+#endif
+
+#if ENABLE(SCRIPTED_SPEECH)
+void TestRunner::addMockSpeechRecognitionResult(const CppArgumentList& arguments, CppVariant* result)
+{
+ result->setNull();
+ if (arguments.size() < 2 || !arguments[0].isString() || !arguments[1].isNumber())
+ return;
+
+ m_delegate->addMockSpeechRecognitionResult(arguments[0].toString(), arguments[1].toDouble());
+}
+
+void TestRunner::setMockSpeechRecognitionError(const CppArgumentList& arguments, CppVariant* result)
+{
+ result->setNull();
+ if (arguments.size() != 2 || !arguments[0].isString() || !arguments[1].isString())
+ return;
+
+ m_delegate->setMockSpeechRecognitionError(arguments[0].toString(), arguments[1].toString());
+}
+
+void TestRunner::wasMockSpeechRecognitionAborted(const CppArgumentList&, CppVariant* result)
+{
+ result->set(m_delegate->wasMockSpeechRecognitionAborted());
+}
+#endif
+
void TestRunner::dumpEditingCallbacks(const CppArgumentList&, CppVariant* result)
{
m_dumpEditingCallbacks = true;
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.h (140276 => 140277)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.h 2013-01-20 20:06:05 UTC (rev 140276)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/TestRunner.h 2013-01-20 20:16:24 UTC (rev 140277)
@@ -383,6 +383,17 @@
void simulateLegacyWebNotificationClick(const CppArgumentList&, CppVariant*);
#endif
+ // Speech input related functions.
+#if ENABLE(INPUT_SPEECH)
+ void addMockSpeechInputResult(const CppArgumentList&, CppVariant*);
+ void setMockSpeechInputDumpRect(const CppArgumentList&, CppVariant*);
+#endif
+#if ENABLE(SCRIPTED_SPEECH)
+ void addMockSpeechRecognitionResult(const CppArgumentList&, CppVariant*);
+ void setMockSpeechRecognitionError(const CppArgumentList&, CppVariant*);
+ void wasMockSpeechRecognitionAborted(const CppArgumentList&, CppVariant*);
+#endif
+
///////////////////////////////////////////////////////////////////////////
// Properties
void workerThreadCount(CppVariant*);
Modified: trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp (140276 => 140277)
--- trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2013-01-20 20:06:05 UTC (rev 140276)
+++ trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2013-01-20 20:16:24 UTC (rev 140277)
@@ -1183,6 +1183,35 @@
}
#endif
+#if ENABLE(INPUT_SPEECH)
+void WebViewHost::addMockSpeechInputResult(const std::string& result, double confidence, const std::string& language)
+{
+ m_speechInputControllerMock->addMockRecognitionResult(WebString::fromUTF8(result), confidence, WebString::fromUTF8(language));
+}
+
+void WebViewHost::setMockSpeechInputDumpRect(bool dumpRect)
+{
+ m_speechInputControllerMock->setDumpRect(dumpRect);
+}
+#endif
+
+#if ENABLE(SCRIPTED_SPEECH)
+void WebViewHost::addMockSpeechRecognitionResult(const std::string& transcript, double confidence)
+{
+ m_mockSpeechRecognizer->addMockResult(WebString::fromUTF8(transcript), confidence);
+}
+
+void WebViewHost::setMockSpeechRecognitionError(const std::string& error, const std::string& message)
+{
+ m_mockSpeechRecognizer->setError(WebString::fromUTF8(error), WebString::fromUTF8(message));
+}
+
+bool WebViewHost::wasMockSpeechRecognitionAborted()
+{
+ return m_mockSpeechRecognizer->wasAborted();
+}
+#endif
+
// Public functions -----------------------------------------------------------
WebViewHost::WebViewHost(TestShell* shell)
Modified: trunk/Tools/DumpRenderTree/chromium/WebViewHost.h (140276 => 140277)
--- trunk/Tools/DumpRenderTree/chromium/WebViewHost.h 2013-01-20 20:06:05 UTC (rev 140276)
+++ trunk/Tools/DumpRenderTree/chromium/WebViewHost.h 2013-01-20 20:16:24 UTC (rev 140277)
@@ -168,6 +168,15 @@
virtual void grantWebNotificationPermission(const std::string&) OVERRIDE;
virtual bool simulateLegacyWebNotificationClick(const std::string&) OVERRIDE;
#endif
+#if ENABLE(INPUT_SPEECH)
+ virtual void addMockSpeechInputResult(const std::string&, double, const std::string&) OVERRIDE;
+ virtual void setMockSpeechInputDumpRect(bool) OVERRIDE;
+#endif
+#if ENABLE(SCRIPTED_SPEECH)
+ virtual void addMockSpeechRecognitionResult(const std::string&, double) OVERRIDE;
+ virtual void setMockSpeechRecognitionError(const std::string&, const std::string&) OVERRIDE;
+ virtual bool wasMockSpeechRecognitionAborted() OVERRIDE;
+#endif
// NavigationHost
virtual bool navigate(const TestNavigationEntry&, bool reload);
