diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-06 12:50:54 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-10 15:38:33 +0100 |
| commit | a2f40ea74a5aafd6112542dde371e8a3916c5e5a (patch) | |
| tree | c2b429aee62a1b0624c1f97585c6a244378027fb /WebKit/android/WebCoreSupport | |
| parent | a03ee8c22965a587969693e22422a24981089ccf (diff) | |
| download | external_webkit-a2f40ea74a5aafd6112542dde371e8a3916c5e5a.zip external_webkit-a2f40ea74a5aafd6112542dde371e8a3916c5e5a.tar.gz external_webkit-a2f40ea74a5aafd6112542dde371e8a3916c5e5a.tar.bz2 | |
Merge WebKit at r74534: Fix EditorClientAndroid.cpp (getGuessesForWord)
Update function signature of EditorClient::getGuessesForWord to
match upstream change.
See http://trac.webkit.org/changeset/73088
Change-Id: Iedffbb3216a0da036f5ea61f6b282d50f50b2d0f
Diffstat (limited to 'WebKit/android/WebCoreSupport')
| -rw-r--r-- | WebKit/android/WebCoreSupport/EditorClientAndroid.cpp | 2 | ||||
| -rw-r--r-- | WebKit/android/WebCoreSupport/EditorClientAndroid.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/WebKit/android/WebCoreSupport/EditorClientAndroid.cpp b/WebKit/android/WebCoreSupport/EditorClientAndroid.cpp index 3c5243e..88f539e 100644 --- a/WebKit/android/WebCoreSupport/EditorClientAndroid.cpp +++ b/WebKit/android/WebCoreSupport/EditorClientAndroid.cpp @@ -220,7 +220,7 @@ void EditorClientAndroid::redo() {} // functions new to Jun-07 tip of tree merge: void EditorClientAndroid::showSpellingUI(bool) {} -void EditorClientAndroid::getGuessesForWord(String const&, WTF::Vector<String>&) {} +void EditorClientAndroid::getGuessesForWord(String const&, const String&, WTF::Vector<String>&) {} bool EditorClientAndroid::spellingUIIsShowing() { return false; } void EditorClientAndroid::checkGrammarOfString(unsigned short const*, int, WTF::Vector<GrammarDetail>&, int*, int*) {} void EditorClientAndroid::checkSpellingOfString(unsigned short const*, int, int*, int*) {} diff --git a/WebKit/android/WebCoreSupport/EditorClientAndroid.h b/WebKit/android/WebCoreSupport/EditorClientAndroid.h index 9aed88c..348225b 100644 --- a/WebKit/android/WebCoreSupport/EditorClientAndroid.h +++ b/WebKit/android/WebCoreSupport/EditorClientAndroid.h @@ -109,7 +109,7 @@ public: virtual void updateSpellingUIWithMisspelledWord(const String&); virtual void showSpellingUI(bool show); virtual bool spellingUIIsShowing(); - virtual void getGuessesForWord(const String&, WTF::Vector<String>& guesses); + virtual void getGuessesForWord(const String&, const String& context, WTF::Vector<String>& guesses); virtual void willSetInputMethodState(); virtual void setInputMethodState(bool); |