Merge WebKit at r65615 : Initial merge by git.

Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79

1 files changed, 19 insertions, 0 deletions

diff --git a/WebKitTools/WebKitTestRunner/TestController.h b/WebKitTools/WebKitTestRunner/TestController.h
index 5754728..5f6d99d 100644
--- a/WebKitTools/WebKitTestRunner/TestController.h
+++ b/WebKitTools/WebKitTestRunner/TestController.h
@@ -53,6 +53,9 @@ public:
     WKPageNamespaceRef pageNamespace() { return m_pageNamespace.get(); }
     WKContextRef context() { return m_context.get(); }
 
+    // Helper
+    static void runUntil(bool& done);
+
 private:
     void initialize(int argc, const char* argv[]);
     void run();
@@ -61,13 +64,21 @@ private:
     void runTest(const char* pathOrURL);
 
     void platformInitialize();
+    void platformInitializeContext();
     void initializeInjectedBundlePath();
     void initializeTestPluginDirectory();
 
+    void resetStateToConsistentValues();
+
     // WKContextInjectedBundleClient
     static void didReceiveMessageFromInjectedBundle(WKContextRef context, WKStringRef messageName, WKTypeRef messageBody, const void*);
     void didReceiveMessageFromInjectedBundle(WKStringRef messageName, WKTypeRef messageBody);
 
+    // WKPageLoaderClient
+    static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, const void*);
+    void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame);
+
+
     OwnPtr<TestInvocation> m_currentInvocation;
 
     bool m_dumpPixels;
@@ -81,6 +92,14 @@ private:
     OwnPtr<PlatformWebView> m_mainWebView;
     WKRetainPtr<WKContextRef> m_context;
     WKRetainPtr<WKPageNamespaceRef> m_pageNamespace;
+    
+    enum State {
+        Initial,
+        Resetting,
+        RunningTest
+    };
+    State m_state;
+    bool m_doneResetting;
 };
 
 } // namespace WTR