content/renderer/clipboard_utils.cc - Issue 1259673002: Make UTF16ToASCII and UTF16TOUTF8 take a StringPiece

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/clipboard_utils.cc

Issue 1259673002: Make UTF16ToASCII and UTF16TOUTF8 take a StringPiece (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/renderer/cache_storage/cache_storage_dispatcher.cc ('k') | content/renderer/media/android/webmediaplayer_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/clipboard_utils.cc

diff --git a/content/renderer/clipboard_utils.cc b/content/renderer/clipboard_utils.cc

index eb88332af4a32488cc551ca0554388475feb7067..6fd8542e10d22b61cb62051f5ab2cadeeefa544d 100644

--- a/content/renderer/clipboard_utils.cc

+++ b/content/renderer/clipboard_utils.cc

@@ -17,7 +17,8 @@ std::string URLToMarkup(const blink::WebURL& url,

markup.append(url.spec());

markup.append("\">");

// TODO(darin): HTML escape this

- markup.append(net::EscapeForHTML(base::UTF16ToUTF8(title)));

+ markup.append(

+ net::EscapeForHTML(base::UTF16ToUTF8(base::StringPiece16(title))));

markup.append("</a>");

return markup;

}

@@ -29,7 +30,8 @@ std::string URLToImageMarkup(const blink::WebURL& url,

markup.append("\"");

if (!title.isEmpty()) {

markup.append(" alt=\"");

- markup.append(net::EscapeForHTML(base::UTF16ToUTF8(title)));

+ markup.append(

+ net::EscapeForHTML(base::UTF16ToUTF8(base::StringPiece16(title))));

markup.append("\"");

}

markup.append("/>");