diff options
author | John Reck <jreck@google.com> | 2010-11-04 12:00:17 -0700 |
---|---|---|
committer | John Reck <jreck@google.com> | 2010-11-09 11:35:04 -0800 |
commit | e14391e94c850b8bd03680c23b38978db68687a8 (patch) | |
tree | 3fed87e6620fecaf3edc7259ae58a11662bedcb2 /WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h | |
parent | 1bd705833a68f07850cf7e204b26f8d328d16951 (diff) | |
download | external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.zip external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.tar.gz external_webkit-e14391e94c850b8bd03680c23b38978db68687a8.tar.bz2 |
Merge Webkit at r70949: Initial merge by git.
Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
Diffstat (limited to 'WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h')
-rw-r--r-- | WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h b/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h index 6c5c69e..2c6d14b 100644 --- a/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h +++ b/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h @@ -30,9 +30,9 @@ #include "GCController.h" #include "LayoutTestController.h" #include <WebKit2/WKBase.h> -#include <wtf/HashMap.h> #include <wtf/OwnPtr.h> #include <wtf/RefPtr.h> +#include <wtf/Vector.h> #include <sstream> @@ -53,10 +53,12 @@ public: GCController* gcController() { return m_gcController.get(); } EventSendingController* eventSendingController() { return m_eventSendingController.get(); } - InjectedBundlePage* page() { return m_mainPage.get(); } - size_t pageCount() { return !!m_mainPage + m_otherPages.size(); } + InjectedBundlePage* page() const; + size_t pageCount() const { return m_pages.size(); } void closeOtherPages(); + void dumpBackForwardListsForAllPages(); + void done(); std::ostringstream& os() { return m_outputStream; } @@ -66,19 +68,18 @@ private: InjectedBundle(); ~InjectedBundle(); - 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 messageName, WKTypeRef messageBody, const void *clientInfo); + static void didCreatePage(WKBundleRef, WKBundlePageRef, const void* clientInfo); + static void willDestroyPage(WKBundleRef, WKBundlePageRef, const void* clientInfo); + static void didReceiveMessage(WKBundleRef, WKStringRef messageName, WKTypeRef messageBody, const void *clientInfo); - void didCreatePage(WKBundlePageRef page); - void willDestroyPage(WKBundlePageRef page); + void didCreatePage(WKBundlePageRef); + void willDestroyPage(WKBundlePageRef); void didReceiveMessage(WKStringRef messageName, WKTypeRef messageBody); void beginTesting(); WKBundleRef m_bundle; - HashMap<WKBundlePageRef, InjectedBundlePage*> m_otherPages; - OwnPtr<InjectedBundlePage> m_mainPage; + Vector<OwnPtr<InjectedBundlePage> > m_pages; RefPtr<LayoutTestController> m_layoutTestController; RefPtr<GCController> m_gcController; |