diff -r 000000000000 -r 4f2f89ce4247 WebKitTools/WebKitTestRunner/TestController.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/WebKitTools/WebKitTestRunner/TestController.cpp	Fri Sep 17 09:02:29 2010 +0300
@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2010 Apple Inc. 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. AND ITS CONTRIBUTORS ``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 ITS 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 "TestController.h"
+
+#include "PlatformWebView.h"
+#include "TestInvocation.h"
+#include <WebKit2/WKContextPrivate.h>
+
+namespace WTR {
+
+TestController& TestController::shared()
+{
+    static TestController& shared = *new TestController;
+    return shared;
+}
+
+TestController::TestController()
+    : m_dumpPixels(false)
+    , m_verbose(false)
+    , m_printSeparators(false)
+    , m_usingServerMode(false)
+{
+}
+
+void TestController::initialize(int argc, const char* argv[])
+{
+    platformInitialize();
+
+    for (int i = 1; i < argc; ++i) {
+        std::string argument(argv[i]);
+
+        if (argument == "--pixel-tests") {
+            m_dumpPixels = true;
+            continue;
+        }
+        if (argument == "--verbose") {
+            m_verbose = true;
+            continue;
+        }
+        
+        // Skip any other arguments that begin with '--'.
+        if (argument.length() >= 2 && argument[0] == '-' && argument[1] == '-')
+            continue;
+
+        m_paths.push_back(argument);
+    }
+
+    m_usingServerMode = (m_paths.size() == 1 && m_paths[0] == "-");
+    if (m_usingServerMode)
+        m_printSeparators = true;
+    else
+        m_printSeparators = m_paths.size() > 1;
+
+    initializeInjectedBundlePath();
+    initializeTestPluginPath();
+
+    m_context.adopt(WKContextCreateWithInjectedBundlePath(injectedBundlePath()));
+
+    WKContextInjectedBundleClient injectedBundlePathClient = {
+        0,
+        this,
+        _didRecieveMessageFromInjectedBundle
+    };
+    WKContextSetInjectedBundleClient(m_context.get(), &injectedBundlePathClient);
+
+    _WKContextSetAdditionalPluginPath(m_context.get(), testPluginPath());
+    
+    m_pageNamespace.adopt(WKPageNamespaceCreate(m_context.get()));
+    m_mainWebView = new PlatformWebView(m_pageNamespace.get());
+}
+
+void TestController::runTest(const char* test)
+{
+    m_currentInvocation.set(new TestInvocation(test));
+    m_currentInvocation->invoke();
+    m_currentInvocation.clear();
+}
+
+void TestController::runTestingServerLoop()
+{
+    char filenameBuffer[2048];
+    while (fgets(filenameBuffer, sizeof(filenameBuffer), stdin)) {
+        char *newLineCharacter = strchr(filenameBuffer, '\n');
+        if (newLineCharacter)
+            *newLineCharacter = '\0';
+
+        if (strlen(filenameBuffer) == 0)
+            continue;
+
+        runTest(filenameBuffer);
+    }
+}
+
+bool TestController::run()
+{
+    if (m_usingServerMode)
+        runTestingServerLoop();
+    else {
+        for (size_t i = 0; i < m_paths.size(); ++i)
+            runTest(m_paths[i].c_str());
+    }
+
+    return true;
+}
+
+void TestController::_didRecieveMessageFromInjectedBundle(WKContextRef context, WKStringRef message, const void *clientInfo)
+{
+    static_cast<TestController*>(const_cast<void*>(clientInfo))->didRecieveMessageFromInjectedBundle(message);
+}
+
+void TestController::didRecieveMessageFromInjectedBundle(WKStringRef message)
+{
+    m_currentInvocation->didRecieveMessageFromInjectedBundle(message);
+}
+
+} // namespace WTR