1 files changed, 12 insertions, 11 deletions

diff --git a/WebKit/chromium/src/EditorClientImpl.h b/WebKit/chromium/src/EditorClientImpl.h
index fd08b4d..b05a592 100644
--- a/WebKit/chromium/src/EditorClientImpl.h
+++ b/WebKit/chromium/src/EditorClientImpl.h
@@ -61,7 +61,7 @@ public:
     virtual bool shouldBeginEditing(WebCore::Range*);
     virtual bool shouldEndEditing(WebCore::Range*);
     virtual bool shouldInsertNode(WebCore::Node*, WebCore::Range*, WebCore::EditorInsertAction);
-    virtual bool shouldInsertText(const WebCore::String&, WebCore::Range*, WebCore::EditorInsertAction);
+    virtual bool shouldInsertText(const WTF::String&, WebCore::Range*, WebCore::EditorInsertAction);
     virtual bool shouldDeleteRange(WebCore::Range*);
     virtual bool shouldChangeSelectedRange(WebCore::Range* fromRange,
                                            WebCore::Range* toRange,
@@ -92,8 +92,8 @@ public:
     virtual bool doTextFieldCommandFromEvent(WebCore::Element*, WebCore::KeyboardEvent*);
     virtual void textWillBeDeletedInTextField(WebCore::Element*);
     virtual void textDidChangeInTextArea(WebCore::Element*);
-    virtual void ignoreWordInSpellDocument(const WebCore::String&);
-    virtual void learnWord(const WebCore::String&);
+    virtual void ignoreWordInSpellDocument(const WTF::String&);
+    virtual void learnWord(const WTF::String&);
     virtual void checkSpellingOfString(const UChar*, int length,
                                        int* misspellingLocation,
                                        int* misspellingLength);
@@ -101,13 +101,14 @@ public:
                                       WTF::Vector<WebCore::GrammarDetail>&,
                                       int* badGrammarLocation,
                                       int* badGrammarLength);
-    virtual WebCore::String getAutoCorrectSuggestionForMisspelledWord(const WebCore::String&);
-    virtual void updateSpellingUIWithGrammarString(const WebCore::String&, const WebCore::GrammarDetail&);
-    virtual void updateSpellingUIWithMisspelledWord(const WebCore::String&);
+    virtual WTF::String getAutoCorrectSuggestionForMisspelledWord(const WTF::String&);
+    virtual void updateSpellingUIWithGrammarString(const WTF::String&, const WebCore::GrammarDetail&);
+    virtual void updateSpellingUIWithMisspelledWord(const WTF::String&);
     virtual void showSpellingUI(bool show);
     virtual bool spellingUIIsShowing();
-    virtual void getGuessesForWord(const WebCore::String& word,
-                                   WTF::Vector<WebCore::String>& guesses);
+    virtual void getGuessesForWord(const WTF::String& word,
+                                   WTF::Vector<WTF::String>& guesses);
+    virtual void willSetInputMethodState();
     virtual void setInputMethodState(bool enabled);
 
     // Shows the form autofill popup for |node| if it is an HTMLInputElement and
@@ -118,10 +119,10 @@ public:
     virtual bool showFormAutofillForNode(WebCore::Node*);
 
     // Notification that the text changed due to acceptance of a suggestion
-    // provided by an autofill popup.  Having a separate callback in this case
-    // is a simple way to break the cycle that would otherwise occur if
+    // provided by an Autocomplete popup.  Having a separate callback in this
+    // case is a simple way to break the cycle that would otherwise occur if
     // textDidChangeInTextField was called.
-    virtual void onAutofillSuggestionAccepted(WebCore::HTMLInputElement*);
+    virtual void onAutocompleteSuggestionAccepted(WebCore::HTMLInputElement*);
 
 private:
     void modifySelection(WebCore::Frame*, WebCore::KeyboardEvent*);