diff options
| author | Steve Block <steveblock@google.com> | 2009-10-12 12:21:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-10-20 00:45:07 +0100 |
| commit | bd6026bd45e3421253a3bcdbaf61a4f7c08476ea (patch) | |
| tree | 1c7fb483883ed71cb181462bc46fdd0dd533187b /WebKit | |
| parent | d060767c4de6a275194ee9a58f151b82b17013bf (diff) | |
| download | external_webkit-bd6026bd45e3421253a3bcdbaf61a4f7c08476ea.zip external_webkit-bd6026bd45e3421253a3bcdbaf61a4f7c08476ea.tar.gz external_webkit-bd6026bd45e3421253a3bcdbaf61a4f7c08476ea.tar.bz2 | |
Merge webkit.org at R49305 : Text::string renamed to dataImpl.
See http://trac.webkit.org/changeset/47313
Change-Id: Ic33083eedfc8468c171cd7af6f112aca0eeef615
Diffstat (limited to 'WebKit')
| -rw-r--r-- | WebKit/android/jni/WebViewCore.cpp | 4 | ||||
| -rw-r--r-- | WebKit/android/nav/CacheBuilder.cpp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp index 2a86e56..5ad8a9e 100644 --- a/WebKit/android/jni/WebViewCore.cpp +++ b/WebKit/android/jni/WebViewCore.cpp @@ -1580,7 +1580,7 @@ WebCore::String WebViewCore::getSelection(SkRegion* selRgn) if (end < -1) // use node if endNode is not valid endNode = node; if (end <= 0) - end = static_cast<WebCore::Text*>(endNode)->string()->length(); + end = static_cast<WebCore::Text*>(endNode)->dataImpl()->length(); DBG_NAV_LOGD("node=%p start=%d endNode=%p end=%d", node, start, endNode, end); WebCore::Node* startNode = node; do { @@ -1589,7 +1589,7 @@ WebCore::String WebViewCore::getSelection(SkRegion* selRgn) if (node->getRect().isEmpty()) continue; WebCore::Text* textNode = static_cast<WebCore::Text*>(node); - WebCore::StringImpl* string = textNode->string(); + WebCore::StringImpl* string = textNode->dataImpl(); if (!string->length()) continue; const UChar* chars = string->characters(); diff --git a/WebKit/android/nav/CacheBuilder.cpp b/WebKit/android/nav/CacheBuilder.cpp index 72dad07..c28ff60 100644 --- a/WebKit/android/nav/CacheBuilder.cpp +++ b/WebKit/android/nav/CacheBuilder.cpp @@ -2427,7 +2427,7 @@ bool CacheBuilder::isFocusableText(NodeWalk* walk, bool more, Node* node, CachedNodeType* type, String* exported) const { Text* textNode = static_cast<Text*>(node); - StringImpl* string = textNode->string(); + StringImpl* string = textNode->dataImpl(); const UChar* baseChars = string->characters(); // const UChar* originalBase = baseChars; int length = string->length(); @@ -2532,7 +2532,7 @@ bool CacheBuilder::isFocusableText(NodeWalk* walk, bool more, Node* node, exported->truncate(0); do { Text* tempText = static_cast<Text*>(temp); - StringImpl* string = tempText->string(); + StringImpl* string = tempText->dataImpl(); int end = tempText == walk->mFinalNode ? walk->mEnd : string->length(); exported->append(String(string->substring( @@ -2592,7 +2592,7 @@ bool CacheBuilder::isFocusableText(NodeWalk* walk, bool more, Node* node, } while (renderer == NULL); baseInline = renderer->firstTextBox(); } while (baseInline == NULL); - string = nextNode->string(); + string = nextNode->dataImpl(); baseChars = string->characters(); inlineTextBox = baseInline; start = inlineTextBox->start(); @@ -2602,7 +2602,7 @@ bool CacheBuilder::isFocusableText(NodeWalk* walk, bool more, Node* node, tryNextCheckType: node = textNode; baseInline = saveInline; - string = textNode->string(); + string = textNode->dataImpl(); baseChars = string->characters(); } if (foundBetter) { @@ -2861,7 +2861,7 @@ bool CacheBuilder::ConstructTextRect(Text* textNode, { RenderText* renderText = (RenderText*) textNode->renderer(); EVisibility vis = renderText->style()->visibility(); - StringImpl* string = textNode->string(); + StringImpl* string = textNode->dataImpl(); const UChar* chars = string->characters(); FloatPoint pt = renderText->localToAbsolute(); do { |