summaryrefslogtreecommitdiffstats
path: root/WebKit/android/WebCoreSupport/EditorClientAndroid.h
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-01-05 12:35:52 +0000
committerSteve Block <steveblock@google.com>2011-01-06 14:22:41 +0000
commit353cbe2f737d16a1f407282098a580123a4588cc (patch)
tree96c0e80894d811b15efbcbbbbeed167241ca2efe /WebKit/android/WebCoreSupport/EditorClientAndroid.h
parente509b5dfedf2a9cb61dacd53b55bed4ba34f0974 (diff)
downloadexternal_webkit-353cbe2f737d16a1f407282098a580123a4588cc.zip
external_webkit-353cbe2f737d16a1f407282098a580123a4588cc.tar.gz
external_webkit-353cbe2f737d16a1f407282098a580123a4588cc.tar.bz2
Merge WebKit at r72805: Update EditorClient::getGuessesForWord()
This is a revert of "Merge Webkit at r73109: getGuessForWord method signature change" See http://trac.webkit.org/changeset/73088 Note that this is a backwards merge from Chromium release 9.0.600.0 to 9.0.597.0, to align with the Chromium 9 stable release branch. Change-Id: If23862010b9e047f10991de5b428ca1b74b306b0
Diffstat (limited to 'WebKit/android/WebCoreSupport/EditorClientAndroid.h')
-rw-r--r--WebKit/android/WebCoreSupport/EditorClientAndroid.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/WebKit/android/WebCoreSupport/EditorClientAndroid.h b/WebKit/android/WebCoreSupport/EditorClientAndroid.h
index db94145..9aed88c 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&, const String&, Vector<String>&);
+ virtual void getGuessesForWord(const String&, WTF::Vector<String>& guesses);
virtual void willSetInputMethodState();
virtual void setInputMethodState(bool);