Title: [128226] trunk/Source/WebKit/blackberry
- Revision
- 128226
- Author
- [email protected]
- Date
- 2012-09-11 14:29:59 -0700 (Tue, 11 Sep 2012)
Log Message
[BlackBerry] make pickers/dialogs use appendLiteral
https://bugs.webkit.org/show_bug.cgi?id=96424
Reviewed by Antonio Gomes.
PR 204032
Other pickers were updated in r128204.
* WebCoreSupport/ColorPickerClient.cpp:
(WebCore::ColorPickerClient::generateHTML):
* WebCoreSupport/PagePopupBlackBerry.cpp:
(WebCore::PagePopupBlackBerry::generateHTML):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/ChangeLog (128225 => 128226)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-09-11 21:10:38 UTC (rev 128225)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-09-11 21:29:59 UTC (rev 128226)
@@ -1,3 +1,19 @@
+2012-09-11 Rob Buis <[email protected]>
+
+ [BlackBerry] make pickers/dialogs use appendLiteral
+ https://bugs.webkit.org/show_bug.cgi?id=96424
+
+ Reviewed by Antonio Gomes.
+
+ PR 204032
+
+ Other pickers were updated in r128204.
+
+ * WebCoreSupport/ColorPickerClient.cpp:
+ (WebCore::ColorPickerClient::generateHTML):
+ * WebCoreSupport/PagePopupBlackBerry.cpp:
+ (WebCore::PagePopupBlackBerry::generateHTML):
+
2012-09-11 Konrad Piascik <[email protected]>
[BlackBerry] Fix history navigation for error pages.
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/ColorPickerClient.cpp (128225 => 128226)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/ColorPickerClient.cpp 2012-09-11 21:10:38 UTC (rev 128225)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/ColorPickerClient.cpp 2012-09-11 21:29:59 UTC (rev 128226)
@@ -45,24 +45,24 @@
void ColorPickerClient::generateHTML(const BlackBerry::WebKit::WebString& value)
{
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(colorControlBlackBerryCss,
sizeof(colorControlBlackBerryCss));
- source.append("</style></head><body>\n");
- source.append("<script>\n");
- source.append("window.addEventListener('load', function () {");
- source.append("window.popupcontrol.show(");
+ source.appendLiteral("</style></head><body>\n");
+ source.appendLiteral("<script>\n");
+ source.appendLiteral("window.addEventListener('load', function () {");
+ source.appendLiteral("window.popupcontrol.show(");
if (!value.isEmpty())
source.append("\"" + String(value.impl()) + "\"); \n }); \n");
else
- source.append("); \n }); \n");
+ source.appendLiteral("); \n }); \n");
source.append(colorControlBlackBerryJs, sizeof(colorControlBlackBerryJs));
- source.append("</script>\n");
- source.append("</body> </html>\n");
+ source.appendLiteral("</script>\n");
+ source.appendLiteral("</body> </html>\n");
m_source = source.toString();
}
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/PagePopupBlackBerry.cpp (128225 => 128226)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/PagePopupBlackBerry.cpp 2012-09-11 21:10:38 UTC (rev 128225)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/PagePopupBlackBerry.cpp 2012-09-11 21:29:59 UTC (rev 128226)
@@ -81,9 +81,9 @@
StringBuilder source;
// FIXME: the hardcoding padding will be removed soon.
int screenWidth = webpage->d->screenSize().width() - PADDING;
- source.append("<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"/>\n");
+ source.appendLiteral("<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"/>\n");
source.append("<meta name=\"viewport\" content=\"width=" + String::number(screenWidth));
- source.append("; user-scalable=no\" />\n");
+ source.appendLiteral("; user-scalable=no\" />\n");
writer->addData(source.toString().utf8().data(), source.toString().utf8().length());
m_client->writeDocument(*writer);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
