diff options
| author | Andrei Popescu <andreip@google.com> | 2009-08-19 14:09:08 +0100 |
|---|---|---|
| committer | Andrei Popescu <andreip@google.com> | 2009-08-19 14:09:08 +0100 |
| commit | 2796dd1bf3b4b01e7e1d96ea91bd3a212f647579 (patch) | |
| tree | a3fa109aa5bf52fef562ac49d97a2f723889cc71 /WebKit | |
| parent | 0a765b92b82dbcf0683bcdb9e18180e7957f7eda (diff) | |
| download | external_webkit-2796dd1bf3b4b01e7e1d96ea91bd3a212f647579.zip external_webkit-2796dd1bf3b4b01e7e1d96ea91bd3a212f647579.tar.gz external_webkit-2796dd1bf3b4b01e7e1d96ea91bd3a212f647579.tar.bz2 | |
Revert "Compilation and link error fixes for new webkit r47420."
This reverts commit 632f4508222c2a617e6820e9388867c0f4821db8.
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 7b80563..3ede30a 100644 --- a/WebKit/android/jni/WebViewCore.cpp +++ b/WebKit/android/jni/WebViewCore.cpp @@ -1439,7 +1439,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)->dataImpl()->length(); + end = static_cast<WebCore::Text*>(endNode)->string()->length(); DBG_NAV_LOGD("node=%p start=%d endNode=%p end=%d", node, start, endNode, end); WebCore::Node* startNode = node; do { @@ -1448,7 +1448,7 @@ WebCore::String WebViewCore::getSelection(SkRegion* selRgn) if (node->getRect().isEmpty()) continue; WebCore::Text* textNode = static_cast<WebCore::Text*>(node); - WebCore::StringImpl* string = textNode->dataImpl(); + WebCore::StringImpl* string = textNode->string(); if (!string->length()) continue; const UChar* chars = string->characters(); diff --git a/WebKit/android/nav/CacheBuilder.cpp b/WebKit/android/nav/CacheBuilder.cpp index 05c1c66..56cb2ae 100644 --- a/WebKit/android/nav/CacheBuilder.cpp +++ b/WebKit/android/nav/CacheBuilder.cpp @@ -2410,7 +2410,7 @@ bool CacheBuilder::isFocusableText(NodeWalk* walk, bool more, Node* node, CachedNodeType* type, String* exported) const { Text* textNode = static_cast<Text*>(node); - StringImpl* string = textNode->dataImpl(); + StringImpl* string = textNode->string(); const UChar* baseChars = string->characters(); // const UChar* originalBase = baseChars; int length = string->length(); @@ -2515,7 +2515,7 @@ bool CacheBuilder::isFocusableText(NodeWalk* walk, bool more, Node* node, exported->truncate(0); do { Text* tempText = static_cast<Text*>(temp); - StringImpl* string = tempText->dataImpl(); + StringImpl* string = tempText->string(); int end = tempText == walk->mFinalNode ? walk->mEnd : string->length(); exported->append(String(string->substring( @@ -2575,7 +2575,7 @@ bool CacheBuilder::isFocusableText(NodeWalk* walk, bool more, Node* node, } while (renderer == NULL); baseInline = renderer->firstTextBox(); } while (baseInline == NULL); - string = nextNode->dataImpl(); + string = nextNode->string(); baseChars = string->characters(); inlineTextBox = baseInline; start = inlineTextBox->start(); @@ -2585,7 +2585,7 @@ bool CacheBuilder::isFocusableText(NodeWalk* walk, bool more, Node* node, tryNextCheckType: node = textNode; baseInline = saveInline; - string = textNode->dataImpl(); + string = textNode->string(); baseChars = string->characters(); } if (foundBetter) { @@ -2844,7 +2844,7 @@ bool CacheBuilder::ConstructTextRect(Text* textNode, { RenderText* renderText = (RenderText*) textNode->renderer(); EVisibility vis = renderText->style()->visibility(); - StringImpl* string = textNode->dataImpl(); + StringImpl* string = textNode->string(); const UChar* chars = string->characters(); FloatPoint pt = renderText->localToAbsolute(); do { |