diff options
Diffstat (limited to 'WebKit/android/nav')
-rw-r--r-- | WebKit/android/nav/CacheBuilder.cpp | 4 | ||||
-rw-r--r-- | WebKit/android/nav/CacheBuilder.h | 4 | ||||
-rw-r--r-- | WebKit/android/nav/CachedInput.cpp | 4 | ||||
-rw-r--r-- | WebKit/android/nav/CachedInput.h | 6 | ||||
-rw-r--r-- | WebKit/android/nav/CachedNode.cpp | 2 | ||||
-rw-r--r-- | WebKit/android/nav/CachedNode.h | 6 | ||||
-rw-r--r-- | WebKit/android/nav/CachedRoot.cpp | 4 | ||||
-rw-r--r-- | WebKit/android/nav/CachedRoot.h | 2 | ||||
-rw-r--r-- | WebKit/android/nav/SelectText.cpp | 6 | ||||
-rw-r--r-- | WebKit/android/nav/WebView.cpp | 18 |
10 files changed, 28 insertions, 28 deletions
diff --git a/WebKit/android/nav/CacheBuilder.cpp b/WebKit/android/nav/CacheBuilder.cpp index b4a91bc..e76c729 100644 --- a/WebKit/android/nav/CacheBuilder.cpp +++ b/WebKit/android/nav/CacheBuilder.cpp @@ -2762,10 +2762,10 @@ tryNextCheckType: exported->replace(index, 1, escapedComma); } break; case EMAIL_CACHEDNODETYPE: - exported->insert(WebCore::String("mailto:"), 0); + exported->insert(WTF::String("mailto:"), 0); break; case PHONE_CACHEDNODETYPE: - exported->insert(WebCore::String("tel:"), 0); + exported->insert(WTF::String("tel:"), 0); break; default: break; diff --git a/WebKit/android/nav/CacheBuilder.h b/WebKit/android/nav/CacheBuilder.h index 8183954..5324187 100644 --- a/WebKit/android/nav/CacheBuilder.h +++ b/WebKit/android/nav/CacheBuilder.h @@ -31,7 +31,8 @@ #include "IntRect.h" #include "PlatformString.h" #include "TextDirection.h" -#include "wtf/Vector.h" +#include <wtf/Forward.h> +#include <wtf/Vector.h> #define NAVIGATION_MAX_PHONE_LENGTH 14 @@ -39,7 +40,6 @@ using namespace WebCore; namespace WebCore { -class AtomicString; class Document; class Frame; class HTMLAreaElement; diff --git a/WebKit/android/nav/CachedInput.cpp b/WebKit/android/nav/CachedInput.cpp index 608c41b..12fb9e9 100644 --- a/WebKit/android/nav/CachedInput.cpp +++ b/WebKit/android/nav/CachedInput.cpp @@ -30,7 +30,7 @@ namespace android { void CachedInput::init() { bzero(this, sizeof(CachedInput)); - mName = WebCore::String(); + mName = WTF::String(); } #if DUMP_NAV_CACHE @@ -44,7 +44,7 @@ CachedInput* CachedInput::Debug::base() const { } static void printWebCoreString(const char* label, - const WebCore::String& string) { + const WTF::String& string) { char scratch[256]; size_t index = snprintf(scratch, sizeof(scratch), label); const UChar* ch = string.characters(); diff --git a/WebKit/android/nav/CachedInput.h b/WebKit/android/nav/CachedInput.h index a3d6b10..4ce8182 100644 --- a/WebKit/android/nav/CachedInput.h +++ b/WebKit/android/nav/CachedInput.h @@ -44,18 +44,18 @@ public: bool isRtlText() const { return mIsRtlText; } bool isTextField() const { return mIsTextField; } int maxLength() const { return mMaxLength; }; - const WebCore::String& name() const { return mName; } + const WTF::String& name() const { return mName; } void setFormPointer(void* form) { mForm = form; } void setInputType(WebCore::HTMLInputElement::InputType type) { mInputType = type; } void setIsRtlText(bool isRtlText) { mIsRtlText = isRtlText; } void setIsTextField(bool isTextField) { mIsTextField = isTextField; } void setMaxLength(int maxLength) { mMaxLength = maxLength; } - void setName(const WebCore::String& name) { mName = name; } + void setName(const WTF::String& name) { mName = name; } void setTextSize(int textSize) { mTextSize = textSize; } int textSize() const { return mTextSize; } private: void* mForm; - WebCore::String mName; + WTF::String mName; int mMaxLength; int mTextSize; WebCore::HTMLInputElement::InputType mInputType; diff --git a/WebKit/android/nav/CachedNode.cpp b/WebKit/android/nav/CachedNode.cpp index 8fc5f5b..dda9385 100644 --- a/WebKit/android/nav/CachedNode.cpp +++ b/WebKit/android/nav/CachedNode.cpp @@ -237,7 +237,7 @@ WebCore::IntRect CachedNode::hitBounds(const CachedFrame* frame) const void CachedNode::init(WebCore::Node* node) { bzero(this, sizeof(CachedNode)); - mExport = WebCore::String(); + mExport = WTF::String(); mNode = node; mParentIndex = mDataIndex = -1; mType = android::NORMAL_CACHEDNODETYPE; diff --git a/WebKit/android/nav/CachedNode.h b/WebKit/android/nav/CachedNode.h index 09f53c3..2ade73b 100644 --- a/WebKit/android/nav/CachedNode.h +++ b/WebKit/android/nav/CachedNode.h @@ -100,7 +100,7 @@ public: bool disabled() const { return mDisabled; } const CachedNode* document() const { return &this[-mIndex]; } void fixUpCursorRects(const CachedFrame* frame); - const WebCore::String& getExport() const { return mExport; } + const WTF::String& getExport() const { return mExport; } bool hasCursorRing() const { return mHasCursorRing; } bool hasMouseOver() const { return mHasMouseOver; } void hideCursor(CachedFrame* ); @@ -150,7 +150,7 @@ public: void setCondition(Condition condition) const { mCondition = condition; } void setDataIndex(int index) { mDataIndex = index; } void setDisabled(bool disabled) { mDisabled = disabled; } - void setExport(const WebCore::String& exported) { mExport = exported; } + void setExport(const WTF::String& exported) { mExport = exported; } void setHasCursorRing(bool hasRing) { mHasCursorRing = hasRing; } void setHasMouseOver(bool hasMouseOver) { mHasMouseOver = hasMouseOver; } void setHitBounds(const WebCore::IntRect& bounds) { mHitBounds = bounds; } @@ -178,7 +178,7 @@ public: bool wantsKeyEvents() const { return isTextInput() || isPlugin() || isContentEditable(); } private: friend class CacheBuilder; - WebCore::String mExport; + WTF::String mExport; WebCore::IntRect mBounds; WebCore::IntRect mHitBounds; WebCore::IntRect mOriginalAbsoluteBounds; diff --git a/WebKit/android/nav/CachedRoot.cpp b/WebKit/android/nav/CachedRoot.cpp index 6016d28..15726ec 100644 --- a/WebKit/android/nav/CachedRoot.cpp +++ b/WebKit/android/nav/CachedRoot.cpp @@ -1070,7 +1070,7 @@ bool CachedRoot::innerUp(const CachedNode* test, BestData* bestData) const return true; } -WebCore::String CachedRoot::imageURI(int x, int y) const +WTF::String CachedRoot::imageURI(int x, int y) const { ImageCheck imageCheck; ImageCanvas checker(&imageCheck); @@ -1079,7 +1079,7 @@ WebCore::String CachedRoot::imageURI(int x, int y) const checker.setBitmapDevice(bitmap); checker.translate(SkIntToScalar(-x), SkIntToScalar(-y)); checker.drawPicture(*pictureAt(x, y)); - return WebCore::String(checker.mURI); + return WTF::String(checker.mURI); } bool CachedRoot::maskIfHidden(BestData* best) const diff --git a/WebKit/android/nav/CachedRoot.h b/WebKit/android/nav/CachedRoot.h index 6e9fff0..2853241 100644 --- a/WebKit/android/nav/CachedRoot.h +++ b/WebKit/android/nav/CachedRoot.h @@ -72,7 +72,7 @@ public: WebCore::IntPoint* scroll, bool firstCall); bool innerRight(const CachedNode* , BestData* ) const; bool innerUp(const CachedNode* , BestData* ) const; - WebCore::String imageURI(int x, int y) const; + WTF::String imageURI(int x, int y) const; bool maskIfHidden(BestData* ) const; const CachedNode* moveCursor(Direction , const CachedFrame** , WebCore::IntPoint* scroll); /** diff --git a/WebKit/android/nav/SelectText.cpp b/WebKit/android/nav/SelectText.cpp index 030141d..9792cd3 100644 --- a/WebKit/android/nav/SelectText.cpp +++ b/WebKit/android/nav/SelectText.cpp @@ -960,7 +960,7 @@ public: return false; } - WebCore::String text() { + WTF::String text() { if (mFlipped) finish(); // the text has been copied in visual order. Reverse as needed if @@ -976,7 +976,7 @@ public: break; } } - return WebCore::String(mSelectText.begin(), mSelectText.count()); + return WTF::String(mSelectText.begin(), mSelectText.count()); } protected: @@ -1165,7 +1165,7 @@ static SkIRect findRight(const SkPicture& picture, const SkIRect& area, return findEdge(picture, area, x, y, false, base); } -static WebCore::String text(const SkPicture& picture, const SkIRect& area, +static WTF::String text(const SkPicture& picture, const SkIRect& area, const SkIRect& start, int startBase, const SkIRect& end, int endBase, bool flipped) { diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp index 9108fdb..efaa509 100644 --- a/WebKit/android/nav/WebView.cpp +++ b/WebKit/android/nav/WebView.cpp @@ -678,10 +678,10 @@ static CachedFrame::Direction KeyToDirection(int32_t keyCode) } } -WebCore::String imageURI(int x, int y) +WTF::String imageURI(int x, int y) { const CachedRoot* root = getFrameCache(DontAllowNewer); - return root ? root->imageURI(x, y) : WebCore::String(); + return root ? root->imageURI(x, y) : WTF::String(); } bool cursorWantsKeyEvents() @@ -944,7 +944,7 @@ int getBlockLeftEdge(int x, int y, float scale) return -1; } -void overrideUrlLoading(const WebCore::String& url) +void overrideUrlLoading(const WTF::String& url) { JNIEnv* env = JSC::Bindings::getJNIEnv(); jstring jName = env->NewString((jchar*) url.characters(), url.length()); @@ -1290,7 +1290,7 @@ private: // local state for WebView /* * Native JNI methods */ -static jstring WebCoreStringToJString(JNIEnv *env, WebCore::String string) +static jstring WebCoreStringToJString(JNIEnv *env, WTF::String string) { int length = string.length(); if (!length) @@ -1501,7 +1501,7 @@ static jobject nativeCursorText(JNIEnv *env, jobject obj) const CachedNode* node = getCursorNode(env, obj); if (!node) return 0; - WebCore::String value = node->getExport(); + WTF::String value = node->getExport(); return !value.isEmpty() ? env->NewString((jchar *)value.characters(), value.length()) : 0; } @@ -1558,7 +1558,7 @@ static jobject nativeImageURI(JNIEnv *env, jobject obj, jint x, jint y) { WebView* view = GET_NATIVE_VIEW(env, obj); LOG_ASSERT(view, "view not set in %s", __FUNCTION__); - WebCore::String uri = view->imageURI(x, y); + WTF::String uri = view->imageURI(x, y); jstring ret = 0; unsigned len = uri.length(); if (len) { @@ -1610,7 +1610,7 @@ static jobject nativeFocusCandidateName(JNIEnv *env, jobject obj) const CachedInput* input = getInputCandidate(env, obj); if (!input) return 0; - const WebCore::String& name = input->name(); + const WTF::String& name = input->name(); return env->NewString((jchar*)name.characters(), name.length()); } @@ -1638,7 +1638,7 @@ static jobject nativeFocusCandidateText(JNIEnv *env, jobject obj) const CachedNode* node = getFocusCandidate(env, obj, 0); if (!node) return 0; - WebCore::String value = node->getExport(); + WTF::String value = node->getExport(); return !value.isEmpty() ? env->NewString((jchar *)value.characters(), value.length()) : 0; } @@ -1928,7 +1928,7 @@ static void nativeUpdateCachedTextfield(JNIEnv *env, jobject obj, jstring update const CachedNode* cachedFocusNode = root->currentFocus(); if (!cachedFocusNode || !cachedFocusNode->isTextInput()) return; - WebCore::String webcoreString = to_string(env, updatedText); + WTF::String webcoreString = to_string(env, updatedText); (const_cast<CachedNode*>(cachedFocusNode))->setExport(webcoreString); root->setTextGeneration(generation); checkException(env); |