diff options
| author | Ben Murdoch <benm@google.com> | 2010-08-11 18:17:05 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-08-13 12:41:54 +0100 |
| commit | 45b64f60af3cbfa8c78388e35e9b669a0c284bdc (patch) | |
| tree | bd6df4524a5532b7b090ab042f90e72da3085b9c /WebKit/android/nav/CachedRoot.h | |
| parent | 82eeb7b660065e6e990280e6563ca7eafe4be1cd (diff) | |
| download | external_webkit-45b64f60af3cbfa8c78388e35e9b669a0c284bdc.zip external_webkit-45b64f60af3cbfa8c78388e35e9b669a0c284bdc.tar.gz external_webkit-45b64f60af3cbfa8c78388e35e9b669a0c284bdc.tar.bz2 | |
Merge WebKit at r65072: String class has moved to the WTF namespace.
See http://trac.webkit.org/changeset/65021
Change-Id: I779a8ec0c3e1e0aed8f8d1894cfc1e5ca33ee549
Diffstat (limited to 'WebKit/android/nav/CachedRoot.h')
| -rw-r--r-- | WebKit/android/nav/CachedRoot.h | 2 |
1 files changed, 1 insertions, 1 deletions
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); /** |