<!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>[165792] trunk/Source/WTF</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/165792">165792</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2014-03-17 20:00:06 -0700 (Mon, 17 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove most uses of deprecatedCharacter in WTF
https://bugs.webkit.org/show_bug.cgi?id=130317
Reviewed by Andreas Kling.
Re-landing after fixing the "80 instead of 0x80" typo in equalLatin1WithUTF8.
* wtf/text/AtomicString.cpp:
(WTF::HashAndUTF8CharactersTranslator::equal): Add an 8-bit code path to the
non-ASCII path.
(WTF::SubstringTranslator8::hash): Added.
(WTF::SubstringTranslator8::equal): Added.
(WTF::SubstringTranslator16::hash): Renamed class.
(WTF::SubstringTranslator16::equal): Ditto.
(WTF::AtomicString::add): Added an 8-bit code path to the substring case.
* wtf/text/Base64.cpp:
(WTF::base64Decode): Added an 8 bit code path.
(WTF::base64URLDecode): Ditto.
* wtf/text/StringImpl.cpp:
(WTF::StringImpl::find): Fixed a case that was incorrectly using characters16
without first using is8Bit. Need to return later to remove use of deprecatedCharacters.
* wtf/unicode/UTF8.cpp:
(WTF::Unicode::equalUTF16WithUTF8): Added a case for when the UTF-16 characters
are ASCII. Also removed the aEnd argument, since the caller only calls this when the
lengths are equal.
(WTF::Unicode::equalLatin1WithUTF8): Added.
* wtf/unicode/UTF8.h: Updated as described above.</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWTFwtftextBase64cpp">trunk/Source/WTF/wtf/text/Base64.cpp</a></li>
<li><a href="#trunkSourceWTFwtftextStringImplcpp">trunk/Source/WTF/wtf/text/StringImpl.cpp</a></li>
<li><a href="#trunkSourceWTFwtfunicodeUTF8cpp">trunk/Source/WTF/wtf/unicode/UTF8.cpp</a></li>
<li><a href="#trunkSourceWTFwtfunicodeUTF8h">trunk/Source/WTF/wtf/unicode/UTF8.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (165791 => 165792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-03-18 02:45:24 UTC (rev 165791)
+++ trunk/Source/WTF/ChangeLog 2014-03-18 03:00:06 UTC (rev 165792)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2014-03-17 Darin Adler <darin@apple.com>
+
+ Remove most uses of deprecatedCharacter in WTF
+ https://bugs.webkit.org/show_bug.cgi?id=130317
+
+ Reviewed by Andreas Kling.
+
+ Re-landing after fixing the "80 instead of 0x80" typo in equalLatin1WithUTF8.
+
+ * wtf/text/AtomicString.cpp:
+ (WTF::HashAndUTF8CharactersTranslator::equal): Add an 8-bit code path to the
+ non-ASCII path.
+ (WTF::SubstringTranslator8::hash): Added.
+ (WTF::SubstringTranslator8::equal): Added.
+ (WTF::SubstringTranslator16::hash): Renamed class.
+ (WTF::SubstringTranslator16::equal): Ditto.
+ (WTF::AtomicString::add): Added an 8-bit code path to the substring case.
+
+ * wtf/text/Base64.cpp:
+ (WTF::base64Decode): Added an 8 bit code path.
+ (WTF::base64URLDecode): Ditto.
+
+ * wtf/text/StringImpl.cpp:
+ (WTF::StringImpl::find): Fixed a case that was incorrectly using characters16
+ without first using is8Bit. Need to return later to remove use of deprecatedCharacters.
+
+ * wtf/unicode/UTF8.cpp:
+ (WTF::Unicode::equalUTF16WithUTF8): Added a case for when the UTF-16 characters
+ are ASCII. Also removed the aEnd argument, since the caller only calls this when the
+ lengths are equal.
+ (WTF::Unicode::equalLatin1WithUTF8): Added.
+ * wtf/unicode/UTF8.h: Updated as described above.
+
</ins><span class="cx"> 2014-03-17 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r165721.
</span></span></pre></div>
<a id="trunkSourceWTFwtftextAtomicStringcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/AtomicString.cpp (165791 => 165792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/AtomicString.cpp 2014-03-18 02:45:24 UTC (rev 165791)
+++ trunk/Source/WTF/wtf/text/AtomicString.cpp 2014-03-18 03:00:06 UTC (rev 165792)
</span><span class="lines">@@ -187,9 +187,10 @@
</span><span class="cx">
</span><span class="cx"> // If buffer contains only ASCII characters UTF-8 and UTF16 length are the same.
</span><span class="cx"> if (buffer.utf16Length != buffer.length) {
</span><del>- const UChar* stringCharacters = string->deprecatedCharacters();
</del><ins>+ if (string->is8Bit())
+ return equalLatin1WithUTF8(string->characters8(), buffer.characters, buffer.characters + buffer.length);
</ins><span class="cx">
</span><del>- return equalUTF16WithUTF8(stringCharacters, stringCharacters + string->length(), buffer.characters, buffer.characters + buffer.length);
</del><ins>+ return equalUTF16WithUTF8(string->characters16(), buffer.characters, buffer.characters + buffer.length);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (string->is8Bit()) {
</span><span class="lines">@@ -281,28 +282,42 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct SubstringTranslator {
</span><ins>+ static void translate(StringImpl*& location, const SubstringLocation& buffer, unsigned hash)
+ {
+ location = &StringImpl::createSubstringSharingImpl(buffer.baseString, buffer.start, buffer.length).leakRef();
+ location->setHash(hash);
+ location->setIsAtomic(true);
+ }
+};
+
+struct SubstringTranslator8 : SubstringTranslator {
</ins><span class="cx"> static unsigned hash(const SubstringLocation& buffer)
</span><span class="cx"> {
</span><del>- return StringHasher::computeHashAndMaskTop8Bits(buffer.baseString->deprecatedCharacters() + buffer.start, buffer.length);
</del><ins>+ return StringHasher::computeHashAndMaskTop8Bits(buffer.baseString->characters8() + buffer.start, buffer.length);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool equal(StringImpl* const& string, const SubstringLocation& buffer)
</span><span class="cx"> {
</span><del>- return WTF::equal(string, buffer.baseString->deprecatedCharacters() + buffer.start, buffer.length);
</del><ins>+ return WTF::equal(string, buffer.baseString->characters8() + buffer.start, buffer.length);
</ins><span class="cx"> }
</span><ins>+};
</ins><span class="cx">
</span><del>- static void translate(StringImpl*& location, const SubstringLocation& buffer, unsigned hash)
</del><ins>+struct SubstringTranslator16 : SubstringTranslator {
+ static unsigned hash(const SubstringLocation& buffer)
</ins><span class="cx"> {
</span><del>- location = &StringImpl::createSubstringSharingImpl(buffer.baseString, buffer.start, buffer.length).leakRef();
- location->setHash(hash);
- location->setIsAtomic(true);
</del><ins>+ return StringHasher::computeHashAndMaskTop8Bits(buffer.baseString->characters16() + buffer.start, buffer.length);
</ins><span class="cx"> }
</span><ins>+
+ static bool equal(StringImpl* const& string, const SubstringLocation& buffer)
+ {
+ return WTF::equal(string, buffer.baseString->characters16() + buffer.start, buffer.length);
+ }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> PassRefPtr<StringImpl> AtomicString::add(StringImpl* baseString, unsigned start, unsigned length)
</span><span class="cx"> {
</span><span class="cx"> if (!baseString)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> if (!length || start >= baseString->length())
</span><span class="cx"> return StringImpl::empty();
</span><span class="lines">@@ -315,7 +330,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SubstringLocation buffer = { baseString, start, length };
</span><del>- return addToStringTable<SubstringLocation, SubstringTranslator>(buffer);
</del><ins>+ if (baseString->is8Bit())
+ return addToStringTable<SubstringLocation, SubstringTranslator8>(buffer);
+ return addToStringTable<SubstringLocation, SubstringTranslator16>(buffer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> typedef HashTranslatorCharBuffer<LChar> LCharBuffer;
</span></span></pre></div>
<a id="trunkSourceWTFwtftextBase64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/Base64.cpp (165791 => 165792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/Base64.cpp 2014-03-18 02:45:24 UTC (rev 165791)
+++ trunk/Source/WTF/wtf/text/Base64.cpp 2014-03-18 03:00:06 UTC (rev 165792)
</span><span class="lines">@@ -250,7 +250,10 @@
</span><span class="cx">
</span><span class="cx"> bool base64Decode(const String& in, SignedOrUnsignedCharVectorAdapter out, Base64DecodePolicy policy)
</span><span class="cx"> {
</span><del>- return base64DecodeInternal<UChar>(in.deprecatedCharacters(), in.length(), out, policy, base64DecMap);
</del><ins>+ unsigned length = in.length();
+ if (!length || in.is8Bit())
+ return base64DecodeInternal(in.characters8(), length, out, policy, base64DecMap);
+ return base64DecodeInternal(in.characters16(), length, out, policy, base64DecMap);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool base64Decode(const Vector<char>& in, SignedOrUnsignedCharVectorAdapter out, Base64DecodePolicy policy)
</span><span class="lines">@@ -261,17 +264,20 @@
</span><span class="cx"> if (in.size() > UINT_MAX)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- return base64DecodeInternal<char>(in.data(), in.size(), out, policy, base64DecMap);
</del><ins>+ return base64DecodeInternal(reinterpret_cast<const LChar*>(in.data()), in.size(), out, policy, base64DecMap);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool base64Decode(const char* data, unsigned len, SignedOrUnsignedCharVectorAdapter out, Base64DecodePolicy policy)
</span><span class="cx"> {
</span><del>- return base64DecodeInternal<char>(data, len, out, policy, base64DecMap);
</del><ins>+ return base64DecodeInternal(reinterpret_cast<const LChar*>(data), len, out, policy, base64DecMap);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool base64URLDecode(const String& in, SignedOrUnsignedCharVectorAdapter out)
</span><span class="cx"> {
</span><del>- return base64DecodeInternal<UChar>(in.deprecatedCharacters(), in.length(), out, Base64FailOnInvalidCharacter, base64URLDecMap);
</del><ins>+ unsigned length = in.length();
+ if (!length || in.is8Bit())
+ return base64DecodeInternal(in.characters8(), length, out, Base64FailOnInvalidCharacter, base64URLDecMap);
+ return base64DecodeInternal(in.characters16(), length, out, Base64FailOnInvalidCharacter, base64URLDecMap);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool base64URLDecode(const Vector<char>& in, SignedOrUnsignedCharVectorAdapter out)
</span><span class="lines">@@ -282,12 +288,12 @@
</span><span class="cx"> if (in.size() > UINT_MAX)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- return base64DecodeInternal<char>(in.data(), in.size(), out, Base64FailOnInvalidCharacter, base64URLDecMap);
</del><ins>+ return base64DecodeInternal(reinterpret_cast<const LChar*>(in.data()), in.size(), out, Base64FailOnInvalidCharacter, base64URLDecMap);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool base64URLDecode(const char* data, unsigned len, SignedOrUnsignedCharVectorAdapter out)
</span><span class="cx"> {
</span><del>- return base64DecodeInternal<char>(data, len, out, Base64FailOnInvalidCharacter, base64URLDecMap);
</del><ins>+ return base64DecodeInternal(reinterpret_cast<const LChar*>(data), len, out, Base64FailOnInvalidCharacter, base64URLDecMap);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WTF
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringImpl.cpp (165791 => 165792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringImpl.cpp 2014-03-18 02:45:24 UTC (rev 165791)
+++ trunk/Source/WTF/wtf/text/StringImpl.cpp 2014-03-18 03:00:06 UTC (rev 165792)
</span><span class="lines">@@ -986,7 +986,7 @@
</span><span class="cx">
</span><span class="cx"> // Optimization 1: fast case for strings of length 1.
</span><span class="cx"> if (matchLength == 1)
</span><del>- return WTF::find(characters16(), length(), *matchString, index);
</del><ins>+ return WTF::find(deprecatedCharacters(), length(), *matchString, index);
</ins><span class="cx">
</span><span class="cx"> // Check index & matchLength are in range.
</span><span class="cx"> if (index > length())
</span></span></pre></div>
<a id="trunkSourceWTFwtfunicodeUTF8cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/unicode/UTF8.cpp (165791 => 165792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/unicode/UTF8.cpp 2014-03-18 02:45:24 UTC (rev 165791)
+++ trunk/Source/WTF/wtf/unicode/UTF8.cpp 2014-03-18 03:00:06 UTC (rev 165792)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2007 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2007, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -420,10 +420,10 @@
</span><span class="cx"> return stringHasher.hashWithTop8BitsMasked();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool equalUTF16WithUTF8(const UChar* a, const UChar* aEnd, const char* b, const char* bEnd)
</del><ins>+bool equalUTF16WithUTF8(const UChar* a, const char* b, const char* bEnd)
</ins><span class="cx"> {
</span><span class="cx"> while (b < bEnd) {
</span><del>- if (isASCII(*b)) {
</del><ins>+ if (isASCII(*a) || isASCII(*b)) {
</ins><span class="cx"> if (*a++ != *b++)
</span><span class="cx"> return false;
</span><span class="cx"> continue;
</span><span class="lines">@@ -435,7 +435,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (!isLegalUTF8(reinterpret_cast<const unsigned char*>(b), utf8SequenceLength))
</span><del>- return 0;
</del><ins>+ return false;
</ins><span class="cx">
</span><span class="cx"> UChar32 character = readUTF8Sequence(b, utf8SequenceLength);
</span><span class="cx"> ASSERT(!isASCII(character));
</span><span class="lines">@@ -455,8 +455,34 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return a == aEnd;
</del><ins>+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+bool equalLatin1WithUTF8(const LChar* a, const char* b, const char* bEnd)
+{
+ while (b < bEnd) {
+ if (isASCII(*a) || isASCII(*b)) {
+ if (*a++ != *b++)
+ return false;
+ continue;
+ }
+
+ if (b + 1 == bEnd)
+ return false;
+
+ if ((b[0] & 0xE0) != 0xC0 || (b[1] & 0xC0) != 0x80)
+ return false;
+
+ LChar character = ((b[0] & 0x1F) << 6) | (b[1] & 0x3F);
+
+ b += 2;
+
+ if (*a++ != character)
+ return false;
+ }
+
+ return true;
+}
+
</ins><span class="cx"> } // namespace Unicode
</span><span class="cx"> } // namespace WTF
</span></span></pre></div>
<a id="trunkSourceWTFwtfunicodeUTF8h"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/unicode/UTF8.h (165791 => 165792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/unicode/UTF8.h 2014-03-18 02:45:24 UTC (rev 165791)
+++ trunk/Source/WTF/wtf/unicode/UTF8.h 2014-03-18 03:00:06 UTC (rev 165792)
</span><span class="lines">@@ -77,7 +77,9 @@
</span><span class="cx">
</span><span class="cx"> WTF_EXPORT_PRIVATE unsigned calculateStringHashAndLengthFromUTF8MaskingTop8Bits(const char* data, const char* dataEnd, unsigned& dataLength, unsigned& utf16Length);
</span><span class="cx">
</span><del>- WTF_EXPORT_PRIVATE bool equalUTF16WithUTF8(const UChar* a, const UChar* aEnd, const char* b, const char* bEnd);
</del><ins>+ // The caller of these functions already knows that the lengths are the same, so we omit an end argument for UTF-16 and Latin-1.
+ bool equalUTF16WithUTF8(const UChar* stringInUTF16, const char* stringInUTF8, const char* stringInUTF8End);
+ bool equalLatin1WithUTF8(const LChar* stringInLatin1, const char* stringInUTF8, const char* stringInUTF8End);
</ins><span class="cx">
</span><span class="cx"> } // namespace Unicode
</span><span class="cx"> } // namespace WTF
</span></span></pre>
</div>
</div>
</body>
</html>