Changeset 234890 in webkit

Timestamp:

Aug 15, 2018 10:48:07 AM (6 years ago)

Author:

achristensen@apple.com

Message:

Remove failing assertion introduced in r234873
​https://bugs.webkit.org/show_bug.cgi?id=188581

• contentextensions/ContentExtensionCompiler.cpp:

(WebCore::ContentExtensions::compileRuleList):
The assertion is correct but failing because VectorTraits<String> is incorrect.
I'll re-add it and fix VectorTraits<String> in a separate patch.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• contentextensions/ContentExtensionCompiler.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-08-15  Alex Christensen  <achristensen@webkit.org>
+
+        Remove failing assertion introduced in r234873
+        https://bugs.webkit.org/show_bug.cgi?id=188581
+
+        * contentextensions/ContentExtensionCompiler.cpp:
+        (WebCore::ContentExtensions::compileRuleList):
+        The assertion is correct but failing because VectorTraits<String> is incorrect.
+        I'll re-add it and fix VectorTraits<String> in a separate patch.
+
 2018-08-15  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp

@@ -286 +286 @@
 std::error_code compileRuleList(ContentExtensionCompilationClient& client, String&& ruleJSON, Vector<ContentExtensionRule>&& parsedRuleList)
 {
-#if !ASSERT_DISABLED
-    callOnMainThread([ruleJSON = ruleJSON.isolatedCopy(), parsedRuleList = parsedRuleList.isolatedCopy()] {
-        ASSERT(parseRuleList(ruleJSON) == parsedRuleList);
-    });
-#endif
-
     bool domainConditionSeen = false;
     bool topURLConditionSeen = false;