Merge korg/donut into korg/master

1 files changed, 3 insertions, 3 deletions

diff --git a/WebKit/android/nav/CacheBuilder.cpp b/WebKit/android/nav/CacheBuilder.cpp
index 8c350bf..a49c614 100644
--- a/WebKit/android/nav/CacheBuilder.cpp
+++ b/WebKit/android/nav/CacheBuilder.cpp
@@ -1153,7 +1153,7 @@ void CacheBuilder::BuildFrame(Frame* root, Frame* frame,
             isTextField = input->isTextField();
             isPassword = input->inputType() == HTMLInputElement::PASSWORD;
             maxLength = input->maxLength();
-            name = String(input->name().string());
+            name = input->name().string().copy();
             isUnclipped = isTransparent; // can't detect if this is drawn on top (example: deviant.com login parts)
         } else if (node->hasTagName(HTMLNames::textareaTag))
             isTextArea = true;
@@ -1170,14 +1170,14 @@ void CacheBuilder::BuildFrame(Frame* root, Frame* frame,
             KURL href = anchorNode->href();
             if (!href.isEmpty() && !href.protocolIs("javascript"))
                 // Set the exported string for all non-javascript anchors.
-                exported = href.string();
+                exported = href.string().copy();
         }
         if (isTextField || isTextArea) {
             RenderTextControl* renderText = 
                 static_cast<RenderTextControl*>(nodeRenderer);
             if (isFocus)
                 cachedRoot->setSelection(renderText->selectionStart(), renderText->selectionEnd());
-            exported = String(renderText->text());
+            exported = renderText->text().copy();
             // FIXME: Would it be better to use (float) size()?
             // FIXME: Are we sure there will always be a style and font, and it's correct?
             RenderStyle* style = nodeRenderer->style();