diff options
author | Ben Murdoch <benm@google.com> | 2009-08-11 17:01:47 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2009-08-11 18:21:02 +0100 |
commit | 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 (patch) | |
tree | 2943df35f62d885c89d01063cc528dd73b480fea /WebCore/loader/EmptyClients.h | |
parent | 7e7a70bfa49a1122b2597a1e6367d89eb4035eca (diff) | |
download | external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.zip external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.gz external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.bz2 |
Merge in WebKit r47029.
Diffstat (limited to 'WebCore/loader/EmptyClients.h')
-rw-r--r-- | WebCore/loader/EmptyClients.h | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/WebCore/loader/EmptyClients.h b/WebCore/loader/EmptyClients.h index f93a878..3f70c43 100644 --- a/WebCore/loader/EmptyClients.h +++ b/WebCore/loader/EmptyClients.h @@ -95,7 +95,7 @@ public: virtual void setResizable(bool) { } - virtual void addMessageToConsole(MessageSource, MessageLevel, const String&, unsigned, const String&) { } + virtual void addMessageToConsole(MessageSource, MessageType, MessageLevel, const String&, unsigned, const String&) { } virtual bool canRunBeforeUnloadConfirmPanel() { return false; } virtual bool runBeforeUnloadConfirmPanel(const String&, Frame*) { return true; } @@ -125,7 +125,7 @@ public: virtual void mouseDidMoveOverElement(const HitTestResult&, unsigned) { } - virtual void setToolTip(const String&) { } + virtual void setToolTip(const String&, TextDirection) { } virtual void print(Frame*) { } @@ -141,6 +141,9 @@ public: virtual void formStateDidChange(const Node*) { } + virtual void formDidFocus(const Node*) { } + virtual void formDidBlur(const Node*) { } + virtual PassOwnPtr<HTMLParserQuirks> createHTMLParserQuirks() { return 0; } virtual bool setCursor(PlatformCursorHandle) { return false; } @@ -148,6 +151,12 @@ public: virtual void scrollRectIntoView(const IntRect&, const ScrollView*) const {} virtual void requestGeolocationPermissionForFrame(Frame*, Geolocation*) {} + +#if USE(ACCELERATED_COMPOSITING) + virtual void attachRootGraphicsLayer(Frame*, GraphicsLayer*) {}; + virtual void setNeedsOneShotDrawingSynchronization() {}; + virtual void scheduleCompositingLayerSync() {}; +#endif }; class EmptyFrameLoaderClient : public FrameLoaderClient { @@ -273,8 +282,8 @@ public: virtual bool canCachePage() const { return false; } virtual PassRefPtr<Frame> createFrame(const KURL&, const String&, HTMLFrameOwnerElement*, const String&, bool, int, int) { return 0; } - virtual Widget* createPlugin(const IntSize&, HTMLPlugInElement*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool) { return 0; } - virtual Widget* createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const KURL&, const Vector<String>&, const Vector<String>&) { return 0; } + 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; } virtual ObjectContentType objectContentType(const KURL&, const String&) { return ObjectContentType(); } virtual String overrideMediaType() const { return String(); } @@ -286,6 +295,12 @@ public: virtual void registerForIconNotification(bool) { } +#if USE(V8) + virtual void didCreateScriptContextForFrame() { } + virtual void didDestroyScriptContextForFrame() { } + virtual void didCreateIsolatedScriptContext() { } +#endif + #if PLATFORM(MAC) virtual NSCachedURLResponse* willCacheResponse(DocumentLoader*, unsigned long, NSCachedURLResponse* response) const { return response; } #endif @@ -411,6 +426,7 @@ public: virtual void copyImageToClipboard(const HitTestResult&) { } virtual void searchWithGoogle(const Frame*) { } virtual void lookUpInDictionary(Frame*) { } + virtual bool isSpeaking() { return false; } virtual void speak(const String&) { } virtual void stopSpeaking() { } @@ -458,6 +474,8 @@ public: virtual void populateSetting(const String&, InspectorController::Setting&) { } virtual void storeSetting(const String&, const InspectorController::Setting&) { } virtual void removeSetting(const String&) { } + + virtual void inspectorWindowObjectCleared() { } }; } |