Title: [182272] trunk/Source/WebCore
- Revision
- 182272
- Author
- [email protected]
- Date
- 2015-04-02 09:43:04 -0700 (Thu, 02 Apr 2015)
Log Message
Unreviewed, rolling out r182265.
https://bugs.webkit.org/show_bug.cgi?id=143338
Caused an assertion on
http/tests/contentextensions/whitelist.html (Requested by ap
on #webkit).
Reverted changeset:
"[Content Extensions] Only add unique universal action
locations."
https://bugs.webkit.org/show_bug.cgi?id=143325
http://trac.webkit.org/changeset/182265
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (182271 => 182272)
--- trunk/Source/WebCore/ChangeLog 2015-04-02 15:45:58 UTC (rev 182271)
+++ trunk/Source/WebCore/ChangeLog 2015-04-02 16:43:04 UTC (rev 182272)
@@ -1,3 +1,19 @@
+2015-04-02 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r182265.
+ https://bugs.webkit.org/show_bug.cgi?id=143338
+
+ Caused an assertion on
+ http/tests/contentextensions/whitelist.html (Requested by ap
+ on #webkit).
+
+ Reverted changeset:
+
+ "[Content Extensions] Only add unique universal action
+ locations."
+ https://bugs.webkit.org/show_bug.cgi?id=143325
+ http://trac.webkit.org/changeset/182265
+
2015-04-01 Antti Koivisto <[email protected]>
Use std::chrono types to represent time in response and cache classes
Modified: trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp (182271 => 182272)
--- trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp 2015-04-02 15:45:58 UTC (rev 182271)
+++ trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp 2015-04-02 16:43:04 UTC (rev 182272)
@@ -133,7 +133,7 @@
Vector<SerializedActionByte> actions;
Vector<unsigned> actionLocations = serializeActions(parsedRuleList, actions);
- HashSet<uint64_t> universalActionLocations;
+ Vector<uint64_t> universalActionLocations;
CombinedURLFilters combinedURLFilters;
URLFilterParser urlFilterParser(combinedURLFilters);
@@ -148,9 +148,10 @@
URLFilterParser::ParseStatus status = urlFilterParser.addPattern(trigger.urlFilter, trigger.urlFilterIsCaseSensitive, actionLocationAndFlags);
if (status == URLFilterParser::MatchesEverything) {
+
if (ignorePreviousRulesSeen)
return ContentExtensionError::RegexMatchesEverythingAfterIgnorePreviousRules;
- universalActionLocations.add(actionLocationAndFlags);
+ universalActionLocations.append(actionLocationAndFlags);
}
if (status != URLFilterParser::Ok && status != URLFilterParser::MatchesEverything) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
