diff options
author | Iain Merrick <husky@google.com> | 2010-09-13 16:35:48 +0100 |
---|---|---|
committer | Iain Merrick <husky@google.com> | 2010-09-16 12:10:42 +0100 |
commit | 5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306 (patch) | |
tree | ddce1aa5e3b6967a69691892e500897558ff8ab6 /WebCore/loader/EmptyClients.h | |
parent | 12bec63ec71e46baba27f0bd9bd9d8067683690a (diff) | |
download | external_webkit-5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306.zip external_webkit-5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306.tar.gz external_webkit-5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306.tar.bz2 |
Merge WebKit at r67178 : Initial merge by git.
Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18
Diffstat (limited to 'WebCore/loader/EmptyClients.h')
-rw-r--r-- | WebCore/loader/EmptyClients.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/WebCore/loader/EmptyClients.h b/WebCore/loader/EmptyClients.h index 32722d6..e012b64 100644 --- a/WebCore/loader/EmptyClients.h +++ b/WebCore/loader/EmptyClients.h @@ -40,6 +40,7 @@ #include "FloatRect.h" #include "FocusDirection.h" #include "FrameLoaderClient.h" +#include "FrameNetworkingContext.h" #include "InspectorClient.h" #include "PluginHalterClient.h" #include "PopupMenu.h" @@ -61,6 +62,8 @@ namespace WebCore { +class SharedGraphicsContext3D; + class EmptyPopupMenu : public PopupMenu { public: virtual void show(const IntRect&, FrameView*, int) {} @@ -194,9 +197,9 @@ public: virtual void cancelGeolocationPermissionRequestForFrame(Frame*, Geolocation*) {} #if USE(ACCELERATED_COMPOSITING) - virtual void attachRootGraphicsLayer(Frame*, GraphicsLayer*) {}; - virtual void setNeedsOneShotDrawingSynchronization() {}; - virtual void scheduleCompositingLayerSync() {}; + virtual void attachRootGraphicsLayer(Frame*, GraphicsLayer*) {} + virtual void setNeedsOneShotDrawingSynchronization() {} + virtual void scheduleCompositingLayerSync() {} #endif #if PLATFORM(WIN) @@ -372,6 +375,7 @@ public: virtual bool shouldCacheResponse(DocumentLoader*, unsigned long, const ResourceResponse&, const unsigned char*, unsigned long long) { return true; } #endif + virtual PassRefPtr<FrameNetworkingContext> createNetworkingContext() { return PassRefPtr<FrameNetworkingContext>(); } }; class EmptyEditorClient : public EditorClient, public Noncopyable { |