diff options
author | Steve Block <steveblock@google.com> | 2009-12-15 10:12:09 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2009-12-17 17:41:10 +0000 |
commit | 643ca7872b450ea4efacab6188849e5aac2ba161 (patch) | |
tree | 6982576c228bcd1a7efe98afed544d840751094c /WebCore/loader/EmptyClients.h | |
parent | d026980fde6eb3b01c1fe49441174e89cd1be298 (diff) | |
download | external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.zip external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.tar.gz external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.tar.bz2 |
Merge webkit.org at r51976 : Initial merge by git.
Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
Diffstat (limited to 'WebCore/loader/EmptyClients.h')
-rw-r--r-- | WebCore/loader/EmptyClients.h | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/WebCore/loader/EmptyClients.h b/WebCore/loader/EmptyClients.h index 5fcd4cd..c6ae799 100644 --- a/WebCore/loader/EmptyClients.h +++ b/WebCore/loader/EmptyClients.h @@ -80,6 +80,8 @@ public: virtual bool canTakeFocus(FocusDirection) { return false; } virtual void takeFocus(FocusDirection) { } + virtual void focusedNodeChanged(Node*) { } + virtual Page* createWindow(Frame*, const FrameLoadRequest&, const WindowFeatures&) { return 0; } virtual void show() { } @@ -204,6 +206,9 @@ public: virtual void dispatchDidCancelClientRedirect() { } virtual void dispatchWillPerformClientRedirect(const KURL&, double, double) { } virtual void dispatchDidChangeLocationWithinPage() { } + virtual void dispatchDidPushStateWithinPage() { } + virtual void dispatchDidReplaceStateWithinPage() { } + virtual void dispatchDidPopStateWithinPage() { } virtual void dispatchWillClose() { } virtual void dispatchDidReceiveIcon() { } virtual void dispatchDidStartProvisionalLoad() { } @@ -283,8 +288,13 @@ public: virtual void updateGlobalHistory() { } virtual void updateGlobalHistoryRedirectLinks() { } virtual bool shouldGoToHistoryItem(HistoryItem*) const { return false; } +<<<<<<< HEAD:WebCore/loader/EmptyClients.h virtual void dispatchDidAddBackForwardItem(HistoryItem*) const { } virtual void dispatchDidRemoveBackForwardItem(HistoryItem*) const { } +======= + virtual void dispatchDidAddBackForwardItem(HistoryItem*) const { } + virtual void dispatchDidRemoveBackForwardItem(HistoryItem*) const { }; +>>>>>>> webkit.org at r51976:WebCore/loader/EmptyClients.h virtual void dispatchDidChangeBackForwardIndex() const { } virtual void saveViewStateToItem(HistoryItem*) { } virtual bool canCachePage() const { return false; } @@ -298,7 +308,7 @@ public: virtual String overrideMediaType() const { return String(); } virtual void redirectDataToPlugin(Widget*) { } - virtual void windowObjectCleared() { } + virtual void dispatchDidClearWindowObjectInWorld(DOMWrapperWorld*) { } virtual void documentElementAvailable() { } virtual void didPerformFirstNavigation() const { } @@ -484,20 +494,12 @@ public: virtual void hideHighlight() { } virtual void inspectedURLChanged(const String&) { } - virtual void populateSetting(const String&, InspectorController::Setting&) { } - virtual void storeSetting(const String&, const InspectorController::Setting&) { } - virtual void removeSetting(const String&) { } + virtual void populateSetting(const String&, String*) { } + virtual void storeSetting(const String&, const String&) { } virtual void inspectorWindowObjectCleared() { } }; -class EmptyPluginHalterClient : public PluginHalterClient -{ -public: - virtual bool shouldHaltPlugin(Node*) const { return false; } - virtual bool enabled() const { return false; } -}; - } #endif // EmptyClients_h |