Merge webkit.org at R49305 : Text::string renamed to dataImpl.

See http://trac.webkit.org/changeset/47313

Change-Id: Ic33083eedfc8468c171cd7af6f112aca0eeef615

diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp
index 2a86e56..5ad8a9e 100644 (file)
--- 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 (file)
--- 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 {