<!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>[163727] trunk/Source</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/163727">163727</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-02-08 15:31:35 -0800 (Sat, 08 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Stop using getCharactersWithUpconvert in JavaScriptCore
https://bugs.webkit.org/show_bug.cgi?id=128457
Reviewed by Andreas Kling.
Source/JavaScriptCore:
Change substituteBackreferencesSlow to take StringViews and use a StringBuilder instead of upconverting
if the source or replacement strings area 16-bit.
* runtime/StringPrototype.cpp:
(JSC::substituteBackreferencesSlow):
(JSC::substituteBackreferences):
Source/WTF:
* wtf/text/StringBuilder.h:
(WTF::StringBuilder::append):
Add a new overload that takes a StringView.
* wtf/text/StringView.h:
(WTF::StringView::find):
Add new find member function.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStringPrototypecpp">trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtftextStringBuilderh">trunk/Source/WTF/wtf/text/StringBuilder.h</a></li>
<li><a href="#trunkSourceWTFwtftextStringViewh">trunk/Source/WTF/wtf/text/StringView.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (163726 => 163727)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-02-08 22:29:34 UTC (rev 163726)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-02-08 23:31:35 UTC (rev 163727)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-02-08 Anders Carlsson <andersca@apple.com>
+
+ Stop using getCharactersWithUpconvert in JavaScriptCore
+ https://bugs.webkit.org/show_bug.cgi?id=128457
+
+ Reviewed by Andreas Kling.
+
+ Change substituteBackreferencesSlow to take StringViews and use a StringBuilder instead of upconverting
+ if the source or replacement strings area 16-bit.
+
+ * runtime/StringPrototype.cpp:
+ (JSC::substituteBackreferencesSlow):
+ (JSC::substituteBackreferences):
+
</ins><span class="cx"> 2014-02-08 Mark Rowe <mrowe@apple.com>
</span><span class="cx">
</span><span class="cx"> <https://webkit.org/b/128452> Don't duplicate the list of input files for postprocess-headers.sh
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStringPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp (163726 => 163727)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp 2014-02-08 22:29:34 UTC (rev 163726)
+++ trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp 2014-02-08 23:31:35 UTC (rev 163727)
</span><span class="lines">@@ -157,10 +157,9 @@
</span><span class="cx"> return jsString(exec, string);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template <typename CharType>
-static NEVER_INLINE String substituteBackreferencesSlow(const String& replacement, const String& source, const int* ovector, RegExp* reg, size_t i)
</del><ins>+static NEVER_INLINE String substituteBackreferencesSlow(StringView replacement, StringView source, const int* ovector, RegExp* reg, size_t i)
</ins><span class="cx"> {
</span><del>- Vector<CharType> substitutedReplacement;
</del><ins>+ StringBuilder substitutedReplacement;
</ins><span class="cx"> int offset = 0;
</span><span class="cx"> do {
</span><span class="cx"> if (i + 1 == replacement.length())
</span><span class="lines">@@ -170,7 +169,7 @@
</span><span class="cx"> if (ref == '$') {
</span><span class="cx"> // "$$" -> "$"
</span><span class="cx"> ++i;
</span><del>- substitutedReplacement.append(replacement.getCharactersWithUpconvert<CharType>() + offset, i - offset);
</del><ins>+ substitutedReplacement.append(replacement.substring(offset, i - offset));
</ins><span class="cx"> offset = i + 1;
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="lines">@@ -210,28 +209,25 @@
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> if (i - offset)
</span><del>- substitutedReplacement.append(replacement.getCharactersWithUpconvert<CharType>() + offset, i - offset);
</del><ins>+ substitutedReplacement.append(replacement.substring(offset, i - offset));
</ins><span class="cx"> i += 1 + advance;
</span><span class="cx"> offset = i + 1;
</span><span class="cx"> if (backrefStart >= 0)
</span><del>- substitutedReplacement.append(source.getCharactersWithUpconvert<CharType>() + backrefStart, backrefLength);
</del><ins>+ substitutedReplacement.append(source.substring(backrefStart, backrefLength));
</ins><span class="cx"> } while ((i = replacement.find('$', i + 1)) != notFound);
</span><span class="cx">
</span><span class="cx"> if (replacement.length() - offset)
</span><del>- substitutedReplacement.append(replacement.getCharactersWithUpconvert<CharType>() + offset, replacement.length() - offset);
</del><ins>+ substitutedReplacement.append(replacement.substring(offset));
</ins><span class="cx">
</span><del>- substitutedReplacement.shrinkToFit();
- return String::adopt(substitutedReplacement);
</del><ins>+ return substitutedReplacement.toString();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static inline String substituteBackreferences(const String& replacement, const String& source, const int* ovector, RegExp* reg)
</del><ins>+static inline String substituteBackreferences(const String& replacement, StringView source, const int* ovector, RegExp* reg)
</ins><span class="cx"> {
</span><span class="cx"> size_t i = replacement.find('$');
</span><del>- if (UNLIKELY(i != notFound)) {
- if (replacement.is8Bit() && source.is8Bit())
- return substituteBackreferencesSlow<LChar>(replacement, source, ovector, reg, i);
- return substituteBackreferencesSlow<UChar>(replacement, source, ovector, reg, i);
- }
</del><ins>+ if (UNLIKELY(i != notFound))
+ return substituteBackreferencesSlow(replacement, source, ovector, reg, i);
+
</ins><span class="cx"> return replacement;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (163726 => 163727)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-02-08 22:29:34 UTC (rev 163726)
+++ trunk/Source/WTF/ChangeLog 2014-02-08 23:31:35 UTC (rev 163727)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-02-08 Anders Carlsson <andersca@apple.com>
+
+ Stop using getCharactersWithUpconvert in JavaScriptCore
+ https://bugs.webkit.org/show_bug.cgi?id=128457
+
+ Reviewed by Andreas Kling.
+
+ * wtf/text/StringBuilder.h:
+ (WTF::StringBuilder::append):
+ Add a new overload that takes a StringView.
+
+ * wtf/text/StringView.h:
+ (WTF::StringView::find):
+ Add new find member function.
+
</ins><span class="cx"> 2014-02-08 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Change TextIterator to use StringView, preparing to wean it from deprecatedCharacters
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringBuilderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringBuilder.h (163726 => 163727)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringBuilder.h 2014-02-08 22:29:34 UTC (rev 163726)
+++ trunk/Source/WTF/wtf/text/StringBuilder.h 2014-02-08 23:31:35 UTC (rev 163727)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #define StringBuilder_h
</span><span class="cx">
</span><span class="cx"> #include <wtf/text/AtomicString.h>
</span><ins>+#include <wtf/text/StringView.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="lines">@@ -89,6 +90,14 @@
</span><span class="cx"> append(other.characters16(), other.m_length);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void append(StringView stringView)
+ {
+ if (stringView.is8Bit())
+ append(stringView.characters8(), stringView.length());
+ else
+ append(stringView.characters16(), stringView.length());
+ }
+
</ins><span class="cx"> void append(const String& string, unsigned offset, unsigned length)
</span><span class="cx"> {
</span><span class="cx"> if (!string.length())
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringView.h (163726 => 163727)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringView.h 2014-02-08 22:29:34 UTC (rev 163726)
+++ trunk/Source/WTF/wtf/text/StringView.h 2014-02-08 23:31:35 UTC (rev 163727)
</span><span class="lines">@@ -135,6 +135,13 @@
</span><span class="cx"> return characters16()[index];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ size_t find(UChar character, unsigned start = 0) const
+ {
+ if (is8Bit())
+ return WTF::find(characters8(), length(), character, start);
+ return WTF::find(characters16(), length(), character, start);
+ }
+
</ins><span class="cx"> #if USE(CF)
</span><span class="cx"> // This function converts null strings to empty strings.
</span><span class="cx"> WTF_EXPORT_STRING_API RetainPtr<CFStringRef> createCFStringWithoutCopying() const;
</span></span></pre>
</div>
</div>
</body>
</html>