Title: [234935] branches/safari-606.1.36.1-branch/Source/WebCore
- Revision
- 234935
- Author
- [email protected]
- Date
- 2018-08-16 10:29:48 -0700 (Thu, 16 Aug 2018)
Log Message
Cherry-pick r234890. rdar://problem/43385599
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.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234890 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-606.1.36.1-branch/Source/WebCore/ChangeLog (234934 => 234935)
--- branches/safari-606.1.36.1-branch/Source/WebCore/ChangeLog 2018-08-16 17:29:45 UTC (rev 234934)
+++ branches/safari-606.1.36.1-branch/Source/WebCore/ChangeLog 2018-08-16 17:29:48 UTC (rev 234935)
@@ -1,5 +1,31 @@
2018-08-16 Kocsen Chung <[email protected]>
+ Cherry-pick r234890. rdar://problem/43385599
+
+ 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.
+
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234890 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-08-15 Alex Christensen <[email protected]>
+
+ 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-16 Kocsen Chung <[email protected]>
+
Cherry-pick r234873. rdar://problem/43385599
isValidCSSSelector is unsafe to be called from a non-main thread
Modified: branches/safari-606.1.36.1-branch/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp (234934 => 234935)
--- branches/safari-606.1.36.1-branch/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp 2018-08-16 17:29:45 UTC (rev 234934)
+++ branches/safari-606.1.36.1-branch/Source/WebCore/contentextensions/ContentExtensionCompiler.cpp 2018-08-16 17:29:48 UTC (rev 234935)
@@ -285,12 +285,6 @@
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;
for (const auto& rule : parsedRuleList) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
