Merge WebKit at r64523 : Initial merge by git.

Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4

1 files changed, 12 insertions, 14 deletions

diff --git a/WebKitTools/WebKitTestRunner/TestController.h b/WebKitTools/WebKitTestRunner/TestController.h
index bd073bf..5754728 100644
--- a/WebKitTools/WebKitTestRunner/TestController.h
+++ b/WebKitTools/WebKitTestRunner/TestController.h
@@ -36,39 +36,37 @@ namespace WTR {
 class TestInvocation;
 class PlatformWebView;
 
+// FIXME: Rename this TestRunner?
 class TestController {
 public:
     static TestController& shared();
 
-    // Initialize the TestController.
-    void initialize(int argc, const char *argv[]);
-
-    // Returns true if all the tests passed, false otherwise.
-    bool run();
+    TestController(int argc, const char* argv[]);
+    ~TestController();
 
     bool verbose() const { return m_verbose; }
 
     WKStringRef injectedBundlePath() { return m_injectedBundlePath.get(); }
-    WKStringRef testPluginPath() { return m_testPluginPath.get(); }
+    WKStringRef testPluginDirectory() { return m_testPluginDirectory.get(); }
 
-    PlatformWebView* mainWebView() { return m_mainWebView; }
+    PlatformWebView* mainWebView() { return m_mainWebView.get(); }
     WKPageNamespaceRef pageNamespace() { return m_pageNamespace.get(); }
     WKContextRef context() { return m_context.get(); }
 
 private:
-    TestController();
-    ~TestController();
+    void initialize(int argc, const char* argv[]);
+    void run();
 
     void runTestingServerLoop();
     void runTest(const char* pathOrURL);
 
     void platformInitialize();
     void initializeInjectedBundlePath();
-    void initializeTestPluginPath();
+    void initializeTestPluginDirectory();
 
     // WKContextInjectedBundleClient
-    static void _didReceiveMessageFromInjectedBundle(WKContextRef context, WKStringRef message, const void*);
-    void didReceiveMessageFromInjectedBundle(WKStringRef message);
+    static void didReceiveMessageFromInjectedBundle(WKContextRef context, WKStringRef messageName, WKTypeRef messageBody, const void*);
+    void didReceiveMessageFromInjectedBundle(WKStringRef messageName, WKTypeRef messageBody);
 
     OwnPtr<TestInvocation> m_currentInvocation;
 
@@ -78,9 +76,9 @@ private:
     bool m_usingServerMode;
     std::vector<std::string> m_paths;
     WKRetainPtr<WKStringRef> m_injectedBundlePath;
-    WKRetainPtr<WKStringRef> m_testPluginPath;
+    WKRetainPtr<WKStringRef> m_testPluginDirectory;
 
-    PlatformWebView* m_mainWebView;
+    OwnPtr<PlatformWebView> m_mainWebView;
     WKRetainPtr<WKContextRef> m_context;
     WKRetainPtr<WKPageNamespaceRef> m_pageNamespace;
 };