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.cpp | |
| 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.cpp')
| -rw-r--r-- | WebKit/android/nav/CachedRoot.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 |