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 /WebKit/efl/WebCoreSupport | |
| 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 'WebKit/efl/WebCoreSupport')
| -rw-r--r-- | WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp | 3 | ||||
| -rw-r--r-- | WebKit/efl/WebCoreSupport/ChromeClientEfl.h | 2 | ||||
| -rw-r--r-- | WebKit/efl/WebCoreSupport/EditorClientEfl.cpp | 5 | ||||
| -rw-r--r-- | WebKit/efl/WebCoreSupport/EditorClientEfl.h | 1 |
4 files changed, 8 insertions, 3 deletions
diff --git a/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp b/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp index 342654a..4b01b75 100644 --- a/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp +++ b/WebKit/efl/WebCoreSupport/ChromeClientEfl.cpp @@ -437,10 +437,9 @@ void ChromeClientEfl::formStateDidChange(const Node*) notImplemented(); } -bool ChromeClientEfl::setCursor(PlatformCursorHandle) +void ChromeClientEfl::setCursor(const Cursor&) { notImplemented(); - return false; } void ChromeClientEfl::requestGeolocationPermissionForFrame(Frame*, Geolocation*) diff --git a/WebKit/efl/WebCoreSupport/ChromeClientEfl.h b/WebKit/efl/WebCoreSupport/ChromeClientEfl.h index 45bda59..ce8abd1 100644 --- a/WebKit/efl/WebCoreSupport/ChromeClientEfl.h +++ b/WebKit/efl/WebCoreSupport/ChromeClientEfl.h @@ -119,7 +119,7 @@ public: virtual PassOwnPtr<HTMLParserQuirks> createHTMLParserQuirks() { return 0; } - virtual bool setCursor(PlatformCursorHandle); + virtual void setCursor(const Cursor&); virtual void scrollRectIntoView(const IntRect&, const ScrollView*) const {} diff --git a/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp b/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp index 3c4016f..cf672eb 100644 --- a/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp +++ b/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp @@ -40,6 +40,11 @@ using namespace WebCore; namespace WebCore { +void EditorClientEfl::willSetInputMethodState() +{ + notImplemented(); +} + void EditorClientEfl::setInputMethodState(bool active) { notImplemented(); diff --git a/WebKit/efl/WebCoreSupport/EditorClientEfl.h b/WebKit/efl/WebCoreSupport/EditorClientEfl.h index a53d624..9f60cfb 100644 --- a/WebKit/efl/WebCoreSupport/EditorClientEfl.h +++ b/WebKit/efl/WebCoreSupport/EditorClientEfl.h @@ -111,6 +111,7 @@ public: virtual void showSpellingUI(bool show); virtual bool spellingUIIsShowing(); virtual void getGuessesForWord(const String&, WTF::Vector<String>& guesses); + virtual void willSetInputMethodState(); virtual void setInputMethodState(bool enabled); private: |