<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[204228] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/204228">204228</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2016-08-06 11:19:13 -0700 (Sat, 06 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simplify valueToUSVString
https://bugs.webkit.org/show_bug.cgi?id=160628
Reviewed by Sam Weinig.
* bindings/js/JSDOMBinding.cpp:
(WebCore::isUnmatchedSurrogatePair): Deleted. This function was incorrectly named,
since it actually returned true if any surrogate code unit was passed.
(WebCore::valueToUSVString): Added a fast path for 8-bit characters that doesn't
bother iterating the string at all. Changed the fast path to actually check for
surrogate pairs. Use StringView::codePoints rather than writing our own loop that
does the same thing. In the slow path, use StringView::codePoints to make the logic
clear rather than writing out exactly what the specification says. This gets rid of
all the many constants the old version of the function contained.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMBindingcpp">trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204227 => 204228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-06 16:01:20 UTC (rev 204227)
+++ trunk/Source/WebCore/ChangeLog 2016-08-06 18:19:13 UTC (rev 204228)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-08-06 Darin Adler <darin@apple.com>
+
+ Simplify valueToUSVString
+ https://bugs.webkit.org/show_bug.cgi?id=160628
+
+ Reviewed by Sam Weinig.
+
+ * bindings/js/JSDOMBinding.cpp:
+ (WebCore::isUnmatchedSurrogatePair): Deleted. This function was incorrectly named,
+ since it actually returned true if any surrogate code unit was passed.
+ (WebCore::valueToUSVString): Added a fast path for 8-bit characters that doesn't
+ bother iterating the string at all. Changed the fast path to actually check for
+ surrogate pairs. Use StringView::codePoints rather than writing our own loop that
+ does the same thing. In the slow path, use StringView::codePoints to make the logic
+ clear rather than writing out exactly what the specification says. This gets rid of
+ all the many constants the old version of the function contained.
+
</ins><span class="cx"> 2016-08-06 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> [Fetch API] Fetching with a FormData body should reject until it is implemented
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMBindingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp (204227 => 204228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp 2016-08-06 16:01:20 UTC (rev 204227)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp 2016-08-06 18:19:13 UTC (rev 204228)
</span><span class="lines">@@ -118,43 +118,37 @@
</span><span class="cx"> return value.toString(exec)->value(exec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline bool isUnmatchedSurrogatePair(UChar c)
-{
- return c >= 0xD800 || c <= 0xDFFF;
-}
-
</del><span class="cx"> String valueToUSVString(ExecState* exec, JSValue value)
</span><span class="cx"> {
</span><del>- String s = value.toWTFString(exec);
</del><ins>+ String string = value.toWTFString(exec);
</ins><span class="cx"> if (exec->hadException())
</span><del>- return String();
</del><ins>+ return { };
+ StringView view { string };
</ins><span class="cx">
</span><del>- // Fast path if there is no unmatched surrogate pair.
- if (s.find(isUnmatchedSurrogatePair) == notFound)
- return s;
</del><ins>+ // Fast path for 8-bit strings, since they can't have any surrogates.
+ if (view.is8Bit())
+ return string;
</ins><span class="cx">
</span><ins>+ // Fast path for the case where there are no unpaired surrogates.
+ bool foundUnpairedSurrogate = false;
+ for (auto codePoint : view.codePoints()) {
+ if (U_IS_SURROGATE(codePoint)) {
+ foundUnpairedSurrogate = true;
+ break;
+ }
+ }
+ if (!foundUnpairedSurrogate)
+ return string;
+
</ins><span class="cx"> // Slow path: http://heycam.github.io/webidl/#dfn-obtain-unicode
</span><del>- unsigned n = s.length();
</del><ins>+ // Replaces unpaired surrogates with the replacememnt character.
</ins><span class="cx"> StringBuilder result;
</span><del>- result.reserveCapacity(n);
- for (unsigned i = 0; i < n; ++i) {
- UChar c = s[i];
- if (c < 0xD800 || c > 0xDFFF)
- result.append(c);
- if (c >= 0xDC00 && c <= 0xDFFF)
</del><ins>+ result.reserveCapacity(view.length());
+ for (auto codePoint : view.codePoints()) {
+ if (U_IS_SURROGATE(codePoint))
</ins><span class="cx"> result.append(replacementCharacter);
</span><del>- if (c >= 0xD800 && c <= 0xDBFF) {
- if (i == n - 1)
- result.append(replacementCharacter);
- else {
- UChar d = s[i + 1];
- if (d >= 0xDC00 && d <= 0xDFFF) {
- result.append(U16_GET_SUPPLEMENTARY(c, d));
- ++i;
- } else
- result.append(replacementCharacter);
- }
- }
</del><ins>+ else
+ result.append(codePoint);
</ins><span class="cx"> }
</span><span class="cx"> return result.toString();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>