<!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>[163401] 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/163401">163401</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-02-04 13:50:25 -0800 (Tue, 04 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename StringImpl::getCharacters to StringImpl::characters
https://bugs.webkit.org/show_bug.cgi?id=128205
Reviewed by Antti Koivisto.
Source/JavaScriptCore:
Update for WTF changes.
* runtime/JSStringJoiner.cpp:
(JSC::joinStrings):
* runtime/StringPrototype.cpp:
(JSC::splitStringByOneCharacterImpl):
Source/WebCore:
Update for WTF changes.
* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::createTextRuns):
Source/WTF:
This lets us use StringImpl::getCharacters for the upconverting version.
Also, change StringImpl::characters<UChar>() to call characters16() instead of deprecatedCharacters()
and audit all call sites to make sure we weren't relying on upconversion anywhere.
* wtf/text/AtomicString.cpp:
(WTF::findString):
* wtf/text/StringImpl.cpp:
(WTF::StringImpl::simplifyMatchedCharactersToSpace):
* wtf/text/StringImpl.h:
(WTF::StringImpl::characters<LChar>):
(WTF::StringImpl::characters<UChar>):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSStringJoinercpp">trunk/Source/JavaScriptCore/runtime/JSStringJoiner.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="#trunkSourceWTFwtftextAtomicStringcpp">trunk/Source/WTF/wtf/text/AtomicString.cpp</a></li>
<li><a href="#trunkSourceWTFwtftextStringImplcpp">trunk/Source/WTF/wtf/text/StringImpl.cpp</a></li>
<li><a href="#trunkSourceWTFwtftextStringImplh">trunk/Source/WTF/wtf/text/StringImpl.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingSimpleLineLayoutcpp">trunk/Source/WebCore/rendering/SimpleLineLayout.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (163400 => 163401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-02-04 21:40:21 UTC (rev 163400)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-02-04 21:50:25 UTC (rev 163401)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-02-04 Anders Carlsson <andersca@apple.com>
+
+ Rename StringImpl::getCharacters to StringImpl::characters
+ https://bugs.webkit.org/show_bug.cgi?id=128205
+
+ Reviewed by Antti Koivisto.
+
+ Update for WTF changes.
+
+ * runtime/JSStringJoiner.cpp:
+ (JSC::joinStrings):
+ * runtime/StringPrototype.cpp:
+ (JSC::splitStringByOneCharacterImpl):
+
</ins><span class="cx"> 2014-02-04 Mark Hahnenberg <mhahnenberg@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix a mismatch of uint64_t and size_t on 32-bit platforms.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSStringJoinercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSStringJoiner.cpp (163400 => 163401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSStringJoiner.cpp 2014-02-04 21:40:21 UTC (rev 163400)
+++ trunk/Source/JavaScriptCore/runtime/JSStringJoiner.cpp 2014-02-04 21:50:25 UTC (rev 163401)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> CharacterType* data;
</span><span class="cx"> RefPtr<StringImpl> outputStringImpl = StringImpl::tryCreateUninitialized(outputLength, data);
</span><span class="cx"> if (!outputStringImpl)
</span><del>- return PassRefPtr<StringImpl>();
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> const String firstString = strings.first();
</span><span class="cx"> appendStringToData(data, firstString);
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> appendStringToData(data, strings[i]);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ASSERT(data == (outputStringImpl->getCharacters<CharacterType>() + outputStringImpl->length()));
</del><ins>+ ASSERT(data == (outputStringImpl->characters<CharacterType>() + outputStringImpl->length()));
</ins><span class="cx"> return outputStringImpl.release();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStringPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp (163400 => 163401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp 2014-02-04 21:40:21 UTC (rev 163400)
+++ trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp 2014-02-04 21:50:25 UTC (rev 163401)
</span><span class="lines">@@ -942,7 +942,7 @@
</span><span class="cx"> {
</span><span class="cx"> // 12. Let q = p.
</span><span class="cx"> size_t matchPosition;
</span><del>- const CharacterType* characters = string->getCharacters<CharacterType>();
</del><ins>+ const CharacterType* characters = string->characters<CharacterType>();
</ins><span class="cx"> // 13. Repeat, while q != s
</span><span class="cx"> // a. Call SplitMatch(S, q, R) and let z be its MatchResult result.
</span><span class="cx"> // b. If z is failure, then let q = q+1.
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (163400 => 163401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-02-04 21:40:21 UTC (rev 163400)
+++ trunk/Source/WTF/ChangeLog 2014-02-04 21:50:25 UTC (rev 163401)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2014-02-04 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Rename StringImpl::getCharacters to StringImpl::characters
+ https://bugs.webkit.org/show_bug.cgi?id=128205
+
+ Reviewed by Antti Koivisto.
+
+ This lets us use StringImpl::getCharacters for the upconverting version.
+ Also, change StringImpl::characters<UChar>() to call characters16() instead of deprecatedCharacters()
+ and audit all call sites to make sure we weren't relying on upconversion anywhere.
+
+ * wtf/text/AtomicString.cpp:
+ (WTF::findString):
+ * wtf/text/StringImpl.cpp:
+ (WTF::StringImpl::simplifyMatchedCharactersToSpace):
+ * wtf/text/StringImpl.h:
+ (WTF::StringImpl::characters<LChar>):
+ (WTF::StringImpl::characters<UChar>):
+
+2014-02-04 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Rename equalNonNull to equal and make it take const StringImpl& instead
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=128206
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtftextAtomicStringcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/AtomicString.cpp (163400 => 163401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/AtomicString.cpp 2014-02-04 21:40:21 UTC (rev 163400)
+++ trunk/Source/WTF/wtf/text/AtomicString.cpp 2014-02-04 21:50:25 UTC (rev 163401)
</span><span class="lines">@@ -400,7 +400,7 @@
</span><span class="cx"> template<typename CharacterType>
</span><span class="cx"> static inline HashSet<StringImpl*>::iterator findString(const StringImpl* stringImpl)
</span><span class="cx"> {
</span><del>- HashAndCharacters<CharacterType> buffer = { stringImpl->existingHash(), stringImpl->getCharacters<CharacterType>(), stringImpl->length() };
</del><ins>+ HashAndCharacters<CharacterType> buffer = { stringImpl->existingHash(), stringImpl->characters<CharacterType>(), stringImpl->length() };
</ins><span class="cx"> return stringTable().find<HashAndCharactersTranslator<CharacterType>>(buffer);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringImpl.cpp (163400 => 163401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringImpl.cpp 2014-02-04 21:40:21 UTC (rev 163400)
+++ trunk/Source/WTF/wtf/text/StringImpl.cpp 2014-02-04 21:50:25 UTC (rev 163401)
</span><span class="lines">@@ -817,7 +817,7 @@
</span><span class="cx"> {
</span><span class="cx"> StringBuffer<CharType> data(m_length);
</span><span class="cx">
</span><del>- const CharType* from = getCharacters<CharType>();
</del><ins>+ const CharType* from = characters<CharType>();
</ins><span class="cx"> const CharType* fromend = from + m_length;
</span><span class="cx"> int outc = 0;
</span><span class="cx"> bool changedToSpace = false;
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringImpl.h (163400 => 163401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringImpl.h 2014-02-04 21:40:21 UTC (rev 163400)
+++ trunk/Source/WTF/wtf/text/StringImpl.h 2014-02-04 21:50:25 UTC (rev 163401)
</span><span class="lines">@@ -453,7 +453,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename CharType>
</span><del>- ALWAYS_INLINE const CharType * getCharacters() const;
</del><ins>+ ALWAYS_INLINE const CharType *characters() const;
</ins><span class="cx">
</span><span class="cx"> size_t cost() const
</span><span class="cx"> {
</span><span class="lines">@@ -881,10 +881,10 @@
</span><span class="cx"> ALWAYS_INLINE PassRef<StringImpl> StringImpl::constructInternal<UChar>(StringImpl* impl, unsigned length) { return adoptRef(*new (NotNull, impl) StringImpl(length)); }
</span><span class="cx">
</span><span class="cx"> template <>
</span><del>-ALWAYS_INLINE const LChar* StringImpl::getCharacters<LChar>() const { return characters8(); }
</del><ins>+ALWAYS_INLINE const LChar* StringImpl::characters<LChar>() const { return characters8(); }
</ins><span class="cx">
</span><span class="cx"> template <>
</span><del>-ALWAYS_INLINE const UChar* StringImpl::getCharacters<UChar>() const { return deprecatedCharacters(); }
</del><ins>+ALWAYS_INLINE const UChar* StringImpl::characters<UChar>() const { return characters16(); }
</ins><span class="cx">
</span><span class="cx"> WTF_EXPORT_STRING_API bool equal(const StringImpl*, const StringImpl*);
</span><span class="cx"> WTF_EXPORT_STRING_API bool equal(const StringImpl*, const LChar*);
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163400 => 163401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-04 21:40:21 UTC (rev 163400)
+++ trunk/Source/WebCore/ChangeLog 2014-02-04 21:50:25 UTC (rev 163401)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2014-02-04 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Rename StringImpl::getCharacters to StringImpl::characters
+ https://bugs.webkit.org/show_bug.cgi?id=128205
+
+ Reviewed by Antti Koivisto.
+
+ Update for WTF changes.
+
+ * rendering/SimpleLineLayout.cpp:
+ (WebCore::SimpleLineLayout::createTextRuns):
+
+2014-02-04 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Rename equalNonNull to equal and make it take const StringImpl& instead
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=128206
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayout.cpp (163400 => 163401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2014-02-04 21:40:21 UTC (rev 163400)
+++ trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2014-02-04 21:50:25 UTC (rev 163401)
</span><span class="lines">@@ -414,7 +414,7 @@
</span><span class="cx"> {
</span><span class="cx"> const Style style(flow.style());
</span><span class="cx">
</span><del>- const CharacterType* text = textRenderer.text()->getCharacters<CharacterType>();
</del><ins>+ const CharacterType* text = textRenderer.text()->characters<CharacterType>();
</ins><span class="cx"> const unsigned textLength = textRenderer.textLength();
</span><span class="cx">
</span><span class="cx"> LayoutUnit borderAndPaddingBefore = flow.borderAndPaddingBefore();
</span></span></pre>
</div>
</div>
</body>
</html>