diff options
author | Steve Block <steveblock@google.com> | 2010-08-04 11:41:34 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2010-08-09 12:04:44 +0100 |
commit | db14019a23d96bc8a444b6576a5da8bd1cfbc8b0 (patch) | |
tree | 9f793c5b0f5e1f2aca8247158920e2c4bf962bbf /WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h | |
parent | bf916837aa84f1e4b00e6ed6268516c2acd27545 (diff) | |
download | external_webkit-db14019a23d96bc8a444b6576a5da8bd1cfbc8b0.zip external_webkit-db14019a23d96bc8a444b6576a5da8bd1cfbc8b0.tar.gz external_webkit-db14019a23d96bc8a444b6576a5da8bd1cfbc8b0.tar.bz2 |
Merge WebKit at r64523 : Initial merge by git.
Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4
Diffstat (limited to 'WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h')
-rw-r--r-- | WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h b/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h index 9bda922..42eb3a1 100644 --- a/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h +++ b/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h @@ -30,6 +30,7 @@ #include <WebKit2/WKBase.h> #include <WebKit2/WKBundleBase.h> #include <wtf/HashMap.h> +#include <wtf/OwnPtr.h> #include <wtf/RefPtr.h> #include <sstream> @@ -48,7 +49,9 @@ public: void done(); LayoutTestController* layoutTestController() { return m_layoutTestController.get(); } - InjectedBundlePage* page() { return m_mainPage; } + InjectedBundlePage* page() { return m_mainPage.get(); } + size_t pageCount() { return !!m_mainPage + m_otherPages.size(); } + void closeOtherPages(); std::ostringstream& os() { return m_outputStream; } @@ -60,17 +63,17 @@ private: static void _didCreatePage(WKBundleRef bundle, WKBundlePageRef page, const void* clientInfo); static void _willDestroyPage(WKBundleRef bundle, WKBundlePageRef page, const void* clientInfo); - static void _didReceiveMessage(WKBundleRef bundle, WKStringRef message, const void *clientInfo); + static void _didReceiveMessage(WKBundleRef bundle, WKStringRef messageName, WKTypeRef messageBody, const void *clientInfo); void didCreatePage(WKBundlePageRef page); void willDestroyPage(WKBundlePageRef page); - void didReceiveMessage(WKStringRef message); + void didReceiveMessage(WKStringRef messageName, WKTypeRef messageBody); void reset(); WKBundleRef m_bundle; - HashMap<WKBundlePageRef, InjectedBundlePage*> m_pages; - InjectedBundlePage* m_mainPage; + HashMap<WKBundlePageRef, InjectedBundlePage*> m_otherPages; + OwnPtr<InjectedBundlePage> m_mainPage; RefPtr<LayoutTestController> m_layoutTestController; |