diff options
| author | Iain Merrick <husky@google.com> | 2010-08-19 17:55:56 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-08-23 11:05:40 +0100 |
| commit | f486d19d62f1bc33246748b14b14a9dfa617b57f (patch) | |
| tree | 195485454c93125455a30e553a73981c3816144d /WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h | |
| parent | 6ba0b43722d16bc295606bec39f396f596e4fef1 (diff) | |
| download | external_webkit-f486d19d62f1bc33246748b14b14a9dfa617b57f.zip external_webkit-f486d19d62f1bc33246748b14b14a9dfa617b57f.tar.gz external_webkit-f486d19d62f1bc33246748b14b14a9dfa617b57f.tar.bz2 | |
Merge WebKit at r65615 : Initial merge by git.
Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
Diffstat (limited to 'WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h')
| -rw-r--r-- | WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h b/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h index ba021b1..d094f42 100644 --- a/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h +++ b/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h @@ -61,6 +61,8 @@ public: void done(); std::ostringstream& os() { return m_outputStream; } + bool isTestRunning() { return m_state == Testing; } + private: InjectedBundle(); ~InjectedBundle(); @@ -73,7 +75,7 @@ private: void willDestroyPage(WKBundlePageRef page); void didReceiveMessage(WKStringRef messageName, WKTypeRef messageBody); - void reset(); + void beginTesting(); WKBundleRef m_bundle; HashMap<WKBundlePageRef, InjectedBundlePage*> m_otherPages; @@ -84,6 +86,12 @@ private: RefPtr<EventSendingController> m_eventSendingController; std::ostringstream m_outputStream; + + enum State { + Idle, + Testing + }; + State m_state; }; } // namespace WTR |