Merge WebKit at r70209: Initial merge by Git

Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e

1 files changed, 6 insertions, 7 deletions

diff --git a/WebKit/chromium/src/WebPageSerializer.cpp b/WebKit/chromium/src/WebPageSerializer.cpp
index 4f93702..1fda484 100644
--- a/WebKit/chromium/src/WebPageSerializer.cpp
+++ b/WebKit/chromium/src/WebPageSerializer.cpp
@@ -32,7 +32,6 @@
 #include "WebPageSerializer.h"
 
 #include "KURL.h"
-#include "PlatformString.h"
 
 #include "WebFrame.h"
 #include "WebPageSerializerClient.h"
@@ -41,6 +40,8 @@
 #include "WebURL.h"
 #include "WebVector.h"
 
+#include <wtf/text/StringConcatenate.h>
+
 using namespace WebCore;
 
 namespace WebKit {
@@ -59,8 +60,7 @@ bool WebPageSerializer::serialize(WebFrame* frame,
 
 WebString WebPageSerializer::generateMetaCharsetDeclaration(const WebString& charset)
 {
-    return String::format("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=%s\">",
-                          charset.utf8().data());
+    return makeString("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=", static_cast<const String&>(charset), "\">");
 }
 
 WebString WebPageSerializer::generateMarkOfTheWebDeclaration(const WebURL& url)
@@ -72,10 +72,9 @@ WebString WebPageSerializer::generateMarkOfTheWebDeclaration(const WebURL& url)
 
 WebString WebPageSerializer::generateBaseTagDeclaration(const WebString& baseTarget)
 {
-    String targetDeclaration;
-    if (!baseTarget.isEmpty())
-        targetDeclaration = String::format(" target=\"%s\"", baseTarget.utf8().data());
-    return String::format("<base href=\".\"%s>", targetDeclaration.utf8().data());
+    if (baseTarget.isEmpty())
+        return makeString("<base href=\".\">");
+    return makeString("<base href=\".\" target=\"", static_cast<const String&>(baseTarget), "\">");
 }
 
 }  // namespace WebKit