diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-09-08 12:18:00 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-09-11 12:08:58 +0100 |
| commit | 5ddde30071f639962dd557c453f2ad01f8f0fd00 (patch) | |
| tree | 775803c4ab35af50aa5f5472cd1fb95fe9d5152d /WebCore/loader/EmptyClients.h | |
| parent | 3e63d9b33b753ca86d0765d1b3d711114ba9e34f (diff) | |
| download | external_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.zip external_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.tar.gz external_webkit-5ddde30071f639962dd557c453f2ad01f8f0fd00.tar.bz2 | |
Merge WebKit at r66666 : Initial merge by git.
Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
Diffstat (limited to 'WebCore/loader/EmptyClients.h')
| -rw-r--r-- | WebCore/loader/EmptyClients.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/WebCore/loader/EmptyClients.h b/WebCore/loader/EmptyClients.h index 0d30713..32722d6 100644 --- a/WebCore/loader/EmptyClients.h +++ b/WebCore/loader/EmptyClients.h @@ -46,10 +46,6 @@ #include "ResourceError.h" #include "SearchPopupMenu.h" -#if USE(GLES2_RENDERING) -#include "GLES2Context.h" -#endif - /* This file holds empty Client stubs for use by WebCore. Viewless element needs to create a dummy Page->Frame->FrameView tree for use in parsing or executing JavaScript. @@ -203,11 +199,6 @@ public: virtual void scheduleCompositingLayerSync() {}; #endif -#if USE(GLES2_RENDERING) - virtual PassOwnPtr<GLES2Context> getOnscreenGLES2Context() { return 0; } - virtual PassOwnPtr<GLES2Context> getOffscreenGLES2Context() { return 0; } -#endif - #if PLATFORM(WIN) virtual void setLastSetCursorToCurrentCursor() { } #endif @@ -477,6 +468,10 @@ public: #if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) virtual void checkTextOfParagraph(const UChar*, int, uint64_t, Vector<TextCheckingResult>&) { }; #endif +#if PLATFORM(MAC) && !defined(BUILDING_ON_TIGER) && !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD) + virtual void showCorrectionPanel(const FloatRect&, const String&, const String&, Editor*) { } + virtual void dismissCorrectionPanel(bool) { } +#endif virtual void updateSpellingUIWithGrammarString(const String&, const GrammarDetail&) { } virtual void updateSpellingUIWithMisspelledWord(const String&) { } virtual void showSpellingUI(bool) { } |