summaryrefslogtreecommitdiff
path: root/Tools/WebKitTestRunner/TestController.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2012-11-09 09:42:44 +0100
committerSimon Hausmann <simon.hausmann@digia.com>2012-11-09 09:42:44 +0100
commita59391482883479a9b28a6f1ace6d1ebd08a7ecd (patch)
treefa539db054a20a67bff2fc891c33b0f4ec632916 /Tools/WebKitTestRunner/TestController.cpp
parentcfd86b747d32ac22246a1aa908eaa720c63a88c1 (diff)
downloadqtwebkit-a59391482883479a9b28a6f1ace6d1ebd08a7ecd.tar.gz
Imported WebKit commit 7bcdfab9a40db7d16b4b95bb77d78b8a59c9e701 (http://svn.webkit.org/repository/webkit/trunk@134025)
New snapshot with numerious build fixes, including MSVC 2012 and ARM Thumb-2.
Diffstat (limited to 'Tools/WebKitTestRunner/TestController.cpp')
-rw-r--r--Tools/WebKitTestRunner/TestController.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp
index 07ff81bb7..2eb635b21 100644
--- a/Tools/WebKitTestRunner/TestController.cpp
+++ b/Tools/WebKitTestRunner/TestController.cpp
@@ -53,6 +53,10 @@
#include "EventSenderProxy.h"
#endif
+#if !PLATFORM(MAC)
+#include <WebKit2/WKTextChecker.h>
+#endif
+
namespace WTR {
// defaultLongTimeout + defaultShortTimeout should be less than 80,
@@ -550,6 +554,9 @@ bool TestController::resetStateToConsistentValues()
#endif
WKPreferencesSetScreenFontSubstitutionEnabled(preferences, true);
WKPreferencesSetInspectorUsesWebKitUserInterface(preferences, true);
+#if !PLATFORM(MAC)
+ WKTextCheckerContinuousSpellCheckingEnabledStateChanged(true);
+#endif
// in the case that a test using the chrome input field failed, be sure to clean up for the next test
m_mainWebView->removeChromeInputField();
@@ -696,7 +703,7 @@ void TestController::runTestingServerLoop()
void TestController::run()
{
if (!resetStateToConsistentValues()) {
- TestInvocation::dumpWebProcessUnresponsiveness("Failed to reset to consistent state before the first test");
+ m_currentInvocation->dumpWebProcessUnresponsiveness();
return;
}