From 45b64f60af3cbfa8c78388e35e9b669a0c284bdc Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Wed, 11 Aug 2010 18:17:05 +0100 Subject: Merge WebKit at r65072: String class has moved to the WTF namespace. See http://trac.webkit.org/changeset/65021 Change-Id: I779a8ec0c3e1e0aed8f8d1894cfc1e5ca33ee549 --- WebKit/android/nav/CachedRoot.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'WebKit/android/nav/CachedRoot.h') 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); /** -- cgit v1.1