<!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>[165724] trunk/Source/WebCore</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/165724">165724</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2014-03-17 01:01:27 -0700 (Mon, 17 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Stop using deprecatedCharacters in HTMLTreeBuilder
https://bugs.webkit.org/show_bug.cgi?id=130323
Reviewed by Andreas Kling.
Keeping this separate from other patches because of concern that this could affect
page load performance.
* html/parser/HTMLTreeBuilder.cpp:
(WebCore::HTMLTreeBuilder::ExternalCharacterTokenBuffer::ExternalCharacterTokenBuffer):
Use a StringView instead of a character pointer.
(WebCore::HTMLTreeBuilder::ExternalCharacterTokenBuffer::isEmpty): Ditto.
(WebCore::HTMLTreeBuilder::ExternalCharacterTokenBuffer::skipAtMostOneLeadingNewline):
Ditto.
(WebCore::HTMLTreeBuilder::ExternalCharacterTokenBuffer::takeRemaining): Ditto.
(WebCore::HTMLTreeBuilder::ExternalCharacterTokenBuffer::giveRemainingTo): Ditto.
(WebCore::HTMLTreeBuilder::ExternalCharacterTokenBuffer::takeRemainingWhitespace): Ditto.
(WebCore::HTMLTreeBuilder::ExternalCharacterTokenBuffer::skipLeading): Ditto.
(WebCore::HTMLTreeBuilder::ExternalCharacterTokenBuffer::takeLeading): Ditto.
(WebCore::HTMLTreeBuilder::linkifyPhoneNumbers): Use StringView::upconvertedCharacters.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLTreeBuildercpp">trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165723 => 165724)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-17 07:52:37 UTC (rev 165723)
+++ trunk/Source/WebCore/ChangeLog 2014-03-17 08:01:27 UTC (rev 165724)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-03-17 Darin Adler <darin@apple.com>
+
+ Stop using deprecatedCharacters in HTMLTreeBuilder
+ https://bugs.webkit.org/show_bug.cgi?id=130323
+
+ Reviewed by Andreas Kling.
+
+ Keeping this separate from other patches because of concern that this could affect
+ page load performance.
+
+ * html/parser/HTMLTreeBuilder.cpp:
+ (WebCore::HTMLTreeBuilder::ExternalCharacterTokenBuffer::ExternalCharacterTokenBuffer):
+ Use a StringView instead of a character pointer.
+ (WebCore::HTMLTreeBuilder::ExternalCharacterTokenBuffer::isEmpty): Ditto.
+ (WebCore::HTMLTreeBuilder::ExternalCharacterTokenBuffer::skipAtMostOneLeadingNewline):
+ Ditto.
+ (WebCore::HTMLTreeBuilder::ExternalCharacterTokenBuffer::takeRemaining): Ditto.
+ (WebCore::HTMLTreeBuilder::ExternalCharacterTokenBuffer::giveRemainingTo): Ditto.
+ (WebCore::HTMLTreeBuilder::ExternalCharacterTokenBuffer::takeRemainingWhitespace): Ditto.
+ (WebCore::HTMLTreeBuilder::ExternalCharacterTokenBuffer::skipLeading): Ditto.
+ (WebCore::HTMLTreeBuilder::ExternalCharacterTokenBuffer::takeLeading): Ditto.
+ (WebCore::HTMLTreeBuilder::linkifyPhoneNumbers): Use StringView::upconvertedCharacters.
+
</ins><span class="cx"> 2014-03-17 Jinwoo Song <jinwoo7.song@samsung.com>
</span><span class="cx">
</span><span class="cx"> Make some Module class constructors return PassRef.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLTreeBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp (165723 => 165724)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp 2014-03-17 07:52:37 UTC (rev 165723)
+++ trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp 2014-03-17 08:01:27 UTC (rev 165724)
</span><span class="lines">@@ -138,17 +138,15 @@
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(ExternalCharacterTokenBuffer);
</span><span class="cx"> public:
</span><span class="cx"> explicit ExternalCharacterTokenBuffer(AtomicHTMLToken* token)
</span><del>- : m_current(token->characters())
- , m_end(m_current + token->charactersLength())
</del><ins>+ : m_text(token->characters(), token->charactersLength())
</ins><span class="cx"> , m_isAll8BitData(token->isAll8BitData())
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!isEmpty());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> explicit ExternalCharacterTokenBuffer(const String& string)
</span><del>- : m_current(string.deprecatedCharacters())
- , m_end(m_current + string.length())
- , m_isAll8BitData(string.length() && string.is8Bit())
</del><ins>+ : m_text(string)
+ , m_isAll8BitData(m_text.length() && m_text.is8Bit())
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!isEmpty());
</span><span class="cx"> }
</span><span class="lines">@@ -158,15 +156,15 @@
</span><span class="cx"> ASSERT(isEmpty());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool isEmpty() const { return m_current == m_end; }
</del><ins>+ bool isEmpty() const { return m_text.isEmpty(); }
</ins><span class="cx">
</span><span class="cx"> bool isAll8BitData() const { return m_isAll8BitData; }
</span><span class="cx">
</span><span class="cx"> void skipAtMostOneLeadingNewline()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!isEmpty());
</span><del>- if (*m_current == '\n')
- ++m_current;
</del><ins>+ if (m_text[0] == '\n')
+ m_text = m_text.substring(1);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void skipLeadingWhitespace()
</span><span class="lines">@@ -186,37 +184,38 @@
</span><span class="cx">
</span><span class="cx"> String takeRemaining()
</span><span class="cx"> {
</span><del>- ASSERT(!isEmpty());
- const UChar* start = m_current;
- m_current = m_end;
- size_t length = m_current - start;
-
- if (isAll8BitData())
- return String::make8BitFrom16BitSource(start, length);
-
- return String(start, length);
</del><ins>+ String result;
+ if (m_text.is8Bit() || !isAll8BitData())
+ result = m_text.toString();
+ else
+ result = String::make8BitFrom16BitSource(m_text.characters16(), m_text.length());
+ m_text = StringView();
+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void giveRemainingTo(StringBuilder& recipient)
</span><span class="cx"> {
</span><del>- recipient.append(m_current, m_end - m_current);
- m_current = m_end;
</del><ins>+ recipient.append(m_text);
+ m_text = StringView();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String takeRemainingWhitespace()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!isEmpty());
</span><del>- Vector<UChar> whitespace;
</del><ins>+ Vector<LChar, 8> whitespace;
</ins><span class="cx"> do {
</span><del>- UChar cc = *m_current++;
- if (isHTMLSpace(cc))
- whitespace.append(cc);
- } while (m_current < m_end);
</del><ins>+ UChar character = m_text[0];
+ if (isHTMLSpace(character))
+ whitespace.append(character);
+ m_text = m_text.substring(1);
+ } while (!m_text.isEmpty());
+
</ins><span class="cx"> // Returning the null string when there aren't any whitespace
</span><span class="cx"> // characters is slightly cleaner semantically because we don't want
</span><span class="cx"> // to insert a text node (as opposed to inserting an empty text node).
</span><span class="cx"> if (whitespace.isEmpty())
</span><span class="cx"> return String();
</span><ins>+
</ins><span class="cx"> return String::adopt(whitespace);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -225,8 +224,9 @@
</span><span class="cx"> void skipLeading()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!isEmpty());
</span><del>- while (characterPredicate(*m_current)) {
- if (++m_current == m_end)
</del><ins>+ while (characterPredicate(m_text[0])) {
+ m_text = m_text.substring(1);
+ if (m_text.isEmpty())
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -235,17 +235,17 @@
</span><span class="cx"> String takeLeading()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!isEmpty());
</span><del>- const UChar* start = m_current;
</del><ins>+ StringView start = m_text;
</ins><span class="cx"> skipLeading<characterPredicate>();
</span><del>- if (start == m_current)
</del><ins>+ if (start.length() == m_text.length())
</ins><span class="cx"> return String();
</span><del>- if (isAll8BitData())
- return String::make8BitFrom16BitSource(start, m_current - start);
- return String(start, m_current - start);
</del><ins>+ StringView leading = start.substring(0, start.length() - m_text.length());
+ if (leading.is8Bit() || !isAll8BitData())
+ return leading.toString();
+ return String::make8BitFrom16BitSource(leading.characters16(), leading.length());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- const UChar* m_current;
- const UChar* m_end;
</del><ins>+ StringView m_text;
</ins><span class="cx"> bool m_isAll8BitData;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -2338,8 +2338,10 @@
</span><span class="cx"> int relativeStartPosition = 0;
</span><span class="cx"> int relativeEndPosition = 0;
</span><span class="cx">
</span><ins>+ auto characters = string.upconvertedCharacters();
+
</ins><span class="cx"> // While there's a phone number in the rest of the string...
</span><del>- while ((scannerPosition < length) && TelephoneNumberDetector::find(&string.deprecatedCharacters()[scannerPosition], length - scannerPosition, &relativeStartPosition, &relativeEndPosition)) {
</del><ins>+ while (scannerPosition < length && TelephoneNumberDetector::find(&characters[scannerPosition], length - scannerPosition, &relativeStartPosition, &relativeEndPosition)) {
</ins><span class="cx"> // The convention in the Data Detectors framework is that the end position is the first character NOT in the phone number
</span><span class="cx"> // (that is, the length of the range is relativeEndPosition - relativeStartPosition). So substract 1 to get the same
</span><span class="cx"> // convention as the old WebCore phone number parser (so that the rest of the code is still valid if we want to go back
</span></span></pre>
</div>
</div>
</body>
</html>