<!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>[185447] trunk</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/185447">185447</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-10 21:16:24 -0700 (Wed, 10 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/185442">r185442</a>.
https://bugs.webkit.org/show_bug.cgi?id=145871
seems to have broken WTF.StringOperators test (Requested by
alexchristensen on #webkit).
Reverted changeset:
"[Content Extensions] Limit number of rules."
https://bugs.webkit.org/show_bug.cgi?id=145663
http://trac.webkit.org/changeset/185442</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsContentExtensionErrorcpp">trunk/Source/WebCore/contentextensions/ContentExtensionError.cpp</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsContentExtensionErrorh">trunk/Source/WebCore/contentextensions/ContentExtensionError.h</a></li>
<li><a href="#trunkSourceWebCorecontentextensionsContentExtensionParsercpp">trunk/Source/WebCore/contentextensions/ContentExtensionParser.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebCoreContentExtensionscpp">trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185446 => 185447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-11 02:57:08 UTC (rev 185446)
+++ trunk/Source/WebCore/ChangeLog 2015-06-11 04:16:24 UTC (rev 185447)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-06-10 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r185442.
+ https://bugs.webkit.org/show_bug.cgi?id=145871
+
+ seems to have broken WTF.StringOperators test (Requested by
+ alexchristensen on #webkit).
+
+ Reverted changeset:
+
+ "[Content Extensions] Limit number of rules."
+ https://bugs.webkit.org/show_bug.cgi?id=145663
+ http://trac.webkit.org/changeset/185442
+
</ins><span class="cx"> 2015-06-10 Jon Lee <jonlee@apple.com>
</span><span class="cx">
</span><span class="cx"> Update presentation mode JS API to using 'picture-in-picture'
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsContentExtensionErrorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtensionError.cpp (185446 => 185447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtensionError.cpp 2015-06-11 02:57:08 UTC (rev 185446)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionError.cpp 2015-06-11 04:16:24 UTC (rev 185447)
</span><span class="lines">@@ -77,8 +77,6 @@
</span><span class="cx"> return "Invalid or unsupported regular expression.";
</span><span class="cx"> case ContentExtensionError::JSONInvalidDomainList:
</span><span class="cx"> return "Invalid domain list.";
</span><del>- case ContentExtensionError::JSONTooManyRules:
- return "Too many rules in JSON array.";
</del><span class="cx"> case ContentExtensionError::JSONDomainNotLowerCaseASCII:
</span><span class="cx"> return "Domains must be lower case ASCII. Use punycode to encode non-ASCII characters.";
</span><span class="cx"> case ContentExtensionError::JSONUnlessAndIfDomain:
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsContentExtensionErrorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtensionError.h (185446 => 185447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtensionError.h 2015-06-11 02:57:08 UTC (rev 185446)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionError.h 2015-06-11 04:16:24 UTC (rev 185447)
</span><span class="lines">@@ -52,7 +52,6 @@
</span><span class="cx"> JSONInvalidDomainList,
</span><span class="cx"> JSONDomainNotLowerCaseASCII,
</span><span class="cx"> JSONUnlessAndIfDomain,
</span><del>- JSONTooManyRules,
</del><span class="cx">
</span><span class="cx"> JSONInvalidAction,
</span><span class="cx"> JSONInvalidActionType,
</span></span></pre></div>
<a id="trunkSourceWebCorecontentextensionsContentExtensionParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/contentextensions/ContentExtensionParser.cpp (185446 => 185447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/contentextensions/ContentExtensionParser.cpp 2015-06-11 02:57:08 UTC (rev 185446)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionParser.cpp 2015-06-11 04:16:24 UTC (rev 185447)
</span><span class="lines">@@ -239,9 +239,6 @@
</span><span class="cx"> Vector<ContentExtensionRule> localRuleList;
</span><span class="cx">
</span><span class="cx"> unsigned length = topLevelArray->length();
</span><del>- const unsigned maxRuleCount = 50000;
- if (length > maxRuleCount)
- return ContentExtensionError::JSONTooManyRules;
</del><span class="cx"> for (unsigned i = 0; i < length; ++i) {
</span><span class="cx"> JSValue value = topLevelArray->getIndex(&exec, i);
</span><span class="cx"> if (exec.hadException() || !value)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (185446 => 185447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-06-11 02:57:08 UTC (rev 185446)
+++ trunk/Tools/ChangeLog 2015-06-11 04:16:24 UTC (rev 185447)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-06-10 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r185442.
+ https://bugs.webkit.org/show_bug.cgi?id=145871
+
+ seems to have broken WTF.StringOperators test (Requested by
+ alexchristensen on #webkit).
+
+ Reverted changeset:
+
+ "[Content Extensions] Limit number of rules."
+ https://bugs.webkit.org/show_bug.cgi?id=145663
+ http://trac.webkit.org/changeset/185442
+
</ins><span class="cx"> 2015-06-10 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Content Extensions] Make max NFA size and max rule count user defaults.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreContentExtensionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp (185446 => 185447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp 2015-06-11 02:57:08 UTC (rev 185446)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp 2015-06-11 04:16:24 UTC (rev 185447)
</span><span class="lines">@@ -812,15 +812,6 @@
</span><span class="cx"> checkCompilerError("[{\"action\":{\"type\":\"block\"},\"trigger\":{\"url-filter\":\"webkit.org\",\"resource-type\":[5]}}]",
</span><span class="cx"> ContentExtensions::ContentExtensionError::JSONInvalidStringInTriggerFlagsArray);
</span><span class="cx">
</span><del>- StringBuilder rules;
- rules.append("[");
- for (unsigned i = 1; i < 50000; ++i)
- rules.append("{\"action\":{\"type\":\"block\"},\"trigger\":{\"url-filter\":\"a\"}},");
- String rules50000 = rules.toString() + "{\"action\":{\"type\":\"block\"},\"trigger\":{\"url-filter\":\"a\"}}]";
- String rules50001 = rules.toString() + "{\"action\":{\"type\":\"block\"},\"trigger\":{\"url-filter\":\"a\"}},{\"action\":{\"type\":\"block\"},\"trigger\":{\"url-filter\":\"a\"}}]";
- checkCompilerError(rules50000.utf8().data(), { });
- checkCompilerError(rules50001.utf8().data(), ContentExtensions::ContentExtensionError::JSONTooManyRules);
-
</del><span class="cx"> checkCompilerError("[{\"action\":{\"type\":\"block\"},\"trigger\":{\"url-filter\":\"webkit.org\",\"if-domain\":{}}}]", ContentExtensions::ContentExtensionError::JSONInvalidDomainList);
</span><span class="cx"> checkCompilerError("[{\"action\":{\"type\":\"block\"},\"trigger\":{\"url-filter\":\"webkit.org\",\"if-domain\":[5]}}]", ContentExtensions::ContentExtensionError::JSONInvalidDomainList);
</span><span class="cx"> checkCompilerError("[{\"action\":{\"type\":\"block\"},\"trigger\":{\"url-filter\":\"webkit.org\",\"if-domain\":[\"a\"]}}]", { });
</span></span></pre>
</div>
</div>
</body>
</html>