<!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>[184617] 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/184617">184617</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2015-05-19 22:57:55 -0700 (Tue, 19 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Give StringView a utf8() API.
<https://webkit.org/b/145201>
Source/JavaScriptCore:
Reviewed by Anders Carlsson.
Use JSString::view() in a few places where we couldn't before due to StringView
lacking a utf8() API. This is a minor speed-up on Kraken's crypto subtests,
which like to call encode() with substring JSStrings.
* jsc.cpp:
(functionPrint):
(functionDebug):
* runtime/JSGlobalObjectFunctions.cpp:
(JSC::encode):
Source/WTF:
Reviewed by Anders Carlsson
Added an LChar version of StringImpl::utf8ForCharacters() and use that to give
StringView a utf8() API just like String has.
* wtf/text/StringImpl.cpp:
(WTF::StringImpl::utf8ForCharacters):
* wtf/text/StringImpl.h:
* wtf/text/StringView.cpp:
(WTF::StringView::utf8):
* wtf/text/StringView.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorejsccpp">trunk/Source/JavaScriptCore/jsc.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjectFunctionscpp">trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtftextStringImplcpp">trunk/Source/WTF/wtf/text/StringImpl.cpp</a></li>
<li><a href="#trunkSourceWTFwtftextStringImplh">trunk/Source/WTF/wtf/text/StringImpl.h</a></li>
<li><a href="#trunkSourceWTFwtftextStringViewcpp">trunk/Source/WTF/wtf/text/StringView.cpp</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 (184616 => 184617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-05-20 05:41:13 UTC (rev 184616)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-05-20 05:57:55 UTC (rev 184617)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2015-05-19 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><ins>+ Give StringView a utf8() API.
+ <https://webkit.org/b/145201>
+
+ Reviewed by Anders Carlsson.
+
+ Use JSString::view() in a few places where we couldn't before due to StringView
+ lacking a utf8() API. This is a minor speed-up on Kraken's crypto subtests,
+ which like to call encode() with substring JSStrings.
+
+ * jsc.cpp:
+ (functionPrint):
+ (functionDebug):
+ * runtime/JSGlobalObjectFunctions.cpp:
+ (JSC::encode):
+
+2015-05-19 Andreas Kling <akling@apple.com>
+
</ins><span class="cx"> [JSC] Speed up URL encode/decode by using bitmaps instead of strchr().
</span><span class="cx"> <https://webkit.org/b/145115>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejsccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jsc.cpp (184616 => 184617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jsc.cpp 2015-05-20 05:41:13 UTC (rev 184616)
+++ trunk/Source/JavaScriptCore/jsc.cpp 2015-05-20 05:57:55 UTC (rev 184617)
</span><span class="lines">@@ -690,7 +690,7 @@
</span><span class="cx"> if (i)
</span><span class="cx"> putchar(' ');
</span><span class="cx">
</span><del>- printf("%s", exec->uncheckedArgument(i).toString(exec)->value(exec).utf8().data());
</del><ins>+ printf("%s", exec->uncheckedArgument(i).toString(exec)->view(exec).utf8().data());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> putchar('\n');
</span><span class="lines">@@ -711,7 +711,7 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL functionDebug(ExecState* exec)
</span><span class="cx"> {
</span><del>- fprintf(stderr, "--> %s\n", exec->argument(0).toString(exec)->value(exec).utf8().data());
</del><ins>+ fprintf(stderr, "--> %s\n", exec->argument(0).toString(exec)->view(exec).utf8().data());
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjectFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp (184616 => 184617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp 2015-05-20 05:41:13 UTC (rev 184616)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp 2015-05-20 05:57:55 UTC (rev 184617)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">
</span><span class="cx"> static JSValue encode(ExecState* exec, const Bitmap<256>& doNotEscape)
</span><span class="cx"> {
</span><del>- CString cstr = exec->argument(0).toString(exec)->value(exec).utf8(StrictConversion);
</del><ins>+ CString cstr = exec->argument(0).toString(exec)->view(exec).utf8(StrictConversion);
</ins><span class="cx"> if (!cstr.data())
</span><span class="cx"> return exec->vm().throwException(exec, createURIError(exec, ASCIILiteral("String contained an illegal UTF-16 sequence.")));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (184616 => 184617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-05-20 05:41:13 UTC (rev 184616)
+++ trunk/Source/WTF/ChangeLog 2015-05-20 05:57:55 UTC (rev 184617)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-05-19 Andreas Kling <akling@apple.com>
+
+ Give StringView a utf8() API.
+ <https://webkit.org/b/145201>
+
+ Reviewed by Anders Carlsson
+
+ Added an LChar version of StringImpl::utf8ForCharacters() and use that to give
+ StringView a utf8() API just like String has.
+
+ * wtf/text/StringImpl.cpp:
+ (WTF::StringImpl::utf8ForCharacters):
+ * wtf/text/StringImpl.h:
+ * wtf/text/StringView.cpp:
+ (WTF::StringView::utf8):
+ * wtf/text/StringView.h:
+
</ins><span class="cx"> 2015-05-19 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> Move AtomicStringImpl table related operations from AtomicString to AtomicStringImpl
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringImpl.cpp (184616 => 184617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringImpl.cpp 2015-05-20 05:41:13 UTC (rev 184616)
+++ trunk/Source/WTF/wtf/text/StringImpl.cpp 2015-05-20 05:57:55 UTC (rev 184617)
</span><span class="lines">@@ -2198,6 +2198,20 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+CString StringImpl::utf8ForCharacters(const LChar* characters, unsigned length)
+{
+ if (!length)
+ return CString("", 0);
+ if (length > std::numeric_limits<unsigned>::max() / 3)
+ return CString();
+ Vector<char, 1024> bufferVector(length * 3);
+ char* buffer = bufferVector.data();
+ const LChar* source = characters;
+ ConversionResult result = convertLatin1ToUTF8(&source, source + length, &buffer, buffer + bufferVector.size());
+ ASSERT_UNUSED(result, result != targetExhausted); // (length * 3) should be sufficient for any conversion
+ return CString(bufferVector.data(), buffer - bufferVector.data());
+}
+
</ins><span class="cx"> CString StringImpl::utf8ForCharacters(const UChar* characters, unsigned length, ConversionMode mode)
</span><span class="cx"> {
</span><span class="cx"> if (!length)
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringImpl.h (184616 => 184617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringImpl.h 2015-05-20 05:41:13 UTC (rev 184616)
+++ trunk/Source/WTF/wtf/text/StringImpl.h 2015-05-20 05:57:55 UTC (rev 184617)
</span><span class="lines">@@ -512,6 +512,7 @@
</span><span class="cx"> bool isSubString() const { return bufferOwnership() == BufferSubstring; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ static WTF_EXPORT_STRING_API CString utf8ForCharacters(const LChar* characters, unsigned length);
</ins><span class="cx"> static WTF_EXPORT_STRING_API CString utf8ForCharacters(const UChar* characters, unsigned length, ConversionMode = LenientConversion);
</span><span class="cx"> WTF_EXPORT_STRING_API CString utf8ForRange(unsigned offset, unsigned length, ConversionMode = LenientConversion) const;
</span><span class="cx"> WTF_EXPORT_STRING_API CString utf8(ConversionMode = LenientConversion) const;
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringView.cpp (184616 => 184617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringView.cpp 2015-05-20 05:41:13 UTC (rev 184616)
+++ trunk/Source/WTF/wtf/text/StringView.cpp 2015-05-20 05:57:55 UTC (rev 184617)
</span><span class="lines">@@ -30,9 +30,12 @@
</span><span class="cx"> #include <mutex>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><ins>+#include <wtf/unicode/UTF8.h>
</ins><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><ins>+using namespace Unicode;
+
</ins><span class="cx"> bool StringView::containsIgnoringASCIICase(const StringView& matchString) const
</span><span class="cx"> {
</span><span class="cx"> return findIgnoringASCIICase(matchString) != notFound;
</span><span class="lines">@@ -84,6 +87,15 @@
</span><span class="cx"> return equalIgnoringASCIICase(a.characters16(), b, bLength);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+CString StringView::utf8(ConversionMode mode) const
+{
+ if (isNull())
+ return CString("", 0);
+ if (is8Bit())
+ return StringImpl::utf8ForCharacters(characters8(), length());
+ return StringImpl::utf8ForCharacters(characters16(), length(), mode);
+}
+
</ins><span class="cx"> #if CHECK_STRINGVIEW_LIFETIME
</span><span class="cx">
</span><span class="cx"> // Manage reference count manually so UnderlyingString does not need to be defined in the header.
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringView.h (184616 => 184617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringView.h 2015-05-20 05:41:13 UTC (rev 184616)
+++ trunk/Source/WTF/wtf/text/StringView.h 2015-05-20 05:57:55 UTC (rev 184617)
</span><span class="lines">@@ -30,6 +30,8 @@
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><ins>+#include <wtf/text/CString.h>
+#include <wtf/text/ConversionMode.h>
</ins><span class="cx"> #include <wtf/text/LChar.h>
</span><span class="cx"> #include <wtf/text/StringCommon.h>
</span><span class="cx">
</span><span class="lines">@@ -96,6 +98,8 @@
</span><span class="cx"> WTF_EXPORT_STRING_API RetainPtr<NSString> createNSStringWithoutCopying() const;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ WTF_EXPORT_STRING_API CString utf8(ConversionMode = LenientConversion) const;
+
</ins><span class="cx"> class UpconvertedCharacters;
</span><span class="cx"> UpconvertedCharacters upconvertedCharacters() const;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>