Diff
Modified: trunk/Source/WebCore/ChangeLog (128203 => 128204)
--- trunk/Source/WebCore/ChangeLog 2012-09-11 17:39:08 UTC (rev 128203)
+++ trunk/Source/WebCore/ChangeLog 2012-09-11 17:40:36 UTC (rev 128204)
@@ -1,3 +1,20 @@
+2012-09-11 Jinwoo Song <[email protected]>
+
+ Deploy StringBuilder::appendNumber() and StringBuilder::appendLiteral() in more places
+ https://bugs.webkit.org/show_bug.cgi?id=96344
+
+ Reviewed by Benjamin Poulain.
+
+ Use StringBuilder::appendNumber() instead of String::number(). Also deploy
+ StringBuilder::appendLiteral() instead of String::append() in the surrounding code.
+
+ * css/CSSAspectRatioValue.cpp:
+ (WebCore::CSSAspectRatioValue::customCssText):
+ * platform/graphics/gpu/LoopBlinnPathProcessor.cpp:
+ (WebCore):
+ * svg/SVGPointList.cpp:
+ (WebCore::SVGPointList::valueAsString):
+
2012-09-11 Tony Chang <[email protected]>
Rename computeLogicalHeight to updateLogicalHeight
Modified: trunk/Source/WebCore/css/CSSAspectRatioValue.cpp (128203 => 128204)
--- trunk/Source/WebCore/css/CSSAspectRatioValue.cpp 2012-09-11 17:39:08 UTC (rev 128203)
+++ trunk/Source/WebCore/css/CSSAspectRatioValue.cpp 2012-09-11 17:40:36 UTC (rev 128204)
@@ -36,11 +36,7 @@
String CSSAspectRatioValue::customCssText() const
{
- StringBuilder result;
- result.append(String::number(m_numeratorValue));
- result.append("/");
- result.append(String::number(m_denominatorValue));
- return result.toString();
+ return String::number(m_numeratorValue) + '/' + String::number(m_denominatorValue);
}
void CSSAspectRatioValue::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
Modified: trunk/Source/WebCore/platform/graphics/gpu/LoopBlinnPathProcessor.cpp (128203 => 128204)
--- trunk/Source/WebCore/platform/graphics/gpu/LoopBlinnPathProcessor.cpp 2012-09-11 17:39:08 UTC (rev 128203)
+++ trunk/Source/WebCore/platform/graphics/gpu/LoopBlinnPathProcessor.cpp 2012-09-11 17:40:36 UTC (rev 128204)
@@ -69,15 +69,15 @@
String valueToString(const FloatRect& arg)
{
StringBuilder builder;
- builder.append("[FloatRect x=");
+ builder.appendLiteral("[FloatRect x=");
builder.append(String::number(arg.x()));
- builder.append(" y=");
+ builder.appendLiteral(" y=");
builder.append(String::number(arg.y()));
- builder.append(" maxX=");
+ builder.appendLiteral(" maxX=");
builder.append(String::number(arg.maxX()));
- builder.append(" maxY=");
+ builder.appendLiteral(" maxY=");
builder.append(String::number(arg.maxY()));
- builder.append("]");
+ builder.append(']');
return builder.toString();
}
#endif
Modified: trunk/Source/WebCore/svg/SVGPointList.cpp (128203 => 128204)
--- trunk/Source/WebCore/svg/SVGPointList.cpp 2012-09-11 17:39:08 UTC (rev 128203)
+++ trunk/Source/WebCore/svg/SVGPointList.cpp 2012-09-11 17:40:36 UTC (rev 128204)
@@ -36,7 +36,7 @@
unsigned size = this->size();
for (unsigned i = 0; i < size; ++i) {
if (i > 0)
- builder.append(" "); // FIXME: Shouldn't we use commas to seperate?
+ builder.append(' '); // FIXME: Shouldn't we use commas to seperate?
const FloatPoint& point = at(i);
builder.append(String::number(point.x()) + ' ' + String::number(point.y()));
Modified: trunk/Source/WebKit/blackberry/ChangeLog (128203 => 128204)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-09-11 17:39:08 UTC (rev 128203)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-09-11 17:40:36 UTC (rev 128204)
@@ -1,3 +1,18 @@
+2012-09-11 Jinwoo Song <[email protected]>
+
+ Deploy StringBuilder::appendNumber() and StringBuilder::appendLiteral() in more places
+ https://bugs.webkit.org/show_bug.cgi?id=96344
+
+ Reviewed by Benjamin Poulain.
+
+ Use StringBuilder::appendNumber() instead of String::number(). Also deploy
+ StringBuilder::appendLiteral() instead of String::append() in the surrounding code.
+
+ * WebCoreSupport/DatePickerClient.cpp:
+ (WebCore::DatePickerClient::generateHTML):
+ * WebCoreSupport/SelectPopupClient.cpp:
+ (WebCore::SelectPopupClient::generateHTML):
+
2012-09-11 Jacky Jiang <[email protected]>
[BlackBerry] InRegion scrollable area dangling pointers were accessed in UI thread
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/DatePickerClient.cpp (128203 => 128204)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/DatePickerClient.cpp 2012-09-11 17:39:08 UTC (rev 128203)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/DatePickerClient.cpp 2012-09-11 17:40:36 UTC (rev 128204)
@@ -50,28 +50,28 @@
void DatePickerClient::generateHTML(BlackBerry::Platform::BlackBerryInputType type, const BlackBerry::WebKit::WebString& value, const BlackBerry::WebKit::WebString& min, const BlackBerry::WebKit::WebString& max, double step)
{
StringBuilder source;
- source.append("<style>\n");
+ source.appendLiteral("<style>\n");
// Include CSS file.
source.append(popupControlBlackBerryCss,
sizeof(popupControlBlackBerryCss));
- source.append("</style>\n<style>");
+ source.appendLiteral("</style>\n<style>");
source.append(timeControlBlackBerryCss,
sizeof(timeControlBlackBerryCss));
- source.append("</style></head><body>\n");
- source.append("<script>\n");
- source.append("window.addEventListener('load', function () {");
+ source.appendLiteral("</style></head><body>\n"
+ "<script>\n"
+ "window.addEventListener('load', function () {");
switch (type) {
case BlackBerry::Platform::InputTypeDate:
- source.append("window.popupcontrol.show(\"Date\", ");
+ source.appendLiteral("window.popupcontrol.show(\"Date\", ");
break;
case BlackBerry::Platform::InputTypeTime:
- source.append("window.popupcontrol.show(\"Time\", ");
+ source.appendLiteral("window.popupcontrol.show(\"Time\", ");
break;
case BlackBerry::Platform::InputTypeDateTime:
- source.append("window.popupcontrol.show(\"DateTime\", ");
+ source.appendLiteral("window.popupcontrol.show(\"DateTime\", ");
break;
case BlackBerry::Platform::InputTypeDateTimeLocal:
- source.append("window.popupcontrol.show(\"DateTimeLocal\", ");
+ source.appendLiteral("window.popupcontrol.show(\"DateTimeLocal\", ");
break;
case BlackBerry::Platform::InputTypeMonth:
case BlackBerry::Platform::InputTypeWeek:
@@ -81,21 +81,21 @@
if (!value.isEmpty())
source.append("\"" + String(value.impl()) + "\", ");
else
- source.append("0, ");
+ source.appendLiteral("0, ");
if (!min.isEmpty())
source.append(String(min.impl()) + ", ");
else
- source.append("0, ");
+ source.appendLiteral("0, ");
if (!max.isEmpty())
source.append(String(max.impl()) + ", ");
else
- source.append("0, ");
+ source.appendLiteral("0, ");
source.append(String::number(step));
- source.append("); \n }); \n");
+ source.appendLiteral("); \n }); \n");
source.append(timeControlBlackBerryJs, sizeof(timeControlBlackBerryJs));
- source.append("</script>\n");
- source.append("</body> </html>\n");
+ source.appendLiteral("</script>\n"
+ "</body> </html>\n");
m_source = source.toString();
}
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/SelectPopupClient.cpp (128203 => 128204)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/SelectPopupClient.cpp 2012-09-11 17:39:08 UTC (rev 128203)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/SelectPopupClient.cpp 2012-09-11 17:40:36 UTC (rev 128204)
@@ -66,64 +66,70 @@
const int* itemType, bool* selecteds)
{
StringBuilder source;
- source.append("<style>\n");
+ source.appendLiteral("<style>\n");
// Include CSS file.
source.append(popupControlBlackBerryCss,
sizeof(popupControlBlackBerryCss));
- source.append("</style>\n<style>");
+ source.appendLiteral("</style>\n<style>");
source.append(selectControlBlackBerryCss,
sizeof(selectControlBlackBerryCss));
- source.append("</style></head><body>\n");
- source.append("<script>\n");
- source.append("window.addEventListener('load', function () {");
+ source.appendLiteral("</style></head><body>\n"
+ "<script>\n"
+ "window.addEventListener('load', function () {");
if (m_multiple)
- source.append("window.select.show(true, ");
+ source.appendLiteral("window.select.show(true, ");
else
- source.append("window.select.show(false, ");
+ source.appendLiteral("window.select.show(false, ");
// Add labels.
- source.append("[");
+ source.append('[');
for (int i = 0; i < size; i++) {
source.append("'" + String(labels[i].impl()).replace('\\', "\\\\").replace('\'', "\\'") + "'");
// Don't append ',' to last element.
if (i != size - 1)
- source.append(", ");
+ source.appendLiteral(", ");
}
- source.append("], ");
+ source.appendLiteral("], ");
// Add enables.
- source.append("[");
+ source.append('[');
for (int i = 0; i < size; i++) {
- source.append(enableds[i]? "true" : "false");
+ if (enableds[i])
+ source.appendLiteral("true");
+ else
+ source.appendLiteral("false");
// Don't append ',' to last element.
if (i != size - 1)
- source.append(", ");
+ source.appendLiteral(", ");
}
- source.append("], ");
+ source.appendLiteral("], ");
// Add itemType.
- source.append("[");
+ source.append('[');
for (int i = 0; i < size; i++) {
- source.append(String::number(itemType[i]));
+ source.appendNumber(itemType[i]);
// Don't append ',' to last element.
if (i != size - 1)
- source.append(", ");
+ source.appendLiteral(", ");
}
- source.append("], ");
+ source.appendLiteral("], ");
// Add selecteds
- source.append("[");
+ source.append('[');
for (int i = 0; i < size; i++) {
- source.append(selecteds[i]? "true" : "false");
+ if (selecteds[i])
+ source.appendLiteral("true");
+ else
+ source.appendLiteral("false");
// Don't append ',' to last element.
if (i != size - 1)
- source.append(", ");
+ source.appendLiteral(", ");
}
- source.append("] ");
- source.append(", 'Cancel'");
+ source.appendLiteral("] "
+ ", 'Cancel'");
// If multi-select, add OK button for confirm.
if (m_multiple)
- source.append(", 'OK'");
- source.append("); \n }); \n");
+ source.appendLiteral(", 'OK'");
+ source.appendLiteral("); \n }); \n");
source.append(selectControlBlackBerryJs, sizeof(selectControlBlackBerryJs));
- source.append("</script>\n");
- source.append("</body> </html>\n");
+ source.appendLiteral("</script>\n"
+ "</body> </html>\n");
m_source = source.toString();
}
Modified: trunk/Source/WebKit2/ChangeLog (128203 => 128204)
--- trunk/Source/WebKit2/ChangeLog 2012-09-11 17:39:08 UTC (rev 128203)
+++ trunk/Source/WebKit2/ChangeLog 2012-09-11 17:40:36 UTC (rev 128204)
@@ -1,3 +1,21 @@
+2012-09-11 Jinwoo Song <[email protected]>
+
+ Deploy StringBuilder::appendNumber() and StringBuilder::appendLiteral() in more places
+ https://bugs.webkit.org/show_bug.cgi?id=96344
+
+ Reviewed by Benjamin Poulain.
+
+ Use StringBuilder::appendNumber() instead of String::number(). Also deploy
+ StringBuilder::appendLiteral() instead of String::append() in the surrounding code.
+
+ * Shared/WebMemorySampler.cpp:
+ (WebKit::WebMemorySampler::appendCurrentMemoryUsageToFile):
+ * UIProcess/InspectorServer/WebSocketServerConnection.cpp:
+ (WebKit::WebSocketServerConnection::sendHTTPResponseHeader):
+ * UIProcess/InspectorServer/qt/WebInspectorServerQt.cpp:
+ (WebKit::WebInspectorServer::inspectorUrlForPageID):
+ (WebKit::WebInspectorServer::buildPageList):
+
2012-09-11 Anders Carlsson <[email protected]>
Fix speling error in comment.
Modified: trunk/Source/WebKit2/Shared/WebMemorySampler.cpp (128203 => 128204)
--- trunk/Source/WebKit2/Shared/WebMemorySampler.cpp 2012-09-11 17:39:08 UTC (rev 128203)
+++ trunk/Source/WebKit2/Shared/WebMemorySampler.cpp 2012-09-11 17:40:36 UTC (rev 128204)
@@ -177,7 +177,7 @@
statString.append(separator);
for (size_t i = 0; i < memoryStats.values.size(); ++i) {
statString.append(separator);
- statString.append(String::number(memoryStats.values[i]));
+ statString.appendNumber(memoryStats.values[i]);
}
}
statString.append('\n');
Modified: trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServerConnection.cpp (128203 => 128204)
--- trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServerConnection.cpp 2012-09-11 17:39:08 UTC (rev 128203)
+++ trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServerConnection.cpp 2012-09-11 17:40:36 UTC (rev 128204)
@@ -99,18 +99,19 @@
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());
Modified: trunk/Source/WebKit2/UIProcess/InspectorServer/qt/WebInspectorServerQt.cpp (128203 => 128204)
--- trunk/Source/WebKit2/UIProcess/InspectorServer/qt/WebInspectorServerQt.cpp 2012-09-11 17:39:08 UTC (rev 128203)
+++ trunk/Source/WebKit2/UIProcess/InspectorServer/qt/WebInspectorServerQt.cpp 2012-09-11 17:40:36 UTC (rev 128204)
@@ -68,34 +68,36 @@
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";
