<!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>[162192] trunk/Source/JavaScriptCore</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/162192">162192</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-17 00:16:50 -0800 (Fri, 17 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/162185">r162185</a>, <a href="http://trac.webkit.org/projects/webkit/changeset/162186">r162186</a>, and <a href="http://trac.webkit.org/projects/webkit/changeset/162187">r162187</a>.
http://trac.webkit.org/changeset/162185
http://trac.webkit.org/changeset/162186
http://trac.webkit.org/changeset/162187
https://bugs.webkit.org/show_bug.cgi?id=127164
Broke JSStringCreateWithCharactersNoCopy, as evidenced by a
JSC API test (Requested by ap on #webkit).
* API/JSStringRef.cpp:
(JSStringGetCharactersPtr):
(JSStringGetUTF8CString):
(JSStringIsEqual):
* API/JSStringRefCF.cpp:
(JSStringCreateWithCFString):
(JSStringCopyCFString):
* API/OpaqueJSString.cpp:
(OpaqueJSString::create):
(OpaqueJSString::identifier):
* API/OpaqueJSString.h:
(OpaqueJSString::create):
(OpaqueJSString::characters):
(OpaqueJSString::deprecatedCharacters):
(OpaqueJSString::OpaqueJSString):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreAPIJSStringRefcpp">trunk/Source/JavaScriptCore/API/JSStringRef.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPIJSStringRefCFcpp">trunk/Source/JavaScriptCore/API/JSStringRefCF.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPIOpaqueJSStringcpp">trunk/Source/JavaScriptCore/API/OpaqueJSString.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPIOpaqueJSStringh">trunk/Source/JavaScriptCore/API/OpaqueJSString.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreAPIJSStringRefcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSStringRef.cpp (162191 => 162192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSStringRef.cpp 2014-01-17 07:59:58 UTC (rev 162191)
+++ trunk/Source/JavaScriptCore/API/JSStringRef.cpp 2014-01-17 08:16:50 UTC (rev 162192)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx">
</span><span class="cx"> const JSChar* JSStringGetCharactersPtr(JSStringRef string)
</span><span class="cx"> {
</span><del>- return string->characters();
</del><ins>+ return string->deprecatedCharacters();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string)
</span><span class="lines">@@ -97,26 +97,20 @@
</span><span class="cx"> if (!bufferSize)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- char* destination = buffer;
- ConversionResult result;
- if (string->is8Bit()) {
- const LChar* source = string->characters8();
- result = convertLatin1ToUTF8(&source, source + string->length(), &destination, destination + bufferSize - 1);
- } else {
- const UChar* source = string->characters16();
- result = convertUTF16ToUTF8(&source, source + string->length(), &destination, destination + bufferSize - 1, true);
- }
-
- *destination++ = '\0';
</del><ins>+ char* p = buffer;
+ const UChar* d = string->deprecatedCharacters();
+ ConversionResult result = convertUTF16ToUTF8(&d, d + string->length(), &p, p + bufferSize - 1, true);
+ *p++ = '\0';
</ins><span class="cx"> if (result != conversionOK && result != targetExhausted)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- return destination - buffer;
</del><ins>+ return p - buffer;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool JSStringIsEqual(JSStringRef a, JSStringRef b)
</span><span class="cx"> {
</span><del>- return OpaqueJSString::equal(a, b);
</del><ins>+ unsigned len = a->length();
+ return len == b->length() && 0 == memcmp(a->deprecatedCharacters(), b->deprecatedCharacters(), len * sizeof(UChar));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool JSStringIsEqualToUTF8CString(JSStringRef a, const char* b)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPIJSStringRefCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSStringRefCF.cpp (162191 => 162192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSStringRefCF.cpp 2014-01-17 07:59:58 UTC (rev 162191)
+++ trunk/Source/JavaScriptCore/API/JSStringRefCF.cpp 2014-01-17 08:16:50 UTC (rev 162192)
</span><span class="lines">@@ -40,28 +40,26 @@
</span><span class="cx"> // We cannot use CFIndex here since CFStringGetLength can return values larger than
</span><span class="cx"> // it can hold. (<rdar://problem/6806478>)
</span><span class="cx"> size_t length = CFStringGetLength(string);
</span><del>- if (!length)
- return OpaqueJSString::create(reinterpret_cast<const LChar*>(""), 0).leakRef();
</del><ins>+ if (length) {
+ Vector<LChar, 1024> lcharBuffer(length);
+ CFIndex usedBufferLength;
+ CFIndex convertedSize = CFStringGetBytes(string, CFRangeMake(0, length), kCFStringEncodingISOLatin1, 0, false, lcharBuffer.data(), length, &usedBufferLength);
+ if (static_cast<size_t>(convertedSize) == length && static_cast<size_t>(usedBufferLength) == length)
+ return OpaqueJSString::create(lcharBuffer.data(), length).leakRef();
</ins><span class="cx">
</span><del>- Vector<LChar, 1024> lcharBuffer(length);
- CFIndex usedBufferLength;
- CFIndex convertedSize = CFStringGetBytes(string, CFRangeMake(0, length), kCFStringEncodingISOLatin1, 0, false, lcharBuffer.data(), length, &usedBufferLength);
- if (static_cast<size_t>(convertedSize) == length && static_cast<size_t>(usedBufferLength) == length)
- return OpaqueJSString::create(lcharBuffer.data(), length).leakRef();
-
- auto buffer = std::make_unique<UniChar[]>(length);
- CFStringGetCharacters(string, CFRangeMake(0, length), buffer.get());
- static_assert(sizeof(UniChar) == sizeof(UChar), "UniChar and UChar must be same size");
- return OpaqueJSString::create(reinterpret_cast<UChar*>(buffer.get()), length).leakRef();
</del><ins>+ auto buffer = std::make_unique<UniChar[]>(length);
+ CFStringGetCharacters(string, CFRangeMake(0, length), buffer.get());
+ COMPILE_ASSERT(sizeof(UniChar) == sizeof(UChar), unichar_and_uchar_must_be_same_size);
+ return OpaqueJSString::create(reinterpret_cast<UChar*>(buffer.get()), length).leakRef();
+ }
+
+ return OpaqueJSString::create(reinterpret_cast<const LChar*>(""), 0).leakRef();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-CFStringRef JSStringCopyCFString(CFAllocatorRef allocator, JSStringRef string)
</del><ins>+CFStringRef JSStringCopyCFString(CFAllocatorRef alloc, JSStringRef string)
</ins><span class="cx"> {
</span><span class="cx"> if (!string->length())
</span><span class="cx"> return CFSTR("");
</span><span class="cx">
</span><del>- if (string->is8Bit())
- return CFStringCreateWithBytes(allocator, reinterpret_cast<const UInt8*>(string->characters8()), string->length(), kCFStringEncodingISOLatin1, false);
-
- return CFStringCreateWithCharacters(allocator, reinterpret_cast<const UniChar*>(string->characters16()), string->length());
</del><ins>+ return CFStringCreateWithCharacters(alloc, reinterpret_cast<const UniChar*>(string->deprecatedCharacters()), string->length());
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPIOpaqueJSStringcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/OpaqueJSString.cpp (162191 => 162192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/OpaqueJSString.cpp 2014-01-17 07:59:58 UTC (rev 162191)
+++ trunk/Source/JavaScriptCore/API/OpaqueJSString.cpp 2014-01-17 08:16:50 UTC (rev 162192)
</span><span class="lines">@@ -36,17 +36,9 @@
</span><span class="cx"> {
</span><span class="cx"> if (!string.isNull())
</span><span class="cx"> return adoptRef(new OpaqueJSString(string));
</span><del>- return nullptr;
</del><ins>+ return 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-OpaqueJSString::~OpaqueJSString()
-{
- if (UChar* characters = m_characters) {
- // m_characters is put in a local here to avoid an extra atomic load.
- fastFree(static_cast<void*>(characters));
- }
-}
-
</del><span class="cx"> String OpaqueJSString::string() const
</span><span class="cx"> {
</span><span class="cx"> if (!this)
</span><span class="lines">@@ -69,43 +61,3 @@
</span><span class="cx">
</span><span class="cx"> return Identifier(vm, m_string.characters16(), m_string.length());
</span><span class="cx"> }
</span><del>-
-const UChar* OpaqueJSString::characters()
-{
- if (!this)
- return nullptr;
-
- // m_characters is put in a local here to avoid an extra atomic load.
- UChar* characters = m_characters;
- if (characters)
- return characters;
-
- unsigned length = m_string.length();
- UChar* newCharacters = static_cast<UChar*>(fastMalloc(length * sizeof(UChar)));
-
- if (m_string.is8Bit()) {
- for (size_t i = 0; i < length; ++i)
- newCharacters[i] = m_string.characters8()[i];
- } else
- memcpy(newCharacters, m_string.characters16(), length * sizeof(UChar));
-
- if (!m_characters.compare_exchange_strong(characters, newCharacters)) {
- fastFree(newCharacters);
- return characters;
- }
-
- return newCharacters;
-}
-
-bool OpaqueJSString::equal(const OpaqueJSString* a, const OpaqueJSString* b)
-{
- if (a == b)
- return true;
-
- if (!a || !b)
- return false;
-
- return a->m_string == b->m_string;
-}
-
-
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPIOpaqueJSStringh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/OpaqueJSString.h (162191 => 162192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/OpaqueJSString.h 2014-01-17 07:59:58 UTC (rev 162191)
+++ trunk/Source/JavaScriptCore/API/OpaqueJSString.h 2014-01-17 08:16:50 UTC (rev 162192)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> #ifndef OpaqueJSString_h
</span><span class="cx"> #define OpaqueJSString_h
</span><span class="cx">
</span><del>-#include <atomic>
</del><span class="cx"> #include <wtf/ThreadSafeRefCounted.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -36,7 +35,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> struct OpaqueJSString : public ThreadSafeRefCounted<OpaqueJSString> {
</span><del>- static PassRefPtr<OpaqueJSString> create()
</del><ins>+
+ static PassRefPtr<OpaqueJSString> create() // null
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(new OpaqueJSString);
</span><span class="cx"> }
</span><span class="lines">@@ -52,20 +52,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE static PassRefPtr<OpaqueJSString> create(const String&);
</span><del>- JS_EXPORT_PRIVATE ~OpaqueJSString();
</del><span class="cx">
</span><del>- bool is8Bit() { return this ? m_string.is8Bit() : false; }
- const LChar* characters8() { return this ? m_string.characters8() : nullptr; }
- const UChar* characters16() { return this ? m_string.characters16() : nullptr; }
</del><ins>+ const UChar* characters() { return deprecatedCharacters(); } // FIXME: Delete this.
+ const UChar* deprecatedCharacters() { return this ? m_string.deprecatedCharacters() : nullptr; }
</ins><span class="cx"> unsigned length() { return this ? m_string.length() : 0; }
</span><span class="cx">
</span><del>- const UChar* characters();
-
</del><span class="cx"> JS_EXPORT_PRIVATE String string() const;
</span><span class="cx"> JSC::Identifier identifier(JSC::VM*) const;
</span><span class="cx">
</span><del>- static bool equal(const OpaqueJSString*, const OpaqueJSString*);
-
</del><span class="cx"> private:
</span><span class="cx"> friend class WTF::ThreadSafeRefCounted<OpaqueJSString>;
</span><span class="cx">
</span><span class="lines">@@ -75,26 +69,20 @@
</span><span class="cx">
</span><span class="cx"> OpaqueJSString(const String& string)
</span><span class="cx"> : m_string(string.isolatedCopy())
</span><del>- , m_characters(nullptr)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> OpaqueJSString(const LChar* characters, unsigned length)
</span><span class="cx"> : m_string(characters, length)
</span><del>- , m_characters(nullptr)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> OpaqueJSString(const UChar* characters, unsigned length)
</span><span class="cx"> : m_string(characters, length)
</span><del>- , m_characters(nullptr)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String m_string;
</span><del>-
- // This will be initialized on demand when characters() is called.
- std::atomic<UChar*> m_characters;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (162191 => 162192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-01-17 07:59:58 UTC (rev 162191)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-01-17 08:16:50 UTC (rev 162192)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-01-17 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r162185, r162186, and r162187.
+ http://trac.webkit.org/changeset/162185
+ http://trac.webkit.org/changeset/162186
+ http://trac.webkit.org/changeset/162187
+ https://bugs.webkit.org/show_bug.cgi?id=127164
+
+ Broke JSStringCreateWithCharactersNoCopy, as evidenced by a
+ JSC API test (Requested by ap on #webkit).
+
+ * API/JSStringRef.cpp:
+ (JSStringGetCharactersPtr):
+ (JSStringGetUTF8CString):
+ (JSStringIsEqual):
+ * API/JSStringRefCF.cpp:
+ (JSStringCreateWithCFString):
+ (JSStringCopyCFString):
+ * API/OpaqueJSString.cpp:
+ (OpaqueJSString::create):
+ (OpaqueJSString::identifier):
+ * API/OpaqueJSString.h:
+ (OpaqueJSString::create):
+ (OpaqueJSString::characters):
+ (OpaqueJSString::deprecatedCharacters):
+ (OpaqueJSString::OpaqueJSString):
+
</ins><span class="cx"> 2014-01-16 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Export OpaqueJSString destructor.
</span></span></pre>
</div>
</div>
</body>
</html>