diff options
author | Ben Murdoch <benm@google.com> | 2010-08-11 14:44:44 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2010-08-12 19:15:41 +0100 |
commit | dd8bb3de4f353a81954234999f1fea748aee2ea9 (patch) | |
tree | 729b52bf09294f0d6c67cd5ea80aee1b727b7bd8 /WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h | |
parent | f3d41ba51d86bf719c7a65ab5297aea3c17e2d98 (diff) | |
download | external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.zip external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.tar.gz external_webkit-dd8bb3de4f353a81954234999f1fea748aee2ea9.tar.bz2 |
Merge WebKit at r65072 : Initial merge by git.
Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
Diffstat (limited to 'WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h')
-rw-r--r-- | WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h b/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h index 42eb3a1..ba021b1 100644 --- a/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h +++ b/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h @@ -26,6 +26,8 @@ #ifndef InjectedBundle_h #define InjectedBundle_h +#include "EventSendingController.h" +#include "GCController.h" #include "LayoutTestController.h" #include <WebKit2/WKBase.h> #include <WebKit2/WKBundleBase.h> @@ -46,17 +48,19 @@ public: // Initialize the InjectedBundle. void initialize(WKBundleRef); - void done(); + WKBundleRef bundle() const { return m_bundle; } LayoutTestController* layoutTestController() { return m_layoutTestController.get(); } + 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(); } void closeOtherPages(); + void done(); std::ostringstream& os() { return m_outputStream; } - void setShouldTrackVisitedLinks(); - private: InjectedBundle(); ~InjectedBundle(); @@ -76,6 +80,8 @@ private: OwnPtr<InjectedBundlePage> m_mainPage; RefPtr<LayoutTestController> m_layoutTestController; + RefPtr<GCController> m_gcController; + RefPtr<EventSendingController> m_eventSendingController; std::ostringstream m_outputStream; }; |