<!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>[183667] 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/183667">183667</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-04-30 22:01:17 -0700 (Thu, 30 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Compile fix when using content extensions debugging code.
* contentextensions/ContentExtensionCompiler.cpp:
(WebCore::ContentExtensions::compileRuleList):
* contentextensions/ContentExtensionsDebugging.h:
* contentextensions/DFA.cpp:
(WebCore::ContentExtensions::printTransitions):
(WebCore::ContentExtensions::DFA::debugPrintDot):
* contentextensions/DFANode.h:
* contentextensions/NFA.cpp:
(WebCore::ContentExtensions::NFA::memoryUsed):
(WebCore::ContentExtensions::NFA::debugPrintDot):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsContentExtensionCompilercpp">trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsContentExtensionsDebuggingh">trunk/Source/WebCore/contentextensions/ContentExtensionsDebugging.h</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsDFAcpp">trunk/Source/WebCore/contentextensions/DFA.cpp</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsDFANodeh">trunk/Source/WebCore/contentextensions/DFANode.h</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsNFAcpp">trunk/Source/WebCore/contentextensions/NFA.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183666 => 183667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-01 04:24:40 UTC (rev 183666)
+++ trunk/Source/WebCore/ChangeLog 2015-05-01 05:01:17 UTC (rev 183667)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-04-30 Alex Christensen <achristensen@webkit.org>
+
+ Compile fix when using content extensions debugging code.
+
+ * contentextensions/ContentExtensionCompiler.cpp:
+ (WebCore::ContentExtensions::compileRuleList):
+ * contentextensions/ContentExtensionsDebugging.h:
+ * contentextensions/DFA.cpp:
+ (WebCore::ContentExtensions::printTransitions):
+ (WebCore::ContentExtensions::DFA::debugPrintDot):
+ * contentextensions/DFANode.h:
+ * contentextensions/NFA.cpp:
+ (WebCore::ContentExtensions::NFA::memoryUsed):
+ (WebCore::ContentExtensions::NFA::debugPrintDot):
+
</ins><span class="cx"> 2015-04-30 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Fixed the build for <rdar://problem/20758514>
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsContentExtensionCompilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp (183666 => 183667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp 2015-05-01 04:24:40 UTC (rev 183666)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp 2015-05-01 05:01:17 UTC (rev 183667)
</span><span class="lines">@@ -214,7 +214,7 @@
</span><span class="cx">
</span><span class="cx"> #if CONTENT_EXTENSIONS_PERFORMANCE_REPORTING
</span><span class="cx"> double dfaBuildTimeEnd = monotonicallyIncreasingTime();
</span><del>- dataLogF(" Time spent building the DFA %zu: %f\n", i, (dfaBuildTimeEnd - dfaBuildTimeStart));
</del><ins>+ dataLogF(" Time spent building the DFA: %f\n", (dfaBuildTimeEnd - dfaBuildTimeStart));
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if CONTENT_EXTENSIONS_PERFORMANCE_REPORTING
</span><span class="lines">@@ -223,11 +223,11 @@
</span><span class="cx"> dfa.minimize();
</span><span class="cx"> #if CONTENT_EXTENSIONS_PERFORMANCE_REPORTING
</span><span class="cx"> double dfaMinimizationTimeEnd = monotonicallyIncreasingTime();
</span><del>- dataLogF(" Time spent miniminizing the DFA %zu: %f\n", i, (dfaMinimizationTimeEnd - dfaMinimizationTimeStart));
</del><ins>+ dataLogF(" Time spent miniminizing the DFA: %f\n", (dfaMinimizationTimeEnd - dfaMinimizationTimeStart));
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if CONTENT_EXTENSIONS_STATE_MACHINE_DEBUGGING
</span><del>- WTFLogAlways("DFA %zu", i);
</del><ins>+ WTFLogAlways("DFA");
</ins><span class="cx"> dfa.debugPrintDot();
</span><span class="cx"> #endif
</span><span class="cx"> ASSERT_WITH_MESSAGE(!dfa.nodes[dfa.root].hasActions(), "All actions on the DFA root should come from regular expressions that match everything.");
</span><span class="lines">@@ -266,7 +266,6 @@
</span><span class="cx"> double totalNFAToByteCodeBuildTimeEnd = monotonicallyIncreasingTime();
</span><span class="cx"> dataLogF(" Time spent building and compiling the DFAs: %f\n", (totalNFAToByteCodeBuildTimeEnd - totalNFAToByteCodeBuildTimeStart));
</span><span class="cx"> dataLogF(" Bytecode size %zu\n", bytecode.size());
</span><del>- dataLogF(" DFA count %zu\n", nfas.size());
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> LOG_LARGE_STRUCTURES(bytecode, bytecode.capacity() * sizeof(uint8_t));
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsContentExtensionsDebuggingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtensionsDebugging.h (183666 => 183667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtensionsDebugging.h 2015-05-01 04:24:40 UTC (rev 183666)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionsDebugging.h 2015-05-01 05:01:17 UTC (rev 183667)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> #define CONTENT_EXTENSIONS_PAGE_SIZE 16384
</span><span class="cx">
</span><span class="cx"> #if CONTENT_EXTENSIONS_PERFORMANCE_REPORTING
</span><del>-#define LOG_LARGE_STRUCTURES(name, size) if (size > 1000000) { WTFLogAlways("NAME: %s SIZE %d", #name, (int)(size)); };
</del><ins>+#define LOG_LARGE_STRUCTURES(name, size) if (size > 1000000) { dataLogF("NAME: %s SIZE %d", #name, (int)(size)); };
</ins><span class="cx"> #else
</span><span class="cx"> #define LOG_LARGE_STRUCTURES(name, size)
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsDFAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/DFA.cpp (183666 => 183667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/DFA.cpp 2015-05-01 04:24:40 UTC (rev 183666)
+++ trunk/Source/WebCore/contentextensions/DFA.cpp 2015-05-01 05:01:17 UTC (rev 183667)
</span><span class="lines">@@ -137,22 +137,22 @@
</span><span class="cx"> dataLogF("\\\\%d-\\\\%d", rangeStart, rangeEnd);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void printTransitions(const Vector<DFANode>& graph, unsigned sourceNodeId)
</del><ins>+static void printTransitions(const DFA& dfa, unsigned sourceNodeId)
</ins><span class="cx"> {
</span><del>- const DFANode& sourceNode = graph[sourceNodeId];
- const DFANodeTransitions& transitions = sourceNode.transitions;
</del><ins>+ const DFANode& sourceNode = dfa.nodes[sourceNodeId];
+ auto transitions = sourceNode.transitions(dfa);
</ins><span class="cx">
</span><del>- if (transitions.isEmpty() && !sourceNode.hasFallbackTransition)
</del><ins>+ if (transitions.isEmpty() && !sourceNode.hasFallbackTransition())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> HashMap<unsigned, Vector<uint16_t>, DefaultHash<unsigned>::Hash, WTF::UnsignedWithZeroKeyHashTraits<unsigned>> transitionsPerTarget;
</span><span class="cx">
</span><span class="cx"> // First, we build the list of transitions coming to each target node.
</span><span class="cx"> for (const auto& transition : transitions) {
</span><del>- unsigned target = transition.value;
</del><ins>+ unsigned target = transition.second;
</ins><span class="cx"> transitionsPerTarget.add(target, Vector<uint16_t>());
</span><span class="cx">
</span><del>- transitionsPerTarget.find(target)->value.append(transition.key);
</del><ins>+ transitionsPerTarget.find(target)->value.append(transition.first);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Then we go over each one an display the ranges one by one.
</span><span class="lines">@@ -180,8 +180,8 @@
</span><span class="cx"> dataLogF("\"];\n");
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (sourceNode.hasFallbackTransition)
- dataLogF(" %d -> %d [label=\"[fallback]\"];\n", sourceNodeId, sourceNode.fallbackTransition);
</del><ins>+ if (sourceNode.hasFallbackTransition())
+ dataLogF(" %d -> %d [label=\"[fallback]\"];\n", sourceNodeId, sourceNode.fallbackTransitionDestination(dfa));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DFA::debugPrintDot() const
</span><span class="lines">@@ -190,12 +190,12 @@
</span><span class="cx"> dataLogF(" rankdir=LR;\n");
</span><span class="cx"> dataLogF(" node [shape=circle];\n");
</span><span class="cx"> dataLogF(" {\n");
</span><del>- for (unsigned i = 0; i < m_nodes.size(); ++i) {
- if (m_nodes[i].isKilled)
</del><ins>+ for (unsigned i = 0; i < nodes.size(); ++i) {
+ if (nodes[i].isKilled())
</ins><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> dataLogF(" %d [label=<Node %d", i, i);
</span><del>- const Vector<uint64_t>& actions = m_nodes[i].actions;
</del><ins>+ const Vector<uint64_t>& actions = nodes[i].actions(*this);
</ins><span class="cx"> if (!actions.isEmpty()) {
</span><span class="cx"> dataLogF("<BR/>Actions: ");
</span><span class="cx"> for (unsigned actionIndex = 0; actionIndex < actions.size(); ++actionIndex) {
</span><span class="lines">@@ -205,7 +205,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Vector<unsigned> correspondingNFANodes = m_nodes[i].correspondingNFANodes;
</del><ins>+ Vector<unsigned> correspondingNFANodes = nodes[i].correspondingNFANodes;
</ins><span class="cx"> ASSERT(!correspondingNFANodes.isEmpty());
</span><span class="cx"> dataLogF("<BR/>NFA Nodes: ");
</span><span class="cx"> for (unsigned correspondingDFANodeIndex = 0; correspondingDFANodeIndex < correspondingNFANodes.size(); ++correspondingDFANodeIndex) {
</span><span class="lines">@@ -224,8 +224,8 @@
</span><span class="cx"> dataLogF(" }\n");
</span><span class="cx">
</span><span class="cx"> dataLogF(" {\n");
</span><del>- for (unsigned i = 0; i < m_nodes.size(); ++i)
- printTransitions(m_nodes, i);
</del><ins>+ for (unsigned i = 0; i < nodes.size(); ++i)
+ printTransitions(*this, i);
</ins><span class="cx">
</span><span class="cx"> dataLogF(" }\n");
</span><span class="cx"> dataLogF("}\n");
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsDFANodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/DFANode.h (183666 => 183667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/DFANode.h 2015-05-01 04:24:40 UTC (rev 183666)
+++ trunk/Source/WebCore/contentextensions/DFANode.h 2015-05-01 05:01:17 UTC (rev 183667)
</span><span class="lines">@@ -102,7 +102,11 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: Pack this down to 12.
</span><span class="cx"> // It's probably already 12 on ARMv7.
</span><ins>+#if CONTENT_EXTENSIONS_STATE_MACHINE_DEBUGGING
+COMPILE_ASSERT(sizeof(DFANode) <= 16 + sizeof(Vector<unsigned>), Keep the DFANodes small);
+#else
</ins><span class="cx"> COMPILE_ASSERT(sizeof(DFANode) <= 16, Keep the DFANodes small);
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsNFAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/NFA.cpp (183666 => 183667)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/NFA.cpp 2015-05-01 04:24:40 UTC (rev 183666)
+++ trunk/Source/WebCore/contentextensions/NFA.cpp 2015-05-01 05:01:17 UTC (rev 183667)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx">
</span><span class="cx"> size_t NFA::memoryUsed() const
</span><span class="cx"> {
</span><del>- size_t size = 0;
</del><ins>+ size_t size = sizeof(NFA);
</ins><span class="cx"> for (const NFANode& node : m_nodes) {
</span><span class="cx"> for (const auto& transition : node.transitions)
</span><span class="cx"> size += transition.value.capacity() * sizeof(unsigned);
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx"> for (unsigned i = 0; i < m_nodes.size(); ++i) {
</span><span class="cx"> dataLogF(" %d [label=<Node %d", i, i);
</span><span class="cx">
</span><del>- const Vector<uint64_t>& finalRules = m_nodes[i].finalRuleIds;
</del><ins>+ const ActionList& finalRules = m_nodes[i].finalRuleIds;
</ins><span class="cx"> if (!finalRules.isEmpty()) {
</span><span class="cx"> dataLogF("<BR/>(Final: ");
</span><span class="cx"> for (unsigned ruleIndex = 0; ruleIndex < finalRules.size(); ++ruleIndex) {
</span></span></pre>
</div>
</div>
</body>
</html>