Imported WebKit commit 42d95198c30c2d1a94a5081181aad0b2be7c316c (http://svn.webkit.org/repository/webkit/trunk@128206)

This includes the rewrite of the configure part of the build system which should fix the QtQuick2 detection
and allow for further simplifications in the future

2 files changed, 23 insertions, 20 deletions

diff --git a/Source/WebKit2/UIProcess/InspectorServer/WebSocketServerConnection.cpp b/Source/WebKit2/UIProcess/InspectorServer/WebSocketServerConnection.cpp
index 57206eb7b..abc805fd7 100644
--- a/Source/WebKit2/UIProcess/InspectorServer/WebSocketServerConnection.cpp
+++ b/Source/WebKit2/UIProcess/InspectorServer/WebSocketServerConnection.cpp
@@ -99,18 +99,19 @@ void WebSocketServerConnection::sendWebSocketMessage(const String& message)
 void WebSocketServerConnection::sendHTTPResponseHeader(int statusCode, const String& statusText, const HTTPHeaderMap& headerFields)
 {
     StringBuilder builder;
-    builder.append("HTTP/1.1 ");
-    builder.append(String::number(statusCode));
-    builder.append(" ");
+    builder.appendLiteral("HTTP/1.1 ");
+    builder.appendNumber(statusCode);
+    builder.append(' ');
     builder.append(statusText);
-    builder.append("\r\n");
+    builder.appendLiteral("\r\n");
     HTTPHeaderMap::const_iterator end = headerFields.end();
     for (HTTPHeaderMap::const_iterator it = headerFields.begin(); it != end; ++it) {
         builder.append(it->first);
-        builder.append(": ");
-        builder.append(it->second + "\r\n");
+        builder.appendLiteral(": ");
+        builder.append(it->second);
+        builder.appendLiteral("\r\n");
     }
-    builder.append("\r\n");
+    builder.appendLiteral("\r\n");
 
     CString header = builder.toString().latin1();
     m_socket->send(header.data(), header.length());
diff --git a/Source/WebKit2/UIProcess/InspectorServer/qt/WebInspectorServerQt.cpp b/Source/WebKit2/UIProcess/InspectorServer/qt/WebInspectorServerQt.cpp
index c13fa4cfc..1882586af 100644
--- a/Source/WebKit2/UIProcess/InspectorServer/qt/WebInspectorServerQt.cpp
+++ b/Source/WebKit2/UIProcess/InspectorServer/qt/WebInspectorServerQt.cpp
@@ -68,34 +68,36 @@ String WebInspectorServer::inspectorUrlForPageID(int pageId)
     if (pageId <= 0 || serverState() == Closed)
         return String();
     StringBuilder builder;
-    builder.append("http://");
+    builder.appendLiteral("http://");
     builder.append(bindAddress());
-    builder.append(":");
-    builder.append(String::number(port()));
+    builder.append(':');
+    builder.appendNumber(port());
     builder.append(remoteInspectorPagePath());
-    builder.append(String::number(pageId));
+    builder.appendNumber(pageId);
     return builder.toString();
 }
 
 void WebInspectorServer::buildPageList(Vector<char>& data, String& contentType)
 {
     StringBuilder builder;
-    builder.append("[ ");
+    builder.appendLiteral("[ ");
     ClientMap::iterator end = m_clientMap.end();
     for (ClientMap::iterator it = m_clientMap.begin(); it != end; ++it) {
         WebPageProxy* webPage = it->second->page();
         if (it != m_clientMap.begin())
-            builder.append(", ");
-        builder.append("{ \"id\": " + String::number(it->first));
-        builder.append(", \"title\": \"");
+            builder.appendLiteral(", ");
+        builder.appendLiteral("{ \"id\": ");
+        builder.appendNumber(it->first);
+        builder.appendLiteral(", \"title\": \"");
         builder.append(webPage->pageTitle());
-        builder.append("\", \"url\": \"");
+        builder.appendLiteral("\", \"url\": \"");
         builder.append(webPage->activeURL());
-        builder.append("\", \"inspectorUrl\": \"");
-        builder.append(remoteInspectorPagePath() + String::number(it->first));
-        builder.append("\" }");
+        builder.appendLiteral("\", \"inspectorUrl\": \"");
+        builder.append(remoteInspectorPagePath());
+        builder.appendNumber(it->first);
+        builder.appendLiteral("\" }");
     }
-    builder.append(" ]");
+    builder.appendLiteral(" ]");
     CString cstr = builder.toString().utf8();
     data.append(cstr.data(), cstr.length());
     contentType = "application/json; charset=utf-8";