Diff
Modified: trunk/Source/WebCore/ChangeLog (185446 => 185447)
--- 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)
@@ -1,3 +1,17 @@
+2015-06-10 Commit Queue <[email protected]>
+
+ 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
+
2015-06-10 Jon Lee <[email protected]>
Update presentation mode JS API to using 'picture-in-picture'
Modified: trunk/Source/WebCore/contentextensions/ContentExtensionError.cpp (185446 => 185447)
--- 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)
@@ -77,8 +77,6 @@
return "Invalid or unsupported regular _expression_.";
case ContentExtensionError::JSONInvalidDomainList:
return "Invalid domain list.";
- case ContentExtensionError::JSONTooManyRules:
- return "Too many rules in JSON array.";
case ContentExtensionError::JSONDomainNotLowerCaseASCII:
return "Domains must be lower case ASCII. Use punycode to encode non-ASCII characters.";
case ContentExtensionError::JSONUnlessAndIfDomain:
Modified: trunk/Source/WebCore/contentextensions/ContentExtensionError.h (185446 => 185447)
--- 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)
@@ -52,7 +52,6 @@
JSONInvalidDomainList,
JSONDomainNotLowerCaseASCII,
JSONUnlessAndIfDomain,
- JSONTooManyRules,
JSONInvalidAction,
JSONInvalidActionType,
Modified: trunk/Source/WebCore/contentextensions/ContentExtensionParser.cpp (185446 => 185447)
--- 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)
@@ -239,9 +239,6 @@
Vector<ContentExtensionRule> localRuleList;
unsigned length = topLevelArray->length();
- const unsigned maxRuleCount = 50000;
- if (length > maxRuleCount)
- return ContentExtensionError::JSONTooManyRules;
for (unsigned i = 0; i < length; ++i) {
JSValue value = topLevelArray->getIndex(&exec, i);
if (exec.hadException() || !value)
Modified: trunk/Tools/ChangeLog (185446 => 185447)
--- trunk/Tools/ChangeLog 2015-06-11 02:57:08 UTC (rev 185446)
+++ trunk/Tools/ChangeLog 2015-06-11 04:16:24 UTC (rev 185447)
@@ -1,3 +1,17 @@
+2015-06-10 Commit Queue <[email protected]>
+
+ 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
+
2015-06-10 Alex Christensen <[email protected]>
[Content Extensions] Make max NFA size and max rule count user defaults.
Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp (185446 => 185447)
--- 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)
@@ -812,15 +812,6 @@
checkCompilerError("[{\"action\":{\"type\":\"block\"},\"trigger\":{\"url-filter\":\"webkit.org\",\"resource-type\":[5]}}]",
ContentExtensions::ContentExtensionError::JSONInvalidStringInTriggerFlagsArray);
- 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);
-
checkCompilerError("[{\"action\":{\"type\":\"block\"},\"trigger\":{\"url-filter\":\"webkit.org\",\"if-domain\":{}}}]", ContentExtensions::ContentExtensionError::JSONInvalidDomainList);
checkCompilerError("[{\"action\":{\"type\":\"block\"},\"trigger\":{\"url-filter\":\"webkit.org\",\"if-domain\":[5]}}]", ContentExtensions::ContentExtensionError::JSONInvalidDomainList);
checkCompilerError("[{\"action\":{\"type\":\"block\"},\"trigger\":{\"url-filter\":\"webkit.org\",\"if-domain\":[\"a\"]}}]", { });
