Title: [88944] trunk/Source/WebKit2
- Revision
- 88944
- Author
- [email protected]
- Date
- 2011-06-15 09:18:55 -0700 (Wed, 15 Jun 2011)
Log Message
2011-06-15 Sheriff Bot <[email protected]>
Unreviewed, rolling out r88907.
http://trac.webkit.org/changeset/88907
https://bugs.webkit.org/show_bug.cgi?id=62732
See comment #15 by Nikolas Zimmermann on bug 62527 regarding
the deprecation of makeString() (Requested by acidx on
#webkit).
* UIProcess/efl/WebPageProxyEfl.cpp:
(WebKit::WebPageProxy::standardUserAgent):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (88943 => 88944)
--- trunk/Source/WebKit2/ChangeLog 2011-06-15 16:11:22 UTC (rev 88943)
+++ trunk/Source/WebKit2/ChangeLog 2011-06-15 16:18:55 UTC (rev 88944)
@@ -1,3 +1,16 @@
+2011-06-15 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r88907.
+ http://trac.webkit.org/changeset/88907
+ https://bugs.webkit.org/show_bug.cgi?id=62732
+
+ See comment #15 by Nikolas Zimmermann on bug 62527 regarding
+ the deprecation of makeString() (Requested by acidx on
+ #webkit).
+
+ * UIProcess/efl/WebPageProxyEfl.cpp:
+ (WebKit::WebPageProxy::standardUserAgent):
+
2011-06-15 Csaba Osztrogonác <[email protected]>
[Qt][WK2] Unreviewed rolling out r88799, because it made web process crash.
Modified: trunk/Source/WebKit2/UIProcess/efl/WebPageProxyEfl.cpp (88943 => 88944)
--- trunk/Source/WebKit2/UIProcess/efl/WebPageProxyEfl.cpp 2011-06-15 16:11:22 UTC (rev 88943)
+++ trunk/Source/WebKit2/UIProcess/efl/WebPageProxyEfl.cpp 2011-06-15 16:18:55 UTC (rev 88944)
@@ -30,7 +30,6 @@
#include "PageClientImpl.h"
#include <sys/utsname.h>
-#include <wtf/text/StringConcatenate.h>
namespace WebKit {
@@ -41,9 +40,9 @@
String WebPageProxy::standardUserAgent(const String& applicationNameForUserAgent)
{
- String platform;
- String version;
- String osVersion;
+ WTF::String platform;
+ WTF::String version;
+ WTF::String osVersion;
#if PLATFORM(X11)
platform = "X11";
@@ -54,7 +53,7 @@
String::number(WEBKIT_USER_AGENT_MINOR_VERSION), '+');
struct utsname name;
if (uname(&name) != -1)
- osVersion = makeString(name.sysname, ' ', name.machine);
+ osVersion = WTF::String(name.sysname) + " " + WTF::String(name.machine);
else
osVersion = "Unknown";
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
