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/SelectText.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/SelectText.cpp')
| -rw-r--r-- | WebKit/android/nav/SelectText.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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) { |