summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-13 14:19:27 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-13 14:19:27 +0000
commita0200c5d1d5b98a8a9968b9d3aa893d7e88f59ad (patch)
tree5769d50bd1828cd576a5e5313690e232e02c9439 /webkit
parentc72e24894a880d67ccc35ee67c85b784f1e829bb (diff)
downloadchromium_src-a0200c5d1d5b98a8a9968b9d3aa893d7e88f59ad.zip
chromium_src-a0200c5d1d5b98a8a9968b9d3aa893d7e88f59ad.tar.gz
chromium_src-a0200c5d1d5b98a8a9968b9d3aa893d7e88f59ad.tar.bz2
net: Move EscapeForHTML() functions into net namespace.
BUG=64263 TEST=None R=willchan@chromium.org Review URL: http://codereview.chromium.org/8256006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105304 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/appcache/view_appcache_internals_job.cc14
-rw-r--r--webkit/blob/view_blob_internals_job.cc10
-rw-r--r--webkit/glue/webclipboard_impl.cc4
3 files changed, 14 insertions, 14 deletions
diff --git a/webkit/appcache/view_appcache_internals_job.cc b/webkit/appcache/view_appcache_internals_job.cc
index 8e73052..8a36ad7 100644
--- a/webkit/appcache/view_appcache_internals_job.cc
+++ b/webkit/appcache/view_appcache_internals_job.cc
@@ -71,17 +71,17 @@ void EmitListItem(const std::string& label,
const std::string& data,
std::string* out) {
out->append("<li>");
- out->append(EscapeForHTML(label));
- out->append(EscapeForHTML(data));
+ out->append(net::EscapeForHTML(label));
+ out->append(net::EscapeForHTML(data));
out->append("</li>\n");
}
void EmitAnchor(const std::string& url, const std::string& text,
std::string* out) {
out->append("<a href=\"");
- out->append(EscapeForHTML(url));
+ out->append(net::EscapeForHTML(url));
out->append("\">");
- out->append(EscapeForHTML(text));
+ out->append(net::EscapeForHTML(text));
out->append("</a>");
}
@@ -239,15 +239,15 @@ void EmitAppCacheResourceInfoVector(
void EmitResponseHeaders(net::HttpResponseHeaders* headers, std::string* out) {
out->append("<hr><pre>");
- out->append(EscapeForHTML(headers->GetStatusLine()));
+ out->append(net::EscapeForHTML(headers->GetStatusLine()));
out->push_back('\n');
void* iter = NULL;
std::string name, value;
while (headers->EnumerateHeaderLines(&iter, &name, &value)) {
- out->append(EscapeForHTML(name));
+ out->append(net::EscapeForHTML(name));
out->append(": ");
- out->append(EscapeForHTML(value));
+ out->append(net::EscapeForHTML(value));
out->push_back('\n');
}
out->append("</pre>");
diff --git a/webkit/blob/view_blob_internals_job.cc b/webkit/blob/view_blob_internals_job.cc
index 1d562c5..753a6af 100644
--- a/webkit/blob/view_blob_internals_job.cc
+++ b/webkit/blob/view_blob_internals_job.cc
@@ -55,7 +55,7 @@ void EndHTML(std::string* out) {
void AddHTMLBoldText(const std::string& text, std::string* out) {
out->append("<b>");
- out->append(EscapeForHTML(text));
+ out->append(net::EscapeForHTML(text));
out->append("</b>");
}
@@ -73,7 +73,7 @@ void AddHTMLListItem(const std::string& element_title,
out->append("<li>");
// No need to escape element_title since constant string is passed.
out->append(element_title);
- out->append(EscapeForHTML(element_data));
+ out->append(net::EscapeForHTML(element_data));
out->append("</li>");
}
@@ -81,7 +81,7 @@ void AddHTMLButton(const std::string& title,
const std::string& command,
std::string* out) {
// No need to escape title since constant string is passed.
- std::string escaped_command = EscapeForHTML(command.c_str());
+ std::string escaped_command = net::EscapeForHTML(command.c_str());
base::StringAppendF(out,
"<form action=\"\" method=\"GET\">\n"
"<input type=\"hidden\" name=\"remove\" value=\"%s\">\n"
@@ -198,9 +198,9 @@ void ViewBlobInternalsJob::GenerateHTMLForBlobData(const BlobData& blob_data,
AddHTMLListItem(kType, "file", out);
AddHTMLListItem(kPath,
#if defined(OS_WIN)
- EscapeForHTML(WideToUTF8(item.file_path().value())),
+ net::EscapeForHTML(WideToUTF8(item.file_path().value())),
#else
- EscapeForHTML(item.file_path().value()),
+ net::EscapeForHTML(item.file_path().value()),
#endif
out);
if (!item.expected_modification_time().is_null()) {
diff --git a/webkit/glue/webclipboard_impl.cc b/webkit/glue/webclipboard_impl.cc
index 0c4c1a7..3f66c80 100644
--- a/webkit/glue/webclipboard_impl.cc
+++ b/webkit/glue/webclipboard_impl.cc
@@ -40,7 +40,7 @@ std::string WebClipboardImpl::URLToMarkup(const WebURL& url,
markup.append(url.spec());
markup.append("\">");
// TODO(darin): HTML escape this
- markup.append(EscapeForHTML(UTF16ToUTF8(title)));
+ markup.append(net::EscapeForHTML(UTF16ToUTF8(title)));
markup.append("</a>");
return markup;
}
@@ -53,7 +53,7 @@ std::string WebClipboardImpl::URLToImageMarkup(const WebURL& url,
markup.append("\"");
if (!title.isEmpty()) {
markup.append(" alt=\"");
- markup.append(EscapeForHTML(UTF16ToUTF8(title)));
+ markup.append(net::EscapeForHTML(UTF16ToUTF8(title)));
markup.append("\"");
}
markup.append("/>");