<!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>[178743] 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/178743">178743</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-20 12:46:16 -0800 (Tue, 20 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a mechanism to ignore previous content extension rules
https://bugs.webkit.org/show_bug.cgi?id=140663
Reviewed by Andreas Kling.
* contentextensions/ContentExtensionRule.h:
* contentextensions/ContentExtensionsBackend.cpp:
(WebCore::ContentExtensions::ContentExtensionsBackend::shouldBlockURL):
* contentextensions/ContentExtensionsManager.cpp:
(WebCore::ContentExtensions::ExtensionsManager::loadAction):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsContentExtensionRuleh">trunk/Source/WebCore/contentextensions/ContentExtensionRule.h</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsContentExtensionsBackendcpp">trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsContentExtensionsManagercpp">trunk/Source/WebCore/contentextensions/ContentExtensionsManager.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178742 => 178743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-20 20:46:16 UTC (rev 178742)
+++ trunk/Source/WebCore/ChangeLog 2015-01-20 20:46:16 UTC (rev 178743)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2015-01-20 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><ins>+ Add a mechanism to ignore previous content extension rules
+ https://bugs.webkit.org/show_bug.cgi?id=140663
+
+ Reviewed by Andreas Kling.
+
+ * contentextensions/ContentExtensionRule.h:
+ * contentextensions/ContentExtensionsBackend.cpp:
+ (WebCore::ContentExtensions::ContentExtensionsBackend::shouldBlockURL):
+ * contentextensions/ContentExtensionsManager.cpp:
+ (WebCore::ContentExtensions::ExtensionsManager::loadAction):
+
+2015-01-20 Benjamin Poulain <benjamin@webkit.org>
+
</ins><span class="cx"> Resolve the epsilon transitions for each state upfront instead of dynamically
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=140654
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsContentExtensionRuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtensionRule.h (178742 => 178743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtensionRule.h 2015-01-20 20:46:16 UTC (rev 178742)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionRule.h 2015-01-20 20:46:16 UTC (rev 178743)
</span><span class="lines">@@ -35,7 +35,8 @@
</span><span class="cx"> namespace ContentExtensions {
</span><span class="cx">
</span><span class="cx"> enum class ExtensionActionType {
</span><del>- BlockLoad
</del><ins>+ BlockLoad,
+ IgnorePreviousRules
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // A ContentExtensionRule is the smallest unit in a ContentExtension.
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsContentExtensionsBackendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp (178742 => 178743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp 2015-01-20 20:46:16 UTC (rev 178742)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp 2015-01-20 20:46:16 UTC (rev 178743)
</span><span class="lines">@@ -120,15 +120,25 @@
</span><span class="cx"> CompiledContentExtension& compiledContentExtension = ruleListSlot.value;
</span><span class="cx"> unsigned state = compiledContentExtension.dfa.root();
</span><span class="cx">
</span><ins>+ HashSet<uint64_t, DefaultHash<uint64_t>::Hash, WTF::UnsignedWithZeroKeyHashTraits<uint64_t>> triggeredActions;
+
</ins><span class="cx"> for (unsigned i = 0; i < urlString.length(); ++i) {
</span><span class="cx"> char character = static_cast<char>(urlString[i]);
</span><span class="cx"> bool ok;
</span><span class="cx"> state = compiledContentExtension.dfa.nextState(state, character, ok);
</span><span class="cx"> if (!ok)
</span><del>- return false;
</del><ins>+ break;
</ins><span class="cx">
</span><del>- // FIXME: accumulate the actions.
- if (!compiledContentExtension.dfa.actions(state).isEmpty())
</del><ins>+ const Vector<uint64_t>& actions = compiledContentExtension.dfa.actions(state);
+ if (!actions.isEmpty())
+ triggeredActions.add(actions.begin(), actions.end());
+ }
+ if (!triggeredActions.isEmpty()) {
+ Vector<uint64_t> sortedActions;
+ copyToVector(triggeredActions, sortedActions);
+ std::sort(sortedActions.begin(), sortedActions.end());
+ uint64_t lastAction = sortedActions.last();
+ if (compiledContentExtension.ruleList[lastAction].action().type == ExtensionActionType::BlockLoad)
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsContentExtensionsManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtensionsManager.cpp (178742 => 178743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtensionsManager.cpp 2015-01-20 20:46:16 UTC (rev 178742)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionsManager.cpp 2015-01-20 20:46:16 UTC (rev 178743)
</span><span class="lines">@@ -91,13 +91,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String actionType = typeObject.toWTFString(&exec);
</span><del>- if (actionType != "block") {
- WTFLogAlways("Unrocognized action: \"%s\"", actionType.utf8().data());
</del><ins>+
+ if (actionType == "block")
+ action.type = ExtensionActionType::BlockLoad;
+ else if (actionType == "ignore-previous-rules")
+ action.type = ExtensionActionType::IgnorePreviousRules;
+ else if (actionType != "block" && actionType != "") {
+ WTFLogAlways("Unrecognized action: \"%s\"", actionType.utf8().data());
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- action.type = ExtensionActionType::BlockLoad;
-
</del><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>