diff options
| author | Grace Kloba <klobag@google.com> | 2009-04-22 09:45:00 -0700 |
|---|---|---|
| committer | Grace Kloba <klobag@google.com> | 2009-04-22 11:44:58 -0700 |
| commit | 14f586c9666e68bd7b138911aa63a3081d5b2e49 (patch) | |
| tree | 2af9d352476d25f61e0d841c7b4133f6b6aa6560 /WebKit/android/WebCoreSupport | |
| parent | 38eb0cdb2b416fb660584adf6f277a27ce519568 (diff) | |
| download | external_webkit-14f586c9666e68bd7b138911aa63a3081d5b2e49.zip external_webkit-14f586c9666e68bd7b138911aa63a3081d5b2e49.tar.gz external_webkit-14f586c9666e68bd7b138911aa63a3081d5b2e49.tar.bz2 | |
Adding WTF to Vector as both Android and WTF has Vector<>.
Diffstat (limited to 'WebKit/android/WebCoreSupport')
| -rw-r--r-- | WebKit/android/WebCoreSupport/EditorClientAndroid.cpp | 4 | ||||
| -rw-r--r-- | WebKit/android/WebCoreSupport/EditorClientAndroid.h | 4 | ||||
| -rw-r--r-- | WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/WebKit/android/WebCoreSupport/EditorClientAndroid.cpp b/WebKit/android/WebCoreSupport/EditorClientAndroid.cpp index 780ea53..8629731 100644 --- a/WebKit/android/WebCoreSupport/EditorClientAndroid.cpp +++ b/WebKit/android/WebCoreSupport/EditorClientAndroid.cpp @@ -215,9 +215,9 @@ void EditorClientAndroid::redo() {} // functions new to Jun-07 tip of tree merge: void EditorClientAndroid::showSpellingUI(bool) {} -void EditorClientAndroid::getGuessesForWord(String const&, Vector<String>&) {} +void EditorClientAndroid::getGuessesForWord(String const&, WTF::Vector<String>&) {} bool EditorClientAndroid::spellingUIIsShowing() { return false; } -void EditorClientAndroid::checkGrammarOfString(unsigned short const*, int, Vector<GrammarDetail>&, int*, int*) {} +void EditorClientAndroid::checkGrammarOfString(unsigned short const*, int, WTF::Vector<GrammarDetail>&, int*, int*) {} void EditorClientAndroid::checkSpellingOfString(unsigned short const*, int, int*, int*) {} void EditorClientAndroid::textFieldDidEndEditing(Element*) {} void EditorClientAndroid::textDidChangeInTextArea(Element*) {} diff --git a/WebKit/android/WebCoreSupport/EditorClientAndroid.h b/WebKit/android/WebCoreSupport/EditorClientAndroid.h index 42e9c43..763b097 100644 --- a/WebKit/android/WebCoreSupport/EditorClientAndroid.h +++ b/WebKit/android/WebCoreSupport/EditorClientAndroid.h @@ -94,12 +94,12 @@ public: virtual void ignoreWordInSpellDocument(const String&); virtual void learnWord(const String&); virtual void checkSpellingOfString(const UChar*, int length, int* misspellingLocation, int* misspellingLength); - virtual void checkGrammarOfString(const UChar*, int length, Vector<GrammarDetail>&, int* badGrammarLocation, int* badGrammarLength); + virtual void checkGrammarOfString(const UChar*, int length, WTF::Vector<GrammarDetail>&, int* badGrammarLocation, int* badGrammarLength); virtual void updateSpellingUIWithGrammarString(const String&, const GrammarDetail& detail); virtual void updateSpellingUIWithMisspelledWord(const String&); virtual void showSpellingUI(bool show); virtual bool spellingUIIsShowing(); - virtual void getGuessesForWord(const String&, Vector<String>& guesses); + virtual void getGuessesForWord(const String&, WTF::Vector<String>& guesses); virtual void setInputMethodState(bool); // Android specific: diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h index 143537f..2816c78 100644 --- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h +++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h @@ -173,7 +173,7 @@ namespace android { const String&, bool); virtual void redirectDataToPlugin(Widget* pluginWidget); - virtual Widget* createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const KURL& baseURL, const Vector<String>& paramNames, const Vector<String>& paramValues); + virtual Widget* createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const KURL& baseURL, const WTF::Vector<String>& paramNames, const WTF::Vector<String>& paramValues); virtual ObjectContentType objectContentType(const KURL& url, const String& mimeType); virtual String overrideMediaType() const; |