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 /WebCore/loader/EmptyClients.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 'WebCore/loader/EmptyClients.h')
| -rw-r--r-- | WebCore/loader/EmptyClients.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/WebCore/loader/EmptyClients.h b/WebCore/loader/EmptyClients.h index 6fb003e..59be8b1 100644 --- a/WebCore/loader/EmptyClients.h +++ b/WebCore/loader/EmptyClients.h @@ -107,7 +107,7 @@ public: virtual void focusedNodeChanged(Node*) { } - virtual Page* createWindow(Frame*, const FrameLoadRequest&, const WindowFeatures&) { return 0; } + virtual Page* createWindow(Frame*, const FrameLoadRequest&, const WindowFeatures&, const NavigationAction&) { return 0; } virtual void show() { } virtual bool canRunModal() { return false; } @@ -263,7 +263,7 @@ public: virtual void dispatchDidFirstLayout() { } virtual void dispatchDidFirstVisuallyNonEmptyLayout() { } - virtual Frame* dispatchCreatePage() { return 0; } + virtual Frame* dispatchCreatePage(const NavigationAction&) { return 0; } virtual void dispatchShow() { } virtual void dispatchDecidePolicyForMIMEType(FramePolicyFunction, const String&, const ResourceRequest&) { } @@ -329,6 +329,8 @@ public: virtual void transitionToCommittedFromCachedFrame(CachedFrame*) { } virtual void transitionToCommittedForNewPage() { } + virtual void dispatchDidBecomeFrameset(bool) { } + virtual void updateGlobalHistory() { } virtual void updateGlobalHistoryRedirectLinks() { } virtual bool shouldGoToHistoryItem(HistoryItem*) const { return false; } @@ -341,6 +343,7 @@ public: virtual void didRunInsecureContent(SecurityOrigin*) { } virtual PassRefPtr<Frame> createFrame(const KURL&, const String&, HTMLFrameOwnerElement*, const String&, bool, int, int) { return 0; } virtual void didTransferChildFrameToNewDocument(Page*) { } + virtual void transferLoadingResourceFromPage(unsigned long, DocumentLoader*, const ResourceRequest&, Page*) { } virtual PassRefPtr<Widget> createPlugin(const IntSize&, HTMLPlugInElement*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool) { return 0; } virtual PassRefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const KURL&, const Vector<String>&, const Vector<String>&) { return 0; } #if ENABLE(PLUGIN_PROXY_FOR_VIDEO) |