<!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>[162784] trunk</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/162784">162784</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2014-01-25 14:47:20 -0800 (Sat, 25 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Call deprecatedCharacters instead of characters at more call sites
https://bugs.webkit.org/show_bug.cgi?id=127631
Reviewed by Sam Weinig.
Source/JavaScriptCore:
* API/JSValueRef.cpp:
(JSValueMakeFromJSONString):
* API/OpaqueJSString.cpp:
(OpaqueJSString::~OpaqueJSString):
* bindings/ScriptValue.cpp:
(Deprecated::jsToInspectorValue):
* inspector/ContentSearchUtilities.cpp:
(Inspector::ContentSearchUtilities::createSearchRegexSource):
* inspector/InspectorValues.cpp:
* runtime/Identifier.h:
(JSC::Identifier::deprecatedCharacters):
* runtime/JSStringBuilder.h:
(JSC::JSStringBuilder::append):
Use the new name.
Source/WebCore:
* bindings/objc/WebScriptObject.mm:
(+[WebScriptObject _convertValueToObjcValue:JSC::originRootObject:rootObject:]):
* editing/CompositeEditCommand.cpp:
(WebCore::containsOnlyWhitespace):
* editing/TypingCommand.cpp:
(WebCore::TypingCommand::insertText):
* editing/VisibleUnits.cpp:
(WebCore::startOfParagraph):
(WebCore::endOfParagraph):
* html/parser/HTMLParserIdioms.cpp:
(WebCore::stripLeadingAndTrailingHTMLSpaces):
(WebCore::parseHTMLNonNegativeInteger):
* inspector/InspectorStyleSheet.cpp:
(WebCore::InspectorStyle::newLineAndWhitespaceDelimiters):
* inspector/InspectorStyleTextEditor.cpp:
(WebCore::InspectorStyleTextEditor::insertProperty):
(WebCore::InspectorStyleTextEditor::internalReplaceProperty):
* platform/Length.cpp:
(WebCore::newCoordsArray):
* platform/LinkHash.cpp:
(WebCore::visitedLinkHash):
* platform/graphics/Color.cpp:
(WebCore::Color::parseHexColor):
(WebCore::Color::Color):
* platform/graphics/TextRun.h:
(WebCore::TextRun::TextRun):
* platform/text/TextEncodingRegistry.cpp:
(WebCore::atomicCanonicalTextEncodingName):
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::constructTextRun):
* rendering/RenderCombineText.cpp:
(WebCore::RenderCombineText::width):
* svg/SVGFontElement.cpp:
(WebCore::SVGFontElement::registerLigaturesInGlyphCache):
* xml/XPathFunctions.cpp:
(WebCore::XPath::FunId::evaluate):
Use the new name.
Source/WTF:
* wtf/text/StringImpl.cpp:
(WTF::StringImpl::replace):
* wtf/text/WTFString.h:
(WTF::String::isAllSpecialCharacters):
Use the new name.
Tools:
* TestWebKitAPI/Tests/WTF/StringBuilder.cpp:
(TestWebKitAPI::expectBuilderContent):
(TestWebKitAPI::expectEmpty):
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WTF/StringImpl.cpp:
(TestWebKitAPI::TEST):
Use the new name.</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="#trunkSourceJavaScriptCoreruntimeIdentifierh">trunk/Source/JavaScriptCore/runtime/Identifier.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSStringBuilderh">trunk/Source/JavaScriptCore/runtime/JSStringBuilder.h</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="#trunkSourceWTFwtftextWTFStringh">trunk/Source/WTF/wtf/text/WTFString.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsobjcWebScriptObjectmm">trunk/Source/WebCore/bindings/objc/WebScriptObject.mm</a></li>
<li><a href="#trunkSourceWebCoreeditingCompositeEditCommandcpp">trunk/Source/WebCore/editing/CompositeEditCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingTypingCommandcpp">trunk/Source/WebCore/editing/TypingCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingVisibleUnitscpp">trunk/Source/WebCore/editing/VisibleUnits.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLParserIdiomscpp">trunk/Source/WebCore/html/parser/HTMLParserIdioms.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorStyleSheetcpp">trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorStyleTextEditorcpp">trunk/Source/WebCore/inspector/InspectorStyleTextEditor.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformLengthcpp">trunk/Source/WebCore/platform/Length.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformLinkHashcpp">trunk/Source/WebCore/platform/LinkHash.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsColorcpp">trunk/Source/WebCore/platform/graphics/Color.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsTextRunh">trunk/Source/WebCore/platform/graphics/TextRun.h</a></li>
<li><a href="#trunkSourceWebCoreplatformtextTextEncodingRegistrycpp">trunk/Source/WebCore/platform/text/TextEncodingRegistry.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderCombineTextcpp">trunk/Source/WebCore/rendering/RenderCombineText.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGFontElementcpp">trunk/Source/WebCore/svg/SVGFontElement.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlXPathFunctionscpp">trunk/Source/WebCore/xml/XPathFunctions.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFStringBuildercpp">trunk/Tools/TestWebKitAPI/Tests/WTF/StringBuilder.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFStringImplcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/StringImpl.cpp</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 (162783 => 162784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSValueRef.cpp 2014-01-25 22:46:42 UTC (rev 162783)
+++ trunk/Source/JavaScriptCore/API/JSValueRef.cpp 2014-01-25 22:47:20 UTC (rev 162784)
</span><span class="lines">@@ -327,7 +327,7 @@
</span><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.characters(), length, StrictJSON);
</del><ins>+ LiteralParser<UChar> parser(exec, str.deprecatedCharacters(), 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 (162783 => 162784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/OpaqueJSString.cpp 2014-01-25 22:46:42 UTC (rev 162783)
+++ trunk/Source/JavaScriptCore/API/OpaqueJSString.cpp 2014-01-25 22:47:20 UTC (rev 162784)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> if (!characters)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!m_string.is8Bit() && m_string.characters() == characters)
</del><ins>+ if (!m_string.is8Bit() && m_string.deprecatedCharacters() == characters)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> fastFree(characters);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (162783 => 162784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-01-25 22:46:42 UTC (rev 162783)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-01-25 22:47:20 UTC (rev 162784)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2014-01-25 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><ins>+ Call deprecatedCharacters instead of characters at more call sites
+ https://bugs.webkit.org/show_bug.cgi?id=127631
+
+ Reviewed by Sam Weinig.
+
+ * API/JSValueRef.cpp:
+ (JSValueMakeFromJSONString):
+ * API/OpaqueJSString.cpp:
+ (OpaqueJSString::~OpaqueJSString):
+ * bindings/ScriptValue.cpp:
+ (Deprecated::jsToInspectorValue):
+ * inspector/ContentSearchUtilities.cpp:
+ (Inspector::ContentSearchUtilities::createSearchRegexSource):
+ * inspector/InspectorValues.cpp:
+ * runtime/Identifier.h:
+ (JSC::Identifier::deprecatedCharacters):
+ * runtime/JSStringBuilder.h:
+ (JSC::JSStringBuilder::append):
+ Use the new name.
+
+2014-01-25 Darin Adler <darin@apple.com>
+
</ins><span class="cx"> Get rid of ICU_UNICODE and WCHAR_UNICODE remnants
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=127623
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebindingsScriptValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bindings/ScriptValue.cpp (162783 => 162784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bindings/ScriptValue.cpp 2014-01-25 22:46:42 UTC (rev 162783)
+++ trunk/Source/JavaScriptCore/bindings/ScriptValue.cpp 2014-01-25 22:47:20 UTC (rev 162784)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> return InspectorBasicValue::create(value.asNumber());
</span><span class="cx"> if (value.isString()) {
</span><span class="cx"> String s = value.getString(scriptState);
</span><del>- return InspectorString::create(String(s.characters(), s.length()));
</del><ins>+ return InspectorString::create(String(s.deprecatedCharacters(), s.length()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (value.isObject()) {
</span><span class="lines">@@ -144,7 +144,7 @@
</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.characters(), name.length()), inspectorValue);
</del><ins>+ inspectorObject->setValue(String(name.deprecatedCharacters(), name.length()), 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 (162783 => 162784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ContentSearchUtilities.cpp 2014-01-25 22:46:42 UTC (rev 162783)
+++ trunk/Source/JavaScriptCore/inspector/ContentSearchUtilities.cpp 2014-01-25 22:47:20 UTC (rev 162784)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> static String createSearchRegexSource(const String& text)
</span><span class="cx"> {
</span><span class="cx"> String result;
</span><del>- const UChar* characters = text.characters();
</del><ins>+ const UChar* characters = text.deprecatedCharacters();
</ins><span class="cx"> String specials(regexSpecialCharacters);
</span><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < text.length(); i++) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorInspectorValuescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/InspectorValues.cpp (162783 => 162784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/InspectorValues.cpp 2014-01-25 22:46:42 UTC (rev 162783)
+++ trunk/Source/JavaScriptCore/inspector/InspectorValues.cpp 2014-01-25 22:47:20 UTC (rev 162784)
</span><span class="lines">@@ -472,7 +472,7 @@
</span><span class="cx"> // is also optional. It would also be a pain to implement here.
</span><span class="cx"> unsigned int symbol = static_cast<unsigned int>(c);
</span><span class="cx"> String symbolCode = String::format("\\u%04X", symbol);
</span><del>- dst->append(symbolCode.characters(), symbolCode.length());
</del><ins>+ dst->append(symbolCode.deprecatedCharacters(), symbolCode.length());
</ins><span class="cx"> } else
</span><span class="cx"> dst->append(c);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIdentifierh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Identifier.h (162783 => 162784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Identifier.h 2014-01-25 22:46:42 UTC (rev 162783)
+++ trunk/Source/JavaScriptCore/runtime/Identifier.h 2014-01-25 22:47:20 UTC (rev 162784)
</span><span class="lines">@@ -55,7 +55,7 @@
</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* characters() const { return m_string.characters(); }
</del><ins>+ const UChar* deprecatedCharacters() const { return m_string.deprecatedCharacters(); }
</ins><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="trunkSourceJavaScriptCoreruntimeJSStringBuilderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSStringBuilder.h (162783 => 162784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSStringBuilder.h 2014-01-25 22:46:42 UTC (rev 162783)
+++ trunk/Source/JavaScriptCore/runtime/JSStringBuilder.h 2014-01-25 22:47:20 UTC (rev 162784)
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> }
</span><span class="cx"> upConvert();
</span><span class="cx"> }
</span><del>- m_okay &= buffer16.tryAppend(str.characters(), length);
</del><ins>+ m_okay &= buffer16.tryAppend(str.deprecatedCharacters(), length);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void upConvert()
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (162783 => 162784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-01-25 22:46:42 UTC (rev 162783)
+++ trunk/Source/WTF/ChangeLog 2014-01-25 22:47:20 UTC (rev 162784)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2014-01-25 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><ins>+ Call deprecatedCharacters instead of characters at more call sites
+ https://bugs.webkit.org/show_bug.cgi?id=127631
+
+ Reviewed by Sam Weinig.
+
+ * wtf/text/StringImpl.cpp:
+ (WTF::StringImpl::replace):
+ * wtf/text/WTFString.h:
+ (WTF::String::isAllSpecialCharacters):
+ Use the new name.
+
+2014-01-25 Darin Adler <darin@apple.com>
+
</ins><span class="cx"> Add a new separate LChar.h header file, to be used after we remove Unicode.h
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=127630
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringImpl.cpp (162783 => 162784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringImpl.cpp 2014-01-25 22:46:42 UTC (rev 162783)
+++ trunk/Source/WTF/wtf/text/StringImpl.cpp 2014-01-25 22:47:20 UTC (rev 162784)
</span><span class="lines">@@ -1489,7 +1489,7 @@
</span><span class="cx"> for (unsigned i = 0; i < length() - position - lengthToReplace; ++i)
</span><span class="cx"> data[i + position + lengthToInsert] = m_data8[i + position + lengthToReplace];
</span><span class="cx"> } else {
</span><del>- memcpy(data + position + lengthToInsert, characters() + position + lengthToReplace,
</del><ins>+ memcpy(data + position + lengthToInsert, characters16() + position + lengthToReplace,
</ins><span class="cx"> (length() - position - lengthToReplace) * sizeof(UChar));
</span><span class="cx"> }
</span><span class="cx"> return newImpl;
</span></span></pre></div>
<a id="trunkSourceWTFwtftextWTFStringh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/WTFString.h (162783 => 162784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/WTFString.h 2014-01-25 22:46:42 UTC (rev 162783)
+++ trunk/Source/WTF/wtf/text/WTFString.h 2014-01-25 22:47:20 UTC (rev 162784)
</span><span class="lines">@@ -632,7 +632,7 @@
</span><span class="cx">
</span><span class="cx"> if (is8Bit())
</span><span class="cx"> return WTF::isAllSpecialCharacters<isSpecialCharacter, LChar>(characters8(), len);
</span><del>- return WTF::isAllSpecialCharacters<isSpecialCharacter, UChar>(characters(), len);
</del><ins>+ return WTF::isAllSpecialCharacters<isSpecialCharacter, UChar>(characters16(), len);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // StringHash is the default hash for String
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162783 => 162784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-25 22:46:42 UTC (rev 162783)
+++ trunk/Source/WebCore/ChangeLog 2014-01-25 22:47:20 UTC (rev 162784)
</span><span class="lines">@@ -1,5 +1,50 @@
</span><span class="cx"> 2014-01-25 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><ins>+ Call deprecatedCharacters instead of characters at more call sites
+ https://bugs.webkit.org/show_bug.cgi?id=127631
+
+ Reviewed by Sam Weinig.
+
+ * bindings/objc/WebScriptObject.mm:
+ (+[WebScriptObject _convertValueToObjcValue:JSC::originRootObject:rootObject:]):
+ * editing/CompositeEditCommand.cpp:
+ (WebCore::containsOnlyWhitespace):
+ * editing/TypingCommand.cpp:
+ (WebCore::TypingCommand::insertText):
+ * editing/VisibleUnits.cpp:
+ (WebCore::startOfParagraph):
+ (WebCore::endOfParagraph):
+ * html/parser/HTMLParserIdioms.cpp:
+ (WebCore::stripLeadingAndTrailingHTMLSpaces):
+ (WebCore::parseHTMLNonNegativeInteger):
+ * inspector/InspectorStyleSheet.cpp:
+ (WebCore::InspectorStyle::newLineAndWhitespaceDelimiters):
+ * inspector/InspectorStyleTextEditor.cpp:
+ (WebCore::InspectorStyleTextEditor::insertProperty):
+ (WebCore::InspectorStyleTextEditor::internalReplaceProperty):
+ * platform/Length.cpp:
+ (WebCore::newCoordsArray):
+ * platform/LinkHash.cpp:
+ (WebCore::visitedLinkHash):
+ * platform/graphics/Color.cpp:
+ (WebCore::Color::parseHexColor):
+ (WebCore::Color::Color):
+ * platform/graphics/TextRun.h:
+ (WebCore::TextRun::TextRun):
+ * platform/text/TextEncodingRegistry.cpp:
+ (WebCore::atomicCanonicalTextEncodingName):
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::constructTextRun):
+ * rendering/RenderCombineText.cpp:
+ (WebCore::RenderCombineText::width):
+ * svg/SVGFontElement.cpp:
+ (WebCore::SVGFontElement::registerLigaturesInGlyphCache):
+ * xml/XPathFunctions.cpp:
+ (WebCore::XPath::FunId::evaluate):
+ Use the new name.
+
+2014-01-25 Darin Adler <darin@apple.com>
+
</ins><span class="cx"> Get rid of ICU_UNICODE and WCHAR_UNICODE remnants
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=127623
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsobjcWebScriptObjectmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/objc/WebScriptObject.mm (162783 => 162784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/objc/WebScriptObject.mm 2014-01-25 22:46:42 UTC (rev 162783)
+++ trunk/Source/WebCore/bindings/objc/WebScriptObject.mm 2014-01-25 22:47:20 UTC (rev 162784)
</span><span class="lines">@@ -551,7 +551,7 @@
</span><span class="cx"> if (value.isString()) {
</span><span class="cx"> ExecState* exec = rootObject->globalObject()->globalExec();
</span><span class="cx"> const String& u = asString(value)->value(exec);
</span><del>- return [NSString stringWithCharacters:u.characters() length:u.length()];
</del><ins>+ return [NSString stringWithCharacters:u.deprecatedCharacters() length:u.length()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (value.isNumber())
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingCompositeEditCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/CompositeEditCommand.cpp (162783 => 162784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/CompositeEditCommand.cpp 2014-01-25 22:46:42 UTC (rev 162783)
+++ trunk/Source/WebCore/editing/CompositeEditCommand.cpp 2014-01-25 22:47:20 UTC (rev 162784)
</span><span class="lines">@@ -667,7 +667,7 @@
</span><span class="cx"> static inline bool containsOnlyWhitespace(const String& text)
</span><span class="cx"> {
</span><span class="cx"> for (unsigned i = 0; i < text.length(); ++i) {
</span><del>- if (!isWhitespace(text.characters()[i]))
</del><ins>+ if (!isWhitespace(text.deprecatedCharacters()[i]))
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingTypingCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/TypingCommand.cpp (162783 => 162784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/TypingCommand.cpp 2014-01-25 22:46:42 UTC (rev 162783)
+++ trunk/Source/WebCore/editing/TypingCommand.cpp 2014-01-25 22:47:20 UTC (rev 162784)
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> ASSERT(frame);
</span><span class="cx">
</span><span class="cx"> if (!text.isEmpty())
</span><del>- frame->editor().updateMarkersForWordsAffectedByEditing(isSpaceOrNewline(text.characters()[0]));
</del><ins>+ frame->editor().updateMarkersForWordsAffectedByEditing(isSpaceOrNewline(text.deprecatedCharacters()[0]));
</ins><span class="cx">
</span><span class="cx"> insertText(document, text, frame->selection().selection(), options, composition);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingVisibleUnitscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/VisibleUnits.cpp (162783 => 162784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/VisibleUnits.cpp 2014-01-25 22:46:42 UTC (rev 162783)
+++ trunk/Source/WebCore/editing/VisibleUnits.cpp 2014-01-25 22:47:20 UTC (rev 162784)
</span><span class="lines">@@ -1146,7 +1146,7 @@
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(n->isTextNode());
</span><span class="cx"> type = Position::PositionIsOffsetInAnchor;
</span><span class="cx"> if (style.preserveNewline()) {
</span><del>- const UChar* chars = toRenderText(r)->characters();
</del><ins>+ const UChar* chars = toRenderText(r)->deprecatedCharacters();
</ins><span class="cx"> int i = toRenderText(r)->textLength();
</span><span class="cx"> int o = offset;
</span><span class="cx"> if (n == startNode && o < i)
</span><span class="lines">@@ -1229,7 +1229,7 @@
</span><span class="cx"> int length = toRenderText(r)->textLength();
</span><span class="cx"> type = Position::PositionIsOffsetInAnchor;
</span><span class="cx"> if (style.preserveNewline()) {
</span><del>- const UChar* chars = toRenderText(r)->characters();
</del><ins>+ const UChar* chars = toRenderText(r)->deprecatedCharacters();
</ins><span class="cx"> int o = n == startNode ? offset : 0;
</span><span class="cx"> for (int i = o; i < length; ++i) {
</span><span class="cx"> if (chars[i] == '\n')
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLParserIdiomscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLParserIdioms.cpp (162783 => 162784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLParserIdioms.cpp 2014-01-25 22:46:42 UTC (rev 162783)
+++ trunk/Source/WebCore/html/parser/HTMLParserIdioms.cpp 2014-01-25 22:47:20 UTC (rev 162784)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> if (string.is8Bit())
</span><span class="cx"> return stripLeadingAndTrailingHTMLSpaces(string, string.characters8(), length);
</span><span class="cx">
</span><del>- return stripLeadingAndTrailingHTMLSpaces(string, string.characters(), length);
</del><ins>+ return stripLeadingAndTrailingHTMLSpaces(string, string.deprecatedCharacters(), length);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String serializeForNumberType(const Decimal& number)
</span><span class="lines">@@ -272,7 +272,7 @@
</span><span class="cx"> return parseHTMLNonNegativeIntegerInternal(start, start + length, value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- const UChar* start = input.characters();
</del><ins>+ const UChar* start = input.deprecatedCharacters();
</ins><span class="cx"> return parseHTMLNonNegativeIntegerInternal(start, start + length, value);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorStyleSheetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp (162783 => 162784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp 2014-01-25 22:46:42 UTC (rev 162783)
+++ trunk/Source/WebCore/inspector/InspectorStyleSheet.cpp 2014-01-25 22:47:20 UTC (rev 162784)
</span><span class="lines">@@ -723,7 +723,7 @@
</span><span class="cx"> int propertyIndex = 0;
</span><span class="cx"> bool isFullPrefixScanned = false;
</span><span class="cx"> bool lineFeedTerminated = false;
</span><del>- const UChar* characters = text.characters();
</del><ins>+ const UChar* characters = text.deprecatedCharacters();
</ins><span class="cx"> while (propertyIndex < propertyCount) {
</span><span class="cx"> const WebCore::CSSPropertySourceData& currentProperty = sourcePropertyData->at(propertyIndex++);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorStyleTextEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorStyleTextEditor.cpp (162783 => 162784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorStyleTextEditor.cpp 2014-01-25 22:46:42 UTC (rev 162783)
+++ trunk/Source/WebCore/inspector/InspectorStyleTextEditor.cpp 2014-01-25 22:47:20 UTC (rev 162784)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> if (insertLast && !insertFirstInSource) {
</span><span class="cx"> propertyStart = styleBodyLength;
</span><span class="cx"> if (propertyStart && textToSet.length()) {
</span><del>- const UChar* characters = m_styleText.characters();
</del><ins>+ const UChar* characters = m_styleText.deprecatedCharacters();
</ins><span class="cx">
</span><span class="cx"> long curPos = propertyStart - 1; // The last position of style declaration, since propertyStart points past one.
</span><span class="cx"> while (curPos && isHTMLSpace(characters[curPos]))
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx"> const SourceRange& range = property.sourceData.range;
</span><span class="cx"> long replaceRangeStart = range.start;
</span><span class="cx"> long replaceRangeEnd = range.end;
</span><del>- const UChar* characters = m_styleText.characters();
</del><ins>+ const UChar* characters = m_styleText.deprecatedCharacters();
</ins><span class="cx"> long newTextLength = newText.length();
</span><span class="cx"> String finalNewText = newText;
</span><span class="cx">
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx"> if (replaceRangeStart >= fullPrefixLength && m_styleText.substring(replaceRangeStart - fullPrefixLength, fullPrefixLength) == fullPrefix)
</span><span class="cx"> replaceRangeStart -= fullPrefixLength;
</span><span class="cx"> } else if (newTextLength) {
</span><del>- if (isHTMLLineBreak(newText.characters()[newTextLength - 1])) {
</del><ins>+ if (isHTMLLineBreak(newText.deprecatedCharacters()[newTextLength - 1])) {
</ins><span class="cx"> // Coalesce newlines of the original and new property values (to avoid a lot of blank lines while incrementally applying property values).
</span><span class="cx"> bool foundNewline = false;
</span><span class="cx"> bool isLastNewline = false;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLengthcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Length.cpp (162783 => 162784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Length.cpp 2014-01-25 22:46:42 UTC (rev 162783)
+++ trunk/Source/WebCore/platform/Length.cpp 2014-01-25 22:47:20 UTC (rev 162784)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> std::unique_ptr<Length[]> newCoordsArray(const String& string, int& len)
</span><span class="cx"> {
</span><span class="cx"> unsigned length = string.length();
</span><del>- const UChar* data = string.characters();
</del><ins>+ const UChar* data = string.deprecatedCharacters();
</ins><span class="cx"> StringBuffer<UChar> spacified(length);
</span><span class="cx"> for (unsigned i = 0; i < length; i++) {
</span><span class="cx"> UChar cc = data[i];
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLinkHashcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/LinkHash.cpp (162783 => 162784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/LinkHash.cpp 2014-01-25 22:46:42 UTC (rev 162783)
+++ trunk/Source/WebCore/platform/LinkHash.cpp 2014-01-25 22:47:20 UTC (rev 162784)
</span><span class="lines">@@ -217,7 +217,7 @@
</span><span class="cx">
</span><span class="cx"> if (length && url.is8Bit())
</span><span class="cx"> return visitedLinkHashInline(url.characters8(), length);
</span><del>- return visitedLinkHashInline(url.characters(), length);
</del><ins>+ return visitedLinkHashInline(url.deprecatedCharacters(), length);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LinkHash visitedLinkHash(const UChar* url, unsigned length)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsColorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/Color.cpp (162783 => 162784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/Color.cpp 2014-01-25 22:46:42 UTC (rev 162783)
+++ trunk/Source/WebCore/platform/graphics/Color.cpp 2014-01-25 22:47:20 UTC (rev 162784)
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (name.is8Bit())
</span><span class="cx"> return parseHexColor(name.characters8(), name.length(), rgb);
</span><del>- return parseHexColor(name.characters(), name.length(), rgb);
</del><ins>+ return parseHexColor(name.deprecatedCharacters(), name.length(), rgb);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int differenceSquared(const Color& c1, const Color& c2)
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> if (name.is8Bit())
</span><span class="cx"> m_valid = parseHexColor(name.characters8() + 1, name.length() - 1, m_color);
</span><span class="cx"> else
</span><del>- m_valid = parseHexColor(name.characters() + 1, name.length() - 1, m_color);
</del><ins>+ m_valid = parseHexColor(name.deprecatedCharacters() + 1, name.length() - 1, m_color);
</ins><span class="cx"> } else
</span><span class="cx"> setNamedColor(name);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsTextRunh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/TextRun.h (162783 => 162784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/TextRun.h 2014-01-25 22:46:42 UTC (rev 162783)
+++ trunk/Source/WebCore/platform/graphics/TextRun.h 2014-01-25 22:47:20 UTC (rev 162784)
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> m_data.characters8 = s.characters8();
</span><span class="cx"> m_is8Bit = true;
</span><span class="cx"> } else {
</span><del>- m_data.characters16 = s.characters();
</del><ins>+ m_data.characters16 = s.deprecatedCharacters();
</ins><span class="cx"> m_is8Bit = false;
</span><span class="cx"> }
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextTextEncodingRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/TextEncodingRegistry.cpp (162783 => 162784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/TextEncodingRegistry.cpp 2014-01-25 22:46:42 UTC (rev 162783)
+++ trunk/Source/WebCore/platform/text/TextEncodingRegistry.cpp 2014-01-25 22:47:20 UTC (rev 162784)
</span><span class="lines">@@ -341,7 +341,7 @@
</span><span class="cx"> if (alias.is8Bit())
</span><span class="cx"> return atomicCanonicalTextEncodingName<LChar>(alias.characters8(), alias.length());
</span><span class="cx">
</span><del>- return atomicCanonicalTextEncodingName<UChar>(alias.characters(), alias.length());
</del><ins>+ return atomicCanonicalTextEncodingName<UChar>(alias.deprecatedCharacters(), alias.length());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool noExtendedTextEncodingNameUsed()
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (162783 => 162784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-01-25 22:46:42 UTC (rev 162783)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-01-25 22:47:20 UTC (rev 162784)
</span><span class="lines">@@ -5448,7 +5448,7 @@
</span><span class="cx"> #if ENABLE(8BIT_TEXTRUN)
</span><span class="cx"> if (length && string.is8Bit())
</span><span class="cx"> return constructTextRunInternal(context, font, string.characters8(), length, style, expansion, flags);
</span><del>- return constructTextRunInternal(context, font, string.characters(), length, style, expansion, flags);
</del><ins>+ return constructTextRunInternal(context, font, string.deprecatedCharacters(), length, style, expansion, flags);
</ins><span class="cx"> #else
</span><span class="cx"> return constructTextRunInternal(context, font, string.deprecatedCharacters(), length, style, expansion, flags);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderCombineTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderCombineText.cpp (162783 => 162784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderCombineText.cpp 2014-01-25 22:46:42 UTC (rev 162783)
+++ trunk/Source/WebCore/rendering/RenderCombineText.cpp 2014-01-25 22:47:20 UTC (rev 162784)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx">
</span><span class="cx"> float RenderCombineText::width(unsigned from, unsigned length, const Font& font, float xPosition, HashSet<const SimpleFontData*>* fallbackFonts, GlyphOverflow* glyphOverflow) const
</span><span class="cx"> {
</span><del>- if (!characters())
</del><ins>+ if (!deprecatedCharacters())
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> if (m_isCombined)
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGFontElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGFontElement.cpp (162783 => 162784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGFontElement.cpp 2014-01-25 22:46:42 UTC (rev 162783)
+++ trunk/Source/WebCore/svg/SVGFontElement.cpp 2014-01-25 22:47:20 UTC (rev 162784)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> unsigned unicodeLength = unicode.length();
</span><span class="cx"> ASSERT(unicodeLength > 1);
</span><span class="cx">
</span><del>- const UChar* characters = unicode.characters();
</del><ins>+ const UChar* characters = unicode.deprecatedCharacters();
</ins><span class="cx"> for (unsigned i = 0; i < unicodeLength; ++i) {
</span><span class="cx"> String lookupString(characters + i, 1);
</span><span class="cx"> m_glyphMap.collectGlyphsForString(lookupString, glyphs);
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXPathFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XPathFunctions.cpp (162783 => 162784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XPathFunctions.cpp 2014-01-25 22:46:42 UTC (rev 162783)
+++ trunk/Source/WebCore/xml/XPathFunctions.cpp 2014-01-25 22:47:20 UTC (rev 162784)
</span><span class="lines">@@ -340,7 +340,7 @@
</span><span class="cx">
</span><span class="cx"> // If there are several nodes with the same id, id() should return the first one.
</span><span class="cx"> // In WebKit, getElementById behaves so, too, although its behavior in this case is formally undefined.
</span><del>- Node* node = contextScope.getElementById(String(idList.characters() + startPos, endPos - startPos));
</del><ins>+ Node* node = contextScope.getElementById(String(idList.deprecatedCharacters() + startPos, endPos - startPos));
</ins><span class="cx"> if (node && resultSet.add(node).isNewEntry)
</span><span class="cx"> result.append(node);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (162783 => 162784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-01-25 22:46:42 UTC (rev 162783)
+++ trunk/Tools/ChangeLog 2014-01-25 22:47:20 UTC (rev 162784)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-01-25 Darin Adler <darin@apple.com>
+
+ Call deprecatedCharacters instead of characters at more call sites
+ https://bugs.webkit.org/show_bug.cgi?id=127631
+
+ Reviewed by Sam Weinig.
+
+ * TestWebKitAPI/Tests/WTF/StringBuilder.cpp:
+ (TestWebKitAPI::expectBuilderContent):
+ (TestWebKitAPI::expectEmpty):
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WTF/StringImpl.cpp:
+ (TestWebKitAPI::TEST):
+ Use the new name.
+
</ins><span class="cx"> 2014-01-25 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Modernize HashTable threading code
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFStringBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/StringBuilder.cpp (162783 => 162784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/StringBuilder.cpp 2014-01-25 22:46:42 UTC (rev 162783)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/StringBuilder.cpp 2014-01-25 22:47:20 UTC (rev 162784)
</span><span class="lines">@@ -38,14 +38,14 @@
</span><span class="cx"> {
</span><span class="cx"> // Not using builder.toString() or builder.toStringPreserveCapacity() because they all
</span><span class="cx"> // change internal state of builder.
</span><del>- EXPECT_EQ(expected, String(builder.characters(), builder.length()));
</del><ins>+ EXPECT_EQ(expected, String(builder.deprecatedCharacters(), builder.length()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void expectEmpty(const StringBuilder& builder)
</span><span class="cx"> {
</span><span class="cx"> EXPECT_EQ(0U, builder.length());
</span><span class="cx"> EXPECT_TRUE(builder.isEmpty());
</span><del>- EXPECT_EQ(0, builder.characters());
</del><ins>+ EXPECT_EQ(0, builder.deprecatedCharacters());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(StringBuilderTest, DefaultConstructor)
</span><span class="lines">@@ -72,20 +72,20 @@
</span><span class="cx"> StringBuilder builder1;
</span><span class="cx"> builder.append("", 0);
</span><span class="cx"> expectBuilderContent("0123456789abcdefg#", builder);
</span><del>- builder1.append(builder.characters(), builder.length());
</del><ins>+ builder1.append(builder.deprecatedCharacters(), builder.length());
</ins><span class="cx"> builder1.append("XYZ");
</span><del>- builder.append(builder1.characters(), builder1.length());
</del><ins>+ builder.append(builder1.deprecatedCharacters(), builder1.length());
</ins><span class="cx"> expectBuilderContent("0123456789abcdefg#0123456789abcdefg#XYZ", builder);
</span><span class="cx">
</span><span class="cx"> StringBuilder builder2;
</span><span class="cx"> builder2.reserveCapacity(100);
</span><span class="cx"> builder2.append("xyz");
</span><del>- const UChar* characters = builder2.characters();
</del><ins>+ const UChar* characters = builder2.deprecatedCharacters();
</ins><span class="cx"> builder2.append("0123456789");
</span><del>- ASSERT_EQ(characters, builder2.characters());
</del><ins>+ ASSERT_EQ(characters, builder2.deprecatedCharacters());
</ins><span class="cx"> builder2.toStringPreserveCapacity(); // Test after reifyString with buffer preserved.
</span><span class="cx"> builder2.append("abcd");
</span><del>- ASSERT_EQ(characters, builder2.characters());
</del><ins>+ ASSERT_EQ(characters, builder2.deprecatedCharacters());
</ins><span class="cx">
</span><span class="cx"> // Test appending UChar32 characters to StringBuilder.
</span><span class="cx"> StringBuilder builderForUChar32Append;
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> ASSERT_EQ(capacity, builder.capacity());
</span><span class="cx"> ASSERT_EQ(String("0123456789"), string);
</span><span class="cx"> ASSERT_EQ(string.impl(), builder.toStringPreserveCapacity().impl());
</span><del>- ASSERT_EQ(string.characters(), builder.characters());
</del><ins>+ ASSERT_EQ(string.deprecatedCharacters(), builder.deprecatedCharacters());
</ins><span class="cx">
</span><span class="cx"> // Changing the StringBuilder should not affect the original result of toStringPreserveCapacity().
</span><span class="cx"> builder.append("abcdefghijklmnopqrstuvwxyz");
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> capacity = builder.capacity();
</span><span class="cx"> string = builder.toStringPreserveCapacity();
</span><span class="cx"> ASSERT_EQ(capacity, builder.capacity());
</span><del>- ASSERT_EQ(string.characters(), builder.characters());
</del><ins>+ ASSERT_EQ(string.deprecatedCharacters(), builder.deprecatedCharacters());
</ins><span class="cx"> ASSERT_EQ(String("0123456789abcdefghijklmnopqrstuvwxyz"), string);
</span><span class="cx"> builder.append("ABC");
</span><span class="cx"> ASSERT_EQ(String("0123456789abcdefghijklmnopqrstuvwxyz"), string);
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> capacity = builder.capacity();
</span><span class="cx"> String string1 = builder.toStringPreserveCapacity();
</span><span class="cx"> ASSERT_EQ(capacity, builder.capacity());
</span><del>- ASSERT_EQ(string1.characters(), builder.characters());
</del><ins>+ ASSERT_EQ(string1.deprecatedCharacters(), builder.deprecatedCharacters());
</ins><span class="cx"> ASSERT_EQ(String("0123456789abcdefghijklmnopqrstuvwxyzABC"), string1);
</span><span class="cx"> string1.append("DEF");
</span><span class="cx"> ASSERT_EQ(String("0123456789abcdefghijklmnopqrstuvwxyzABC"), builder.toStringPreserveCapacity());
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx"> capacity = builder.capacity();
</span><span class="cx"> string1 = builder.toStringPreserveCapacity();
</span><span class="cx"> ASSERT_EQ(capacity, builder.capacity());
</span><del>- ASSERT_EQ(string.characters(), builder.characters());
</del><ins>+ ASSERT_EQ(string.deprecatedCharacters(), builder.deprecatedCharacters());
</ins><span class="cx"> builder.resize(10);
</span><span class="cx"> builder.append("###");
</span><span class="cx"> ASSERT_EQ(String("0123456789abcdefghijklmnopqrstuvwxyzABC"), string1);
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFStringImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/StringImpl.cpp (162783 => 162784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/StringImpl.cpp 2014-01-25 22:46:42 UTC (rev 162783)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/StringImpl.cpp 2014-01-25 22:47:20 UTC (rev 162784)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> for (size_t i = 0; i < 10; ++i) {
</span><span class="cx"> RefPtr<StringImpl> string = StringImpl::createFromLiteral("Template Literal");
</span><span class="cx">
</span><del>- ASSERT_EQ(0, memcmp(controlString->characters(), string->characters(), controlString->length() * sizeof(UChar)));
</del><ins>+ ASSERT_EQ(0, memcmp(controlString->deprecatedCharacters(), string->deprecatedCharacters(), controlString->length() * sizeof(UChar)));
</ins><span class="cx"> ASSERT_TRUE(string->has16BitShadow());
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>