summaryrefslogtreecommitdiffstats
path: root/WebKitTools/WebKitTestRunner/TestController.h
diff options
context:
space:
mode:
Diffstat (limited to 'WebKitTools/WebKitTestRunner/TestController.h')
-rw-r--r--WebKitTools/WebKitTestRunner/TestController.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/WebKitTools/WebKitTestRunner/TestController.h b/WebKitTools/WebKitTestRunner/TestController.h
index 7ad11fe..7e829b6 100644
--- a/WebKitTools/WebKitTestRunner/TestController.h
+++ b/WebKitTools/WebKitTestRunner/TestController.h
@@ -49,6 +49,7 @@ public:
bool verbose() const { return m_verbose; }
WKStringRef injectedBundlePath() { return m_injectedBundlePath.get(); }
+ WKStringRef testPluginPath() { return m_testPluginPath.get(); }
PlatformWebView* mainWebView() { return m_mainWebView; }
WKPageNamespaceRef pageNamespace() { return m_pageNamespace.get(); }
@@ -60,8 +61,10 @@ private:
void runTestingServerLoop();
void runTest(const char* pathOrURL);
-
+
+ void platformInitialize();
void initializeInjectedBundlePath();
+ void initializeTestPluginPath();
// WKContextInjectedBundleClient
static void _didRecieveMessageFromInjectedBundle(WKContextRef context, WKStringRef message, const void*);
@@ -69,15 +72,13 @@ private:
OwnPtr<TestInvocation> m_currentInvocation;
- bool m_dumpTree;
bool m_dumpPixels;
- bool m_threaded;
- bool m_forceComplexText;
bool m_verbose;
bool m_printSeparators;
bool m_usingServerMode;
std::vector<std::string> m_paths;
WKRetainPtr<WKStringRef> m_injectedBundlePath;
+ WKRetainPtr<WKStringRef> m_testPluginPath;
PlatformWebView* m_mainWebView;
WKRetainPtr<WKContextRef> m_context;