<!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>[165703] 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/165703">165703</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2014-03-16 10:35:53 -0700 (Sun, 16 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove all uses of deprecatedCharacters from JavaScriptCore
https://bugs.webkit.org/show_bug.cgi?id=130304
Reviewed by Anders Carlsson.
Source/JavaScriptCore:
* API/JSValueRef.cpp:
(JSValueMakeFromJSONString): Use characters16 in the 16-bit code path.
* API/OpaqueJSString.cpp:
(OpaqueJSString::~OpaqueJSString): Use characters 16 in the 16-bit code path.
(OpaqueJSString::identifier): Get rid of custom Identifier constructor, and
juse use the standard one that takes a String.
(OpaqueJSString::characters): Use getCharactersWithUpconvert instead of a
hand-written alternative.
* bindings/ScriptValue.cpp:
(Deprecated::jsToInspectorValue): Create InspectorString from String directly
instead of involving a character pointer. Use the String from Identifier
directly instead of making a new String.
* inspector/ContentSearchUtilities.cpp:
(Inspector::ContentSearchUtilities::createSearchRegexSource): Use StringBuilder
instead of building a String a character at a time. This is still a very slow
way to do this. Also use strchr to search for a character instead of building
a String every time just to use find on it.
* inspector/InspectorValues.cpp:
(Inspector::doubleQuoteString): Remove unnecessary trip through a
character pointer. This is still a really slow way to do this.
(Inspector::InspectorValue::parseJSON): Use StringView::upconvertedCharacters
instead of String::deprecatedCharacters. Still slow to always upconvert.
* runtime/DateConstructor.cpp: Removed unneeded include.
* runtime/DatePrototype.cpp: Ditto.
* runtime/Identifier.h: Removed deprecatedCharacters function.
* runtime/JSGlobalObjectFunctions.cpp:
(JSC::encode): Added a type cast to avoid ambiguity with the two character-
appending functions from JSStringBuilder. Removed unneeded code duplicating
what JSStringBuilder already does in its character append function.
(JSC::decode): Deleted code that creates a JSStringBuilder that is never used.
(JSC::parseIntOverflow): Changed lengths to unsigned. Made only the overload that
is used outside this file have external linkage. Added a new overload that takes
a StringView.
(JSC::parseInt): Use StringView::substring to call parseIntOverflow.
(JSC::globalFuncEscape): Use JSBuilder::append in a more efficient way for a
single character.
* runtime/JSGlobalObjectFunctions.h: Removed unused overloads of parseIntOverflow.
* runtime/JSStringBuilder.h: Marked this "lightly deprecated".
(JSC::JSStringBuilder::append): Overloaded for better speed with 8-bit characters.
Made one overload private. Fixed a performance bug where we would reserve capacity
in the 8-bit buffer but then append to the 16-bit buffer.
* runtime/ObjectPrototype.cpp: Removed unneeded include.
* runtime/StringPrototype.cpp:
(JSC::stringProtoFuncFontsize): Use StringView::getCharactersWithUpconvert.
(JSC::stringProtoFuncLink): Ditto.
Source/WTF:
* wtf/dtoa.h:
(WTF::parseDouble): Added an overload that takes a StringView.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreAPIJSValueRefcpp">trunk/Source/JavaScriptCore/API/JSValueRef.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPIOpaqueJSStringcpp">trunk/Source/JavaScriptCore/API/OpaqueJSString.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebindingsScriptValuecpp">trunk/Source/JavaScriptCore/bindings/ScriptValue.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorContentSearchUtilitiescpp">trunk/Source/JavaScriptCore/inspector/ContentSearchUtilities.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorInspectorValuescpp">trunk/Source/JavaScriptCore/inspector/InspectorValues.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeDateConstructorcpp">trunk/Source/JavaScriptCore/runtime/DateConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeDatePrototypecpp">trunk/Source/JavaScriptCore/runtime/DatePrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIdentifierh">trunk/Source/JavaScriptCore/runtime/Identifier.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjectFunctionscpp">trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjectFunctionsh">trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSStringBuilderh">trunk/Source/JavaScriptCore/runtime/JSStringBuilder.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeObjectPrototypecpp">trunk/Source/JavaScriptCore/runtime/ObjectPrototype.cpp</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="#trunkSourceWTFwtfdtoah">trunk/Source/WTF/wtf/dtoa.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreAPIJSValueRefcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSValueRef.cpp (165702 => 165703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSValueRef.cpp 2014-03-16 17:33:48 UTC (rev 165702)
+++ trunk/Source/JavaScriptCore/API/JSValueRef.cpp 2014-03-16 17:35:53 UTC (rev 165703)
</span><span class="lines">@@ -334,11 +334,11 @@
</span><span class="cx"> JSLockHolder locker(exec);
</span><span class="cx"> String str = string->string();
</span><span class="cx"> unsigned length = str.length();
</span><del>- if (length && str.is8Bit()) {
</del><ins>+ if (!length || str.is8Bit()) {
</ins><span class="cx"> LiteralParser<LChar> parser(exec, str.characters8(), length, StrictJSON);
</span><span class="cx"> return toRef(exec, parser.tryLiteralParse());
</span><span class="cx"> }
</span><del>- LiteralParser<UChar> parser(exec, str.deprecatedCharacters(), length, StrictJSON);
</del><ins>+ LiteralParser<UChar> parser(exec, str.characters16(), length, StrictJSON);
</ins><span class="cx"> return toRef(exec, parser.tryLiteralParse());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPIOpaqueJSStringcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/OpaqueJSString.cpp (165702 => 165703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/OpaqueJSString.cpp 2014-03-16 17:33:48 UTC (rev 165702)
+++ trunk/Source/JavaScriptCore/API/OpaqueJSString.cpp 2014-03-16 17:35:53 UTC (rev 165703)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "CallFrame.h"
</span><span class="cx"> #include "Identifier.h"
</span><span class="cx"> #include "JSGlobalObject.h"
</span><ins>+#include <wtf/text/StringView.h>
</ins><span class="cx">
</span><span class="cx"> using namespace JSC;
</span><span class="cx">
</span><span class="lines">@@ -47,7 +48,7 @@
</span><span class="cx"> if (!characters)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!m_string.is8Bit() && m_string.deprecatedCharacters() == characters)
</del><ins>+ if (!m_string.is8Bit() && m_string.characters16() == characters)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> fastFree(characters);
</span><span class="lines">@@ -70,10 +71,7 @@
</span><span class="cx"> if (m_string.isEmpty())
</span><span class="cx"> return Identifier(Identifier::EmptyIdentifier);
</span><span class="cx">
</span><del>- if (m_string.is8Bit())
- return Identifier(vm, m_string.characters8(), m_string.length());
-
- return Identifier(vm, m_string.characters16(), m_string.length());
</del><ins>+ return Identifier(vm, m_string);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const UChar* OpaqueJSString::characters()
</span><span class="lines">@@ -91,13 +89,8 @@
</span><span class="cx">
</span><span class="cx"> unsigned length = m_string.length();
</span><span class="cx"> UChar* newCharacters = static_cast<UChar*>(fastMalloc(length * sizeof(UChar)));
</span><ins>+ StringView(m_string).getCharactersWithUpconvert(newCharacters);
</ins><span class="cx">
</span><del>- 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));
-
</del><span class="cx"> if (!m_characters.compare_exchange_strong(characters, newCharacters)) {
</span><span class="cx"> fastFree(newCharacters);
</span><span class="cx"> return characters;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (165702 => 165703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-03-16 17:33:48 UTC (rev 165702)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-03-16 17:35:53 UTC (rev 165703)
</span><span class="lines">@@ -1,3 +1,66 @@
</span><ins>+2014-03-16 Darin Adler <darin@apple.com>
+
+ Remove all uses of deprecatedCharacters from JavaScriptCore
+ https://bugs.webkit.org/show_bug.cgi?id=130304
+
+ Reviewed by Anders Carlsson.
+
+ * API/JSValueRef.cpp:
+ (JSValueMakeFromJSONString): Use characters16 in the 16-bit code path.
+ * API/OpaqueJSString.cpp:
+ (OpaqueJSString::~OpaqueJSString): Use characters 16 in the 16-bit code path.
+ (OpaqueJSString::identifier): Get rid of custom Identifier constructor, and
+ juse use the standard one that takes a String.
+ (OpaqueJSString::characters): Use getCharactersWithUpconvert instead of a
+ hand-written alternative.
+
+ * bindings/ScriptValue.cpp:
+ (Deprecated::jsToInspectorValue): Create InspectorString from String directly
+ instead of involving a character pointer. Use the String from Identifier
+ directly instead of making a new String.
+
+ * inspector/ContentSearchUtilities.cpp:
+ (Inspector::ContentSearchUtilities::createSearchRegexSource): Use StringBuilder
+ instead of building a String a character at a time. This is still a very slow
+ way to do this. Also use strchr to search for a character instead of building
+ a String every time just to use find on it.
+
+ * inspector/InspectorValues.cpp:
+ (Inspector::doubleQuoteString): Remove unnecessary trip through a
+ character pointer. This is still a really slow way to do this.
+ (Inspector::InspectorValue::parseJSON): Use StringView::upconvertedCharacters
+ instead of String::deprecatedCharacters. Still slow to always upconvert.
+
+ * runtime/DateConstructor.cpp: Removed unneeded include.
+ * runtime/DatePrototype.cpp: Ditto.
+
+ * runtime/Identifier.h: Removed deprecatedCharacters function.
+
+ * runtime/JSGlobalObjectFunctions.cpp:
+ (JSC::encode): Added a type cast to avoid ambiguity with the two character-
+ appending functions from JSStringBuilder. Removed unneeded code duplicating
+ what JSStringBuilder already does in its character append function.
+ (JSC::decode): Deleted code that creates a JSStringBuilder that is never used.
+ (JSC::parseIntOverflow): Changed lengths to unsigned. Made only the overload that
+ is used outside this file have external linkage. Added a new overload that takes
+ a StringView.
+ (JSC::parseInt): Use StringView::substring to call parseIntOverflow.
+ (JSC::globalFuncEscape): Use JSBuilder::append in a more efficient way for a
+ single character.
+
+ * runtime/JSGlobalObjectFunctions.h: Removed unused overloads of parseIntOverflow.
+
+ * runtime/JSStringBuilder.h: Marked this "lightly deprecated".
+ (JSC::JSStringBuilder::append): Overloaded for better speed with 8-bit characters.
+ Made one overload private. Fixed a performance bug where we would reserve capacity
+ in the 8-bit buffer but then append to the 16-bit buffer.
+
+ * runtime/ObjectPrototype.cpp: Removed unneeded include.
+
+ * runtime/StringPrototype.cpp:
+ (JSC::stringProtoFuncFontsize): Use StringView::getCharactersWithUpconvert.
+ (JSC::stringProtoFuncLink): Ditto.
+
</ins><span class="cx"> 2014-03-15 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> FTL ArrayifyToStructure shouldn't fail every time that it actually arrayifies
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebindingsScriptValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bindings/ScriptValue.cpp (165702 => 165703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bindings/ScriptValue.cpp 2014-03-16 17:33:48 UTC (rev 165702)
+++ trunk/Source/JavaScriptCore/bindings/ScriptValue.cpp 2014-03-16 17:35:53 UTC (rev 165703)
</span><span class="lines">@@ -115,10 +115,8 @@
</span><span class="cx"> return InspectorBasicValue::create(value.asBoolean());
</span><span class="cx"> if (value.isNumber())
</span><span class="cx"> return InspectorBasicValue::create(value.asNumber());
</span><del>- if (value.isString()) {
- String s = value.getString(scriptState);
- return InspectorString::create(String(s.deprecatedCharacters(), s.length()));
- }
</del><ins>+ if (value.isString())
+ return InspectorString::create(value.getString(scriptState));
</ins><span class="cx">
</span><span class="cx"> if (value.isObject()) {
</span><span class="cx"> if (isJSArray(value)) {
</span><span class="lines">@@ -139,12 +137,12 @@
</span><span class="cx"> PropertyNameArray propertyNames(scriptState);
</span><span class="cx"> object->methodTable()->getOwnPropertyNames(object, scriptState, propertyNames, ExcludeDontEnumProperties);
</span><span class="cx"> for (size_t i = 0; i < propertyNames.size(); i++) {
</span><del>- const Identifier& name = propertyNames[i];
</del><ins>+ const Identifier& name = propertyNames[i];
</ins><span class="cx"> JSValue propertyValue = object->get(scriptState, name);
</span><span class="cx"> RefPtr<InspectorValue> inspectorValue = jsToInspectorValue(scriptState, propertyValue, maxDepth);
</span><span class="cx"> if (!inspectorValue)
</span><span class="cx"> return nullptr;
</span><del>- inspectorObject->setValue(String(name.deprecatedCharacters(), name.length()), inspectorValue);
</del><ins>+ inspectorObject->setValue(name.string(), inspectorValue);
</ins><span class="cx"> }
</span><span class="cx"> return inspectorObject;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorContentSearchUtilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ContentSearchUtilities.cpp (165702 => 165703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ContentSearchUtilities.cpp 2014-03-16 17:33:48 UTC (rev 165702)
+++ trunk/Source/JavaScriptCore/inspector/ContentSearchUtilities.cpp 2014-03-16 17:35:53 UTC (rev 165703)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #include "Yarr.h"
</span><span class="cx"> #include <wtf/BumpPointerAllocator.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><ins>+#include <wtf/text/StringBuilder.h>
</ins><span class="cx">
</span><span class="cx"> using namespace JSC::Yarr;
</span><span class="cx">
</span><span class="lines">@@ -47,17 +48,16 @@
</span><span class="cx">
</span><span class="cx"> static String createSearchRegexSource(const String& text)
</span><span class="cx"> {
</span><del>- String result;
- const UChar* characters = text.deprecatedCharacters();
- String specials(regexSpecialCharacters);
</del><ins>+ StringBuilder result;
</ins><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < text.length(); i++) {
</span><del>- if (specials.find(characters[i]) != notFound)
- result.append("\\");
- result.append(characters[i]);
</del><ins>+ UChar character = text[i];
+ if (isASCII(character) && strchr(regexSpecialCharacters, character))
+ result.append('\\');
+ result.append(character);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return result;
</del><ins>+ return result.toString();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline size_t sizetExtractor(const size_t* value)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInspectorValuescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InspectorValues.cpp (165702 => 165703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InspectorValues.cpp 2014-03-16 17:33:48 UTC (rev 165702)
+++ trunk/Source/JavaScriptCore/inspector/InspectorValues.cpp 2014-03-16 17:35:53 UTC (rev 165703)
</span><span class="lines">@@ -470,9 +470,7 @@
</span><span class="cx"> // 1. Escaping <, > to prevent script execution.
</span><span class="cx"> // 2. Technically, we could also pass through c > 126 as UTF8, but this
</span><span class="cx"> // is also optional. It would also be a pain to implement here.
</span><del>- unsigned int symbol = static_cast<unsigned int>(c);
- String symbolCode = String::format("\\u%04X", symbol);
- dst->append(symbolCode.deprecatedCharacters(), symbolCode.length());
</del><ins>+ dst->append(String::format("\\u%04X", c));
</ins><span class="cx"> } else
</span><span class="cx"> dst->append(c);
</span><span class="cx"> }
</span><span class="lines">@@ -560,9 +558,11 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<InspectorValue> InspectorValue::parseJSON(const String& json)
</span><span class="cx"> {
</span><del>- const UChar* start = json.deprecatedCharacters();
- const UChar* end = json.deprecatedCharacters() + json.length();
- const UChar *tokenEnd;
</del><ins>+ // FIXME: This whole file should just use StringView instead of UChar/length and avoid upconverting.
+ auto characters = StringView(json).upconvertedCharacters();
+ const UChar* start = characters;
+ const UChar* end = start + json.length();
+ const UChar* tokenEnd;
</ins><span class="cx"> RefPtr<InspectorValue> value = buildValue(start, end, &tokenEnd, 0);
</span><span class="cx"> if (!value || tokenEnd != end)
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeDateConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/DateConstructor.cpp (165702 => 165703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/DateConstructor.cpp 2014-03-16 17:33:48 UTC (rev 165702)
+++ trunk/Source/JavaScriptCore/runtime/DateConstructor.cpp 2014-03-16 17:35:53 UTC (rev 165703)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #include "JSFunction.h"
</span><span class="cx"> #include "JSGlobalObject.h"
</span><span class="cx"> #include "JSString.h"
</span><del>-#include "JSStringBuilder.h"
</del><span class="cx"> #include "ObjectPrototype.h"
</span><span class="cx"> #include "JSCInlines.h"
</span><span class="cx"> #include <math.h>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeDatePrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/DatePrototype.cpp (165702 => 165703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/DatePrototype.cpp 2014-03-16 17:33:48 UTC (rev 165702)
+++ trunk/Source/JavaScriptCore/runtime/DatePrototype.cpp 2014-03-16 17:35:53 UTC (rev 165703)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #include "JSDateMath.h"
</span><span class="cx"> #include "JSGlobalObject.h"
</span><span class="cx"> #include "JSString.h"
</span><del>-#include "JSStringBuilder.h"
</del><span class="cx"> #include "Lookup.h"
</span><span class="cx"> #include "ObjectPrototype.h"
</span><span class="cx"> #include "JSCInlines.h"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIdentifierh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Identifier.h (165702 => 165703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Identifier.h 2014-03-16 17:33:48 UTC (rev 165702)
+++ trunk/Source/JavaScriptCore/runtime/Identifier.h 2014-03-16 17:35:53 UTC (rev 165703)
</span><span class="lines">@@ -55,7 +55,6 @@
</span><span class="cx"> const String& string() const { return m_string; }
</span><span class="cx"> StringImpl* impl() const { return m_string.impl(); }
</span><span class="cx">
</span><del>- const UChar* deprecatedCharacters() const { return m_string.deprecatedCharacters(); }
</del><span class="cx"> int length() const { return m_string.length(); }
</span><span class="cx">
</span><span class="cx"> CString ascii() const { return m_string.ascii(); }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjectFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp (165702 => 165703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp 2014-03-16 17:33:48 UTC (rev 165702)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp 2014-03-16 17:35:53 UTC (rev 165703)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> for (size_t k = 0; k < cstr.length(); k++, p++) {
</span><span class="cx"> char c = *p;
</span><span class="cx"> if (c && strchr(doNotEscape, c))
</span><del>- builder.append(c);
</del><ins>+ builder.append(static_cast<LChar>(c));
</ins><span class="cx"> else {
</span><span class="cx"> char tmp[4];
</span><span class="cx"> snprintf(tmp, sizeof(tmp), "%%%02X", static_cast<unsigned char>(c));
</span><span class="lines">@@ -128,10 +128,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if (charLen && (u == 0 || u >= 128 || !strchr(doNotUnescape, u))) {
</span><del>- if (u < 256)
- builder.append(static_cast<LChar>(u));
- else
- builder.append(u);
</del><ins>+ builder.append(u);
</ins><span class="cx"> k += charLen;
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="lines">@@ -144,7 +141,6 @@
</span><span class="cx">
</span><span class="cx"> static JSValue decode(ExecState* exec, const char* doNotUnescape, bool strict)
</span><span class="cx"> {
</span><del>- JSStringBuilder builder;
</del><span class="cx"> String str = exec->argument(0).toString(exec)->value(exec);
</span><span class="cx">
</span><span class="cx"> if (str.is8Bit())
</span><span class="lines">@@ -189,7 +185,7 @@
</span><span class="cx"> return digit;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-double parseIntOverflow(const LChar* s, int length, int radix)
</del><ins>+double parseIntOverflow(const LChar* s, unsigned length, int radix)
</ins><span class="cx"> {
</span><span class="cx"> double number = 0.0;
</span><span class="cx"> double radixMultiplier = 1.0;
</span><span class="lines">@@ -211,7 +207,7 @@
</span><span class="cx"> return number;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-double parseIntOverflow(const UChar* s, int length, int radix)
</del><ins>+static double parseIntOverflow(const UChar* s, unsigned length, int radix)
</ins><span class="cx"> {
</span><span class="cx"> double number = 0.0;
</span><span class="cx"> double radixMultiplier = 1.0;
</span><span class="lines">@@ -233,6 +229,13 @@
</span><span class="cx"> return number;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static double parseIntOverflow(StringView string, int radix)
+{
+ if (string.is8Bit())
+ return parseIntOverflow(string.characters8(), string.length(), radix);
+ return parseIntOverflow(string.characters16(), string.length(), radix);
+}
+
</ins><span class="cx"> // ES5.1 15.1.2.2
</span><span class="cx"> template <typename CharType>
</span><span class="cx"> ALWAYS_INLINE
</span><span class="lines">@@ -308,9 +311,9 @@
</span><span class="cx"> if (number >= mantissaOverflowLowerBound) {
</span><span class="cx"> if (radix == 10) {
</span><span class="cx"> size_t parsedLength;
</span><del>- number = parseDouble(s.deprecatedCharacters() + firstDigitPosition, p - firstDigitPosition, parsedLength);
</del><ins>+ number = parseDouble(StringView(s).substring(firstDigitPosition, p - firstDigitPosition), parsedLength);
</ins><span class="cx"> } else if (radix == 2 || radix == 4 || radix == 8 || radix == 16 || radix == 32)
</span><del>- number = parseIntOverflow(s.substringSharingImpl(firstDigitPosition, p - firstDigitPosition).utf8().data(), p - firstDigitPosition, radix);
</del><ins>+ number = parseIntOverflow(StringView(s).substring(firstDigitPosition, p - firstDigitPosition), radix);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // 15. Return sign x number.
</span><span class="lines">@@ -620,7 +623,7 @@
</span><span class="cx"> for (unsigned k = 0; k < str.length(); k++, c++) {
</span><span class="cx"> int u = c[0];
</span><span class="cx"> if (u && strchr(do_not_escape, static_cast<char>(u)))
</span><del>- builder.append(c, 1);
</del><ins>+ builder.append(*c);
</ins><span class="cx"> else {
</span><span class="cx"> char tmp[4];
</span><span class="cx"> snprintf(tmp, sizeof(tmp), "%%%02X", u);
</span><span class="lines">@@ -639,7 +642,7 @@
</span><span class="cx"> snprintf(tmp, sizeof(tmp), "%%u%04X", u);
</span><span class="cx"> builder.append(tmp);
</span><span class="cx"> } else if (u != 0 && strchr(do_not_escape, static_cast<char>(u)))
</span><del>- builder.append(c, 1);
</del><ins>+ builder.append(*c);
</ins><span class="cx"> else {
</span><span class="cx"> char tmp[4];
</span><span class="cx"> snprintf(tmp, sizeof(tmp), "%%%02X", u);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjectFunctionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.h (165702 => 165703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.h 2014-03-16 17:33:48 UTC (rev 165702)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.h 2014-03-16 17:35:53 UTC (rev 165703)
</span><span class="lines">@@ -53,9 +53,7 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL globalFuncProtoSetter(ExecState*);
</span><span class="cx">
</span><span class="cx"> static const double mantissaOverflowLowerBound = 9007199254740992.0;
</span><del>-double parseIntOverflow(const LChar*, int length, int radix);
-ALWAYS_INLINE double parseIntOverflow(const char* s, int length, int radix) { return parseIntOverflow(reinterpret_cast<const LChar*>(s), length, radix); }
-double parseIntOverflow(const UChar*, int length, int radix);
</del><ins>+double parseIntOverflow(const LChar*, unsigned length, int radix);
</ins><span class="cx"> bool isStrWhiteSpace(UChar);
</span><span class="cx"> double jsToNumber(const WTF::String&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSStringBuilderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSStringBuilder.h (165702 => 165703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSStringBuilder.h 2014-03-16 17:33:48 UTC (rev 165702)
+++ trunk/Source/JavaScriptCore/runtime/JSStringBuilder.h 2014-03-16 17:35:53 UTC (rev 165703)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><ins>+// FIXME: Should move the last few callers over from this to WTF::StringBuilder.
</ins><span class="cx"> class JSStringBuilder {
</span><span class="cx"> public:
</span><span class="cx"> JSStringBuilder()
</span><span class="lines">@@ -40,74 +41,65 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void append(const UChar u)
</del><ins>+ void append(LChar character)
</ins><span class="cx"> {
</span><span class="cx"> if (m_is8Bit) {
</span><del>- if (u < 0xff) {
- LChar c = u;
- m_okay &= buffer8.tryAppend(&c, 1);
</del><ins>+ m_okay &= buffer8.tryAppend(&character, 1);
+ return;
+ }
+ UChar upconvertedCharacter = character;
+ m_okay &= buffer16.tryAppend(&upconvertedCharacter, 1);
+ }
+
+ void append(UChar character)
+ {
+ if (m_is8Bit) {
+ if (character < 0x100) {
+ LChar narrowedCharacter = character;
+ m_okay &= buffer8.tryAppend(&narrowedCharacter, 1);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> upConvert();
</span><span class="cx"> }
</span><del>- m_okay &= buffer16.tryAppend(&u, 1);
</del><ins>+ m_okay &= buffer16.tryAppend(&character, 1);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void append(const char* str)
</span><span class="cx"> {
</span><del>- append(str, strlen(str));
</del><ins>+ append(reinterpret_cast<const LChar*>(str), strlen(str));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- void append(const char* str, size_t len)
</del><ins>+ JSValue build(ExecState* exec)
</ins><span class="cx"> {
</span><ins>+ if (!m_okay)
+ return throwOutOfMemoryError(exec);
</ins><span class="cx"> if (m_is8Bit) {
</span><del>- m_okay &= buffer8.tryAppend(reinterpret_cast<const LChar*>(str), len);
- return;
</del><ins>+ buffer8.shrinkToFit();
+ if (!buffer8.data())
+ return throwOutOfMemoryError(exec);
+ return jsString(exec, String::adopt(buffer8));
</ins><span class="cx"> }
</span><del>- m_okay &= buffer8.tryReserveCapacity(buffer16.size() + len);
- for (size_t i = 0; i < len; i++) {
- UChar u = static_cast<unsigned char>(str[i]);
- m_okay &= buffer16.tryAppend(&u, 1);
- }
</del><ins>+ buffer16.shrinkToFit();
+ if (!buffer16.data())
+ return throwOutOfMemoryError(exec);
+ return jsString(exec, String::adopt(buffer16));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- void append(const LChar* str, size_t len)
</del><ins>+private:
+ void append(const LChar* characters, size_t length)
</ins><span class="cx"> {
</span><span class="cx"> if (m_is8Bit) {
</span><del>- m_okay &= buffer8.tryAppend(str, len);
</del><ins>+ m_okay &= buffer8.tryAppend(characters, length);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><del>- m_okay &= buffer8.tryReserveCapacity(buffer16.size() + len);
- for (size_t i = 0; i < len; i++) {
- UChar u = str[i];
- m_okay &= buffer16.tryAppend(&u, 1);
</del><ins>+ // FIXME: There must be a more efficient way of doing this.
+ m_okay &= buffer16.tryReserveCapacity(buffer16.size() + length);
+ for (size_t i = 0; i < length; i++) {
+ UChar upconvertedCharacter = characters[i];
+ m_okay &= buffer16.tryAppend(&upconvertedCharacter, 1);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>-
- void append(const UChar* str, size_t len)
- {
- if (m_is8Bit)
- upConvert(); // FIXME: We could check character by character its size.
- m_okay &= buffer16.tryAppend(str, len);
- }
</del><span class="cx">
</span><del>- void append(const String& str)
- {
- unsigned length = str.length();
-
- if (!length)
- return;
-
- if (m_is8Bit) {
- if (str.is8Bit()) {
- m_okay &= buffer8.tryAppend(str.characters8(), length);
- return;
- }
- upConvert();
- }
- m_okay &= buffer16.tryAppend(str.deprecatedCharacters(), length);
- }
-
</del><span class="cx"> void upConvert()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_is8Bit);
</span><span class="lines">@@ -120,23 +112,6 @@
</span><span class="cx"> m_is8Bit = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- JSValue build(ExecState* exec)
- {
- if (!m_okay)
- return throwOutOfMemoryError(exec);
- if (m_is8Bit) {
- buffer8.shrinkToFit();
- if (!buffer8.data())
- return throwOutOfMemoryError(exec);
- return jsString(exec, String::adopt(buffer8));
- }
- buffer16.shrinkToFit();
- if (!buffer16.data())
- return throwOutOfMemoryError(exec);
- return jsString(exec, String::adopt(buffer16));
- }
-
-protected:
</del><span class="cx"> Vector<LChar, 64, UnsafeVectorOverflow> buffer8;
</span><span class="cx"> Vector<UChar, 64, UnsafeVectorOverflow> buffer16;
</span><span class="cx"> bool m_okay;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeObjectPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ObjectPrototype.cpp (165702 => 165703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ObjectPrototype.cpp 2014-03-16 17:33:48 UTC (rev 165702)
+++ trunk/Source/JavaScriptCore/runtime/ObjectPrototype.cpp 2014-03-16 17:35:53 UTC (rev 165703)
</span><span class="lines">@@ -25,7 +25,6 @@
</span><span class="cx"> #include "GetterSetter.h"
</span><span class="cx"> #include "JSFunction.h"
</span><span class="cx"> #include "JSString.h"
</span><del>-#include "JSStringBuilder.h"
</del><span class="cx"> #include "JSCInlines.h"
</span><span class="cx"> #include "StructureRareDataInlines.h"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStringPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp (165702 => 165703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp 2014-03-16 17:33:48 UTC (rev 165702)
+++ trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp 2014-03-16 17:35:53 UTC (rev 165703)
</span><span class="lines">@@ -1408,6 +1408,7 @@
</span><span class="cx"> if (a0.getUInt32(smallInteger) && smallInteger <= 9) {
</span><span class="cx"> unsigned stringSize = s.length();
</span><span class="cx"> unsigned bufferSize = 22 + stringSize;
</span><ins>+ // FIXME: Should we have an 8-bit version of this code path too? Or maybe only an 8-bit version?
</ins><span class="cx"> UChar* buffer;
</span><span class="cx"> PassRefPtr<StringImpl> impl = StringImpl::tryCreateUninitialized(bufferSize, buffer);
</span><span class="cx"> if (!impl)
</span><span class="lines">@@ -1427,7 +1428,7 @@
</span><span class="cx"> buffer[12] = '0' + smallInteger;
</span><span class="cx"> buffer[13] = '"';
</span><span class="cx"> buffer[14] = '>';
</span><del>- memcpy(&buffer[15], s.deprecatedCharacters(), stringSize * sizeof(UChar));
</del><ins>+ StringView(s).getCharactersWithUpconvert(&buffer[15]);
</ins><span class="cx"> buffer[15 + stringSize] = '<';
</span><span class="cx"> buffer[16 + stringSize] = '/';
</span><span class="cx"> buffer[17 + stringSize] = 'f';
</span><span class="lines">@@ -1470,6 +1471,7 @@
</span><span class="cx"> unsigned linkTextSize = linkText.length();
</span><span class="cx"> unsigned stringSize = s.length();
</span><span class="cx"> unsigned bufferSize = 15 + linkTextSize + stringSize;
</span><ins>+ // FIXME: Should we have an 8-bit version of this code path too? Or maybe only an 8-bit version?
</ins><span class="cx"> UChar* buffer;
</span><span class="cx"> PassRefPtr<StringImpl> impl = StringImpl::tryCreateUninitialized(bufferSize, buffer);
</span><span class="cx"> if (!impl)
</span><span class="lines">@@ -1483,10 +1485,10 @@
</span><span class="cx"> buffer[6] = 'f';
</span><span class="cx"> buffer[7] = '=';
</span><span class="cx"> buffer[8] = '"';
</span><del>- memcpy(&buffer[9], linkText.deprecatedCharacters(), linkTextSize * sizeof(UChar));
</del><ins>+ StringView(linkText).getCharactersWithUpconvert(&buffer[9]);
</ins><span class="cx"> buffer[9 + linkTextSize] = '"';
</span><span class="cx"> buffer[10 + linkTextSize] = '>';
</span><del>- memcpy(&buffer[11 + linkTextSize], s.deprecatedCharacters(), stringSize * sizeof(UChar));
</del><ins>+ StringView(s).getCharactersWithUpconvert(&buffer[11 + linkTextSize]);
</ins><span class="cx"> buffer[11 + linkTextSize + stringSize] = '<';
</span><span class="cx"> buffer[12 + linkTextSize + stringSize] = '/';
</span><span class="cx"> buffer[13 + linkTextSize + stringSize] = 'a';
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (165702 => 165703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-03-16 17:33:48 UTC (rev 165702)
+++ trunk/Source/WTF/ChangeLog 2014-03-16 17:35:53 UTC (rev 165703)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-03-16 Darin Adler <darin@apple.com>
+
+ Remove all uses of deprecatedCharacters from JavaScriptCore
+ https://bugs.webkit.org/show_bug.cgi?id=130304
+
+ Reviewed by Anders Carlsson.
+
+ * wtf/dtoa.h:
+ (WTF::parseDouble): Added an overload that takes a StringView.
+
</ins><span class="cx"> 2014-03-15 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove all uses of deprecatedCharacters from WebKit2
</span></span></pre></div>
<a id="trunkSourceWTFwtfdtoah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/dtoa.h (165702 => 165703)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/dtoa.h 2014-03-16 17:33:48 UTC (rev 165702)
+++ trunk/Source/WTF/wtf/dtoa.h 2014-03-16 17:35:53 UTC (rev 165703)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> #include <unicode/utypes.h>
</span><span class="cx"> #include <wtf/ASCIICType.h>
</span><span class="cx"> #include <wtf/dtoa/double-conversion.h>
</span><del>-#include <wtf/text/LChar.h>
</del><ins>+#include <wtf/text/StringView.h>
</ins><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><span class="lines">@@ -49,6 +49,7 @@
</span><span class="cx">
</span><span class="cx"> double parseDouble(const LChar* string, size_t length, size_t& parsedLength);
</span><span class="cx"> double parseDouble(const UChar* string, size_t length, size_t& parsedLength);
</span><ins>+double parseDouble(StringView, size_t& parsedLength);
</ins><span class="cx">
</span><span class="cx"> namespace Internal {
</span><span class="cx"> WTF_EXPORT_PRIVATE double parseDoubleFromLongString(const UChar* string, size_t length, size_t& parsedLength);
</span><span class="lines">@@ -69,6 +70,13 @@
</span><span class="cx"> conversionBuffer[i] = isASCII(string[i]) ? string[i] : 0;
</span><span class="cx"> return parseDouble(conversionBuffer, length, parsedLength);
</span><span class="cx"> }
</span><ins>+
+inline double parseDouble(StringView string, size_t& parsedLength)
+{
+ if (string.is8Bit())
+ return parseDouble(string.characters8(), string.length(), parsedLength);
+ return parseDouble(string.characters16(), string.length(), parsedLength);
+}
</ins><span class="cx">
</span><span class="cx"> } // namespace WTF
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>