1 files changed, 18 insertions, 9 deletions
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/LayoutTestController.h b/WebKitTools/WebKitTestRunner/InjectedBundle/LayoutTestController.h
index 203f358..f9585a3 100644
--- a/WebKitTools/WebKitTestRunner/InjectedBundle/LayoutTestController.h
+++ b/WebKitTools/WebKitTestRunner/InjectedBundle/LayoutTestController.h
@@ -26,30 +26,40 @@
 #ifndef LayoutTestController_h
 #define LayoutTestController_h
 
+#include "JSWrappable.h"
 #include <JavaScriptCore/JavaScriptCore.h>
 #include <wtf/PassRefPtr.h>
-#include <wtf/RefCounted.h>
 #include <wtf/RetainPtr.h>
 #include <string>
 
 namespace WTR {
 
-class LayoutTestController : public RefCounted<LayoutTestController> {
+class LayoutTestController : public JSWrappable {
 public:
     static PassRefPtr<LayoutTestController> create(const std::string& testPathOrURL);
     ~LayoutTestController();
 
+    // JSWrappable
+    JSClassRef wrapperClass();
+
     void makeWindowObject(JSContextRef context, JSObjectRef windowObject, JSValueRef* exception);
 
-    bool dumpAsText() const { return m_dumpAsText; }
-    void setDumpAsText(bool dumpAsText) { m_dumpAsText = dumpAsText; }
+    bool shouldDumpAsText() const { return m_dumpAsText; }
+    void dumpAsText() { m_dumpAsText = true; }
+
+    bool shouldDumpStatusCallbacks() const { return m_dumpStatusCallbacks; }
+    void dumpStatusCallbacks() { m_dumpStatusCallbacks = true; }
 
     bool waitToDump() const { return m_waitToDump; }
-    void setWaitToDump();
     void waitToDumpWatchdogTimerFired();
     void invalidateWaitToDumpWatchdog();
+    void waitUntilDone();
     void notifyDone();
 
+    void testRepaint() { m_testRepaint = true; }
+    void repaintSweepHorizontally() { m_testRepaintSweepHorizontally = true; }
+    void display();
+
     unsigned numberOfActiveAnimations() const;
     bool pauseAnimationAtTimeOnElementWithId(JSStringRef animationName, double time, JSStringRef elementId);
 
@@ -57,15 +67,14 @@ private:
     LayoutTestController(const std::string& testPathOrURL);
 
     bool m_dumpAsText;
+    bool m_dumpStatusCallbacks;
     bool m_waitToDump; // True if waitUntilDone() has been called, but notifyDone() has not yet been called.
+    bool m_testRepaint;
+    bool m_testRepaintSweepHorizontally;
 
     std::string m_testPathOrURL;
     
     RetainPtr<CFRunLoopTimerRef> m_waitToDumpWatchdog;
-
-    static JSClassRef getJSClass();
-    static JSStaticValue* staticValues();
-    static JSStaticFunction* staticFunctions();
 };
 
 } // namespace WTR