<!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>[186715] 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/186715">186715</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2015-07-11 13:35:45 -0700 (Sat, 11 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix CONTENT_EXTENSIONS_STATE_MACHINE_DEBUGGING
https://bugs.webkit.org/show_bug.cgi?id=146879
Reviewed by Andreas Kling.
Some of my recent changes broke CONTENT_EXTENSIONS_STATE_MACHINE_DEBUGGING :(
* contentextensions/CombinedURLFilters.cpp:
(WebCore::ContentExtensions::prefixTreeVertexToString):
(WebCore::ContentExtensions::recursivePrint):
(WebCore::ContentExtensions::CombinedURLFilters::print):
* contentextensions/ContentExtensionsDebugging.h:
* contentextensions/DFA.cpp:
(WebCore::ContentExtensions::DFA::debugPrintDot):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsCombinedURLFilterscpp">trunk/Source/WebCore/contentextensions/CombinedURLFilters.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186714 => 186715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-11 20:15:39 UTC (rev 186714)
+++ trunk/Source/WebCore/ChangeLog 2015-07-11 20:35:45 UTC (rev 186715)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-07-11 Benjamin Poulain <benjamin@webkit.org>
+
+ Fix CONTENT_EXTENSIONS_STATE_MACHINE_DEBUGGING
+ https://bugs.webkit.org/show_bug.cgi?id=146879
+
+ Reviewed by Andreas Kling.
+
+ Some of my recent changes broke CONTENT_EXTENSIONS_STATE_MACHINE_DEBUGGING :(
+
+ * contentextensions/CombinedURLFilters.cpp:
+ (WebCore::ContentExtensions::prefixTreeVertexToString):
+ (WebCore::ContentExtensions::recursivePrint):
+ (WebCore::ContentExtensions::CombinedURLFilters::print):
+ * contentextensions/ContentExtensionsDebugging.h:
+ * contentextensions/DFA.cpp:
+ (WebCore::ContentExtensions::DFA::debugPrintDot):
+
</ins><span class="cx"> 2015-07-10 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS WK2] Scrolling issues on horizontally scrollable RTL pages
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsCombinedURLFilterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/CombinedURLFilters.cpp (186714 => 186715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/CombinedURLFilters.cpp 2015-07-11 20:15:39 UTC (rev 186714)
+++ trunk/Source/WebCore/contentextensions/CombinedURLFilters.cpp 2015-07-11 20:35:45 UTC (rev 186715)
</span><span class="lines">@@ -78,16 +78,16 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if CONTENT_EXTENSIONS_STATE_MACHINE_DEBUGGING
</span><del>-static String prefixTreeVertexToString(const PrefixTreeVertex& vertex, unsigned depth)
</del><ins>+static String prefixTreeVertexToString(const PrefixTreeVertex& vertex, const HashMap<const PrefixTreeVertex*, ActionList>& actions, unsigned depth)
</ins><span class="cx"> {
</span><span class="cx"> StringBuilder builder;
</span><span class="cx"> while (depth--)
</span><span class="cx"> builder.append(" ");
</span><span class="cx"> builder.append("vertex actions: ");
</span><span class="cx">
</span><del>- auto actionsSlot = m_actions.find(&vertex);
- if (actionsSlot != m_actions.end()) {
- for (auto action : *actionsSlot->value) {
</del><ins>+ auto actionsSlot = actions.find(&vertex);
+ if (actionsSlot != actions.end()) {
+ for (uint64_t action : actionsSlot->value) {
</ins><span class="cx"> builder.appendNumber(action);
</span><span class="cx"> builder.append(',');
</span><span class="cx"> }
</span><span class="lines">@@ -96,9 +96,9 @@
</span><span class="cx"> return builder.toString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void recursivePrint(const PrefixTreeVertex& vertex, unsigned depth)
</del><ins>+static void recursivePrint(const PrefixTreeVertex& vertex, const HashMap<const PrefixTreeVertex*, ActionList>& actions, unsigned depth)
</ins><span class="cx"> {
</span><del>- dataLogF("%s", prefixTreeVertexToString(vertex, depth).utf8().data());
</del><ins>+ dataLogF("%s", prefixTreeVertexToString(vertex, actions, depth).utf8().data());
</ins><span class="cx"> for (const auto& edge : vertex.edges) {
</span><span class="cx"> StringBuilder builder;
</span><span class="cx"> for (unsigned i = 0; i < depth * 2; ++i)
</span><span class="lines">@@ -108,13 +108,13 @@
</span><span class="cx"> builder.append('\n');
</span><span class="cx"> dataLogF("%s", builder.toString().utf8().data());
</span><span class="cx"> ASSERT(edge.child);
</span><del>- recursivePrint(*edge.child.get(), depth + 1);
</del><ins>+ recursivePrint(*edge.child.get(), actions, depth + 1);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CombinedURLFilters::print() const
</span><span class="cx"> {
</span><del>- recursivePrint(*m_prefixTreeRoot.get(), 0);
</del><ins>+ recursivePrint(*m_prefixTreeRoot.get(), m_actions, 0);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsContentExtensionsDebuggingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtensionsDebugging.h (186714 => 186715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtensionsDebugging.h 2015-07-11 20:15:39 UTC (rev 186714)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionsDebugging.h 2015-07-11 20:35:45 UTC (rev 186715)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> #define CONTENT_EXTENSIONS_PAGE_SIZE 16384
</span><span class="cx">
</span><span class="cx"> #if CONTENT_EXTENSIONS_STATE_MACHINE_DEBUGGING
</span><del>-typedef CrashOnOverflow ContentExtensionsOverflowHandler;
</del><ins>+typedef WTF::CrashOnOverflow ContentExtensionsOverflowHandler;
</ins><span class="cx"> #else
</span><span class="cx"> typedef UnsafeVectorOverflow ContentExtensionsOverflowHandler;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsDFAcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/DFA.cpp (186714 => 186715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/DFA.cpp 2015-07-11 20:15:39 UTC (rev 186714)
+++ trunk/Source/WebCore/contentextensions/DFA.cpp 2015-07-11 20:35:45 UTC (rev 186715)
</span><span class="lines">@@ -147,6 +147,7 @@
</span><span class="cx"> dataLogF("%llu", actions[actionIndex]);
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ dataLogF("]");
</ins><span class="cx">
</span><span class="cx"> if (!actions.isEmpty())
</span><span class="cx"> dataLogF(" [shape=doublecircle]");
</span></span></pre>
</div>
</div>
</body>
</html>