diff options
| author | Ben Murdoch <benm@google.com> | 2010-07-22 15:37:06 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-07-27 10:20:25 +0100 |
| commit | 967717af5423377c967781471ee106e2bb4e11c8 (patch) | |
| tree | 1e701dc0a12f7f07cce1df4a7681717de77a211b /WebCore/loader/EmptyClients.h | |
| parent | dcc30a9fca45f634b1d3a12b276d3a0ccce99fc3 (diff) | |
| download | external_webkit-967717af5423377c967781471ee106e2bb4e11c8.zip external_webkit-967717af5423377c967781471ee106e2bb4e11c8.tar.gz external_webkit-967717af5423377c967781471ee106e2bb4e11c8.tar.bz2 | |
Merge WebKit at r63859 : Initial merge by git.
Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
Diffstat (limited to 'WebCore/loader/EmptyClients.h')
| -rw-r--r-- | WebCore/loader/EmptyClients.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/WebCore/loader/EmptyClients.h b/WebCore/loader/EmptyClients.h index 869de22..aab30fc 100644 --- a/WebCore/loader/EmptyClients.h +++ b/WebCore/loader/EmptyClients.h @@ -157,7 +157,7 @@ public: virtual PassOwnPtr<HTMLParserQuirks> createHTMLParserQuirks() { return 0; } - virtual bool setCursor(PlatformCursorHandle) { return false; } + virtual void setCursor(const Cursor&) { } virtual void scrollRectIntoView(const IntRect&, const ScrollView*) const {} @@ -170,6 +170,9 @@ public: virtual void scheduleCompositingLayerSync() {}; #endif +#if PLATFORM(WIN) + virtual void setLastSetCursorToCurrentCursor() { } +#endif #if ENABLE(TOUCH_EVENTS) virtual void needTouchEvents(bool) { } #endif @@ -309,6 +312,8 @@ public: virtual PassRefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const KURL&, const Vector<String>&, const Vector<String>&) { return 0; } #if ENABLE(PLUGIN_PROXY_FOR_VIDEO) virtual PassRefPtr<Widget> createMediaPlayerProxyPlugin(const IntSize&, HTMLMediaElement*, const KURL&, const Vector<String>&, const Vector<String>&, const String&) { return 0; } + virtual void hideMediaPlayerProxyPlugin(Widget*) { } + virtual void showMediaPlayerProxyPlugin(Widget*) { } #endif virtual ObjectContentType objectContentType(const KURL&, const String&) { return ObjectContentType(); } @@ -439,6 +444,7 @@ public: virtual void showSpellingUI(bool) { } virtual bool spellingUIIsShowing() { return false; } virtual void getGuessesForWord(const String&, Vector<String>&) { } + virtual void willSetInputMethodState() { } virtual void setInputMethodState(bool) { } |