<!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>[163854] 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/163854">163854</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-10 18:47:49 -0800 (Mon, 10 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up MarkupAccumulator::appendCharactersReplacingEntities
https://bugs.webkit.org/show_bug.cgi?id=128440
Reviewed by Ryosuke Niwa.
Some cleanup:
-Remove the copied code for the loops. Instead, use a template with the loop
parametrized by the characters type.
-Move EntityDescription from the header to the implementation.
-Make the 5 substitution strings compile-time literals. Replacement is not hot enough
to justify the static here.
* editing/MarkupAccumulator.cpp:
(WebCore::appendCharactersReplacingEntitiesInternal):
(WebCore::MarkupAccumulator::appendCharactersReplacingEntities):
* editing/MarkupAccumulator.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingMarkupAccumulatorcpp">trunk/Source/WebCore/editing/MarkupAccumulator.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingMarkupAccumulatorh">trunk/Source/WebCore/editing/MarkupAccumulator.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163853 => 163854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-11 02:46:04 UTC (rev 163853)
+++ trunk/Source/WebCore/ChangeLog 2014-02-11 02:47:49 UTC (rev 163854)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2014-02-10 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><ins>+ Clean up MarkupAccumulator::appendCharactersReplacingEntities
+ https://bugs.webkit.org/show_bug.cgi?id=128440
+
+ Reviewed by Ryosuke Niwa.
+
+ Some cleanup:
+ -Remove the copied code for the loops. Instead, use a template with the loop
+ parametrized by the characters type.
+ -Move EntityDescription from the header to the implementation.
+ -Make the 5 substitution strings compile-time literals. Replacement is not hot enough
+ to justify the static here.
+
+ * editing/MarkupAccumulator.cpp:
+ (WebCore::appendCharactersReplacingEntitiesInternal):
+ (WebCore::MarkupAccumulator::appendCharactersReplacingEntities):
+ * editing/MarkupAccumulator.h:
+
+2014-02-10 Benjamin Poulain <benjamin@webkit.org>
+
</ins><span class="cx"> Add a few pseudo type to the selector compiler through function calls
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=128514
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingMarkupAccumulatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/MarkupAccumulator.cpp (163853 => 163854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/MarkupAccumulator.cpp 2014-02-11 02:46:04 UTC (rev 163853)
+++ trunk/Source/WebCore/editing/MarkupAccumulator.cpp 2014-02-11 02:47:49 UTC (rev 163854)
</span><span class="lines">@@ -46,58 +46,73 @@
</span><span class="cx">
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx">
</span><del>-void MarkupAccumulator::appendCharactersReplacingEntities(StringBuilder& result, const String& source, unsigned offset, unsigned length, EntityMask entityMask)
</del><ins>+struct EntityDescription {
+ const char* characters;
+ unsigned char length;
+ unsigned char mask;
+};
+
+static const EntityDescription entitySubstitutionList[] = {
+ { "", 0 , 0 },
+ { "&amp;", 5 , EntityAmp },
+ { "&lt;", 4, EntityLt },
+ { "&gt;", 4, EntityGt },
+ { "&quot;", 6, EntityQuot },
+ { "&nbsp;", 6, EntityNbsp },
+};
+
+enum EntitySubstitutionIndex {
+ EntitySubstitutionNullIndex = 0,
+ EntitySubstitutionAmpIndex = 1,
+ EntitySubstitutionLtIndex = 2,
+ EntitySubstitutionGtIndex = 3,
+ EntitySubstitutionQuotIndex = 4,
+ EntitySubstitutionNbspIndex = 5,
+};
+
+static const unsigned maximumEscapedentityCharacter = noBreakSpace;
+static const uint8_t entityMap[maximumEscapedentityCharacter + 1] = {
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ EntitySubstitutionQuotIndex, // '"'.
+ 0, 0, 0,
+ EntitySubstitutionAmpIndex, // '&'.
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ EntitySubstitutionLtIndex, // '<'.
+ 0,
+ EntitySubstitutionGtIndex, // '>'.
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ EntitySubstitutionNbspIndex // noBreakSpace.
+};
+
+template<typename CharacterType>
+static inline void appendCharactersReplacingEntitiesInternal(StringBuilder& result, const String& source, unsigned offset, unsigned length, EntityMask entityMask)
</ins><span class="cx"> {
</span><del>- DEFINE_STATIC_LOCAL(const String, ampReference, (ASCIILiteral("&amp;")));
- DEFINE_STATIC_LOCAL(const String, ltReference, (ASCIILiteral("&lt;")));
- DEFINE_STATIC_LOCAL(const String, gtReference, (ASCIILiteral("&gt;")));
- DEFINE_STATIC_LOCAL(const String, quotReference, (ASCIILiteral("&quot;")));
- DEFINE_STATIC_LOCAL(const String, nbspReference, (ASCIILiteral("&nbsp;")));
</del><ins>+ const CharacterType* text = source.characters<CharacterType>() + offset;
</ins><span class="cx">
</span><del>- static const EntityDescription entityMaps[] = {
- { '&', ampReference, EntityAmp },
- { '<', ltReference, EntityLt },
- { '>', gtReference, EntityGt },
- { '"', quotReference, EntityQuot },
- { noBreakSpace, nbspReference, EntityNbsp },
- };
</del><ins>+ size_t positionAfterLastEntity = 0;
+ for (size_t i = 0; i < length; ++i) {
+ CharacterType character = text[i];
+ uint8_t substitution = character < WTF_ARRAY_LENGTH(entityMap) ? entityMap[character] : static_cast<uint8_t>(EntitySubstitutionNullIndex);
+ if (UNLIKELY(substitution != EntitySubstitutionNullIndex) && entitySubstitutionList[substitution].mask & entityMask) {
+ result.append(text + positionAfterLastEntity, i - positionAfterLastEntity);
+ result.append(entitySubstitutionList[substitution].characters, entitySubstitutionList[substitution].length);
+ positionAfterLastEntity = i + 1;
+ }
+ }
+ result.append(text + positionAfterLastEntity, length - positionAfterLastEntity);
+}
</ins><span class="cx">
</span><ins>+void MarkupAccumulator::appendCharactersReplacingEntities(StringBuilder& result, const String& source, unsigned offset, unsigned length, EntityMask entityMask)
+{
</ins><span class="cx"> if (!(offset + length))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> ASSERT(offset + length <= source.length());
</span><span class="cx">
</span><del>- if (source.is8Bit()) {
- const LChar* text = source.characters8() + offset;
-
- size_t positionAfterLastEntity = 0;
- for (size_t i = 0; i < length; ++i) {
- for (size_t entityIndex = 0; entityIndex < WTF_ARRAY_LENGTH(entityMaps); ++entityIndex) {
- if (text[i] == entityMaps[entityIndex].entity && entityMaps[entityIndex].mask & entityMask) {
- result.append(text + positionAfterLastEntity, i - positionAfterLastEntity);
- result.append(entityMaps[entityIndex].reference);
- positionAfterLastEntity = i + 1;
- break;
- }
- }
- }
- result.append(text + positionAfterLastEntity, length - positionAfterLastEntity);
- } else {
- const UChar* text = source.characters16() + offset;
-
- size_t positionAfterLastEntity = 0;
- for (size_t i = 0; i < length; ++i) {
- for (size_t entityIndex = 0; entityIndex < WTF_ARRAY_LENGTH(entityMaps); ++entityIndex) {
- if (text[i] == entityMaps[entityIndex].entity && entityMaps[entityIndex].mask & entityMask) {
- result.append(text + positionAfterLastEntity, i - positionAfterLastEntity);
- result.append(entityMaps[entityIndex].reference);
- positionAfterLastEntity = i + 1;
- break;
- }
- }
- }
- result.append(text + positionAfterLastEntity, length - positionAfterLastEntity);
- }
</del><ins>+ if (source.is8Bit())
+ appendCharactersReplacingEntitiesInternal<LChar>(result, source, offset, length, entityMask);
+ else
+ appendCharactersReplacingEntitiesInternal<UChar>(result, source, offset, length, entityMask);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MarkupAccumulator::MarkupAccumulator(Vector<Node*>* nodes, EAbsoluteURLs resolveUrlsMethod, const Range* range, EFragmentSerialization fragmentSerialization)
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingMarkupAccumulatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/MarkupAccumulator.h (163853 => 163854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/MarkupAccumulator.h 2014-02-11 02:46:04 UTC (rev 163853)
+++ trunk/Source/WebCore/editing/MarkupAccumulator.h 2014-02-11 02:47:49 UTC (rev 163854)
</span><span class="lines">@@ -56,12 +56,6 @@
</span><span class="cx"> EntityMaskInHTMLAttributeValue = EntityMaskInAttributeValue | EntityNbsp,
</span><span class="cx"> };
</span><span class="cx">
</span><del>-struct EntityDescription {
- UChar entity;
- const String& reference;
- EntityMask mask;
-};
-
</del><span class="cx"> // FIXME: Noncopyable?
</span><span class="cx"> class MarkupAccumulator {
</span><span class="cx"> public:
</span></span></pre>
</div>
</div>
</body>
</html>