diff options
author | Steve Block <steveblock@google.com> | 2011-01-05 12:15:11 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-01-06 14:14:00 +0000 |
commit | d06194330da2bb8da887d2e1adeacb3a5c1504b2 (patch) | |
tree | e0af8413af65a8e30630563441af7bdb8478e513 /WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h | |
parent | 419a5cf2f8db6ca014df624865197ffb82caad37 (diff) | |
download | external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.zip external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.tar.gz external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.tar.bz2 |
Merge WebKit at r72805: Initial merge by Git
Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.
Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790
Diffstat (limited to 'WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h')
-rw-r--r-- | WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h b/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h index c1d8b37..2c6d14b 100644 --- a/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h +++ b/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundle.h @@ -48,7 +48,6 @@ public: void initialize(WKBundleRef); WKBundleRef bundle() const { return m_bundle; } - WKBundlePageGroupRef pageGroup() const { return m_pageGroup; } LayoutTestController* layoutTestController() { return m_layoutTestController.get(); } GCController* gcController() { return m_gcController.get(); } @@ -71,18 +70,15 @@ private: static void didCreatePage(WKBundleRef, WKBundlePageRef, const void* clientInfo); static void willDestroyPage(WKBundleRef, WKBundlePageRef, const void* clientInfo); - static void didInitializePageGroup(WKBundleRef, WKBundlePageGroupRef, const void* clientInfo); - static void didReceiveMessage(WKBundleRef, WKStringRef messageName, WKTypeRef messageBody, const void* clientInfo); + static void didReceiveMessage(WKBundleRef, WKStringRef messageName, WKTypeRef messageBody, const void *clientInfo); void didCreatePage(WKBundlePageRef); void willDestroyPage(WKBundlePageRef); - void didInitializePageGroup(WKBundlePageGroupRef); void didReceiveMessage(WKStringRef messageName, WKTypeRef messageBody); void beginTesting(); WKBundleRef m_bundle; - WKBundlePageGroupRef m_pageGroup; Vector<OwnPtr<InjectedBundlePage> > m_pages; RefPtr<LayoutTestController> m_layoutTestController; |