Safari Content Blocker doesn't support :has() selector

b-weinstein · b-weinstein · commit 355ce06ba535 · 2023-01-18T23:46:10.000-08:00
https://bugs.webkit.org/show_bug.cgi?id=250609 rdar://103976010 Reviewed by Antti Koivisto and Alex Christensen. When creating the CSSParsers for content blocker parsing and compilation, make sure to opt into hasPseudoClassEnabled so selectors like :has work. The places this was needed were: - ContentExtensionParser (for parsing the rules) - ContentExtension (for the global display none rules) - ContentExtensionStyleSheet (for the other display none rules) Also update the contentextensions css-display-none test to test this functionality. * Source/WebCore/contentextensions/ContentExtension.cpp: (WebCore::ContentExtensions::ContentExtension::compileGlobalDisplayNoneStyleSheet): * Source/WebCore/contentextensions/ContentExtensionParser.cpp: (WebCore::ContentExtensions::isValidCSSSelector): Canonical link: https://commits.webkit.org/259068@main
diff --git a/LayoutTests/http/tests/contentextensions/css-display-none.html b/LayoutTests/http/tests/contentextensions/css-display-none.html
@@ -6,5 +6,7 @@
 <p class="hidden_global2">This text should not be visible once the global css selector is applied.</p>
 <p class="hidden">This text should not be visible once the particular css selector is applied.</p>
 <p class="hidden_Ž">This text should not be visible once the particular css selector with non-ascii characters is applied.</p>
+<div><p class="hidden_hasTestMatchingEverything">This text should not be visible once the global css selector with :has is applied.</p></div>
+<div><p class="hidden_hasTestNotMatchingEverything">This text should not be visible once the particular css selector with :has is applied.</p></div>
 <p class="not_hidden">This text should be visible.</p>
 </body>
diff --git a/LayoutTests/http/tests/contentextensions/css-display-none.html.json b/LayoutTests/http/tests/contentextensions/css-display-none.html.json
@@ -35,6 +35,24 @@
             "url-filter": ".*"
         }
     },
+    {
+        "action": {
+            "type": "css-display-none",
+            "selector": "div:has(.hidden_hasTestNotMatchingEverything)"
+        },
+        "trigger": {
+            "url-filter": ".*css-display-none.html"
+        }
+    },
+    {
+        "action": {
+            "type": "css-display-none",
+            "selector": "div:has(.hidden_hasTestMatchingEverything)"
+        },
+        "trigger": {
+            "url-filter": ".*"
+        }
+    },
     {
         "action": {
             "type": "ignore-previous-rules"
diff --git a/Source/WebCore/contentextensions/ContentExtension.cpp b/Source/WebCore/contentextensions/ContentExtension.cpp
@@ -26,7 +26,9 @@
 #include "config.h"
 #include "ContentExtension.h"
 
+#include "CSSParserContext.h"
 #include "CompiledContentExtension.h"
+#include "ContentExtensionParser.h"
 #include "ContentExtensionsBackend.h"
 #include "StyleSheetContents.h"
 #include <wtf/text/StringBuilder.h>
@@ -98,7 +100,7 @@ void ContentExtension::compileGlobalDisplayNoneStyleSheet()
     css.append(ContentExtensionsBackend::displayNoneCSSRule());
     css.append('}');
 
-    m_globalDisplayNoneStyleSheet = StyleSheetContents::create();
+    m_globalDisplayNoneStyleSheet = StyleSheetContents::create(contentExtensionCSSParserContext());
     m_globalDisplayNoneStyleSheet->setIsUserStyleSheet(true);
     if (!m_globalDisplayNoneStyleSheet->parseString(css.toString()))
         m_globalDisplayNoneStyleSheet = nullptr;
diff --git a/Source/WebCore/contentextensions/ContentExtensionParser.cpp b/Source/WebCore/contentextensions/ContentExtensionParser.cpp
@@ -206,11 +206,17 @@ bool isValidCSSSelector(const String& selector)
 {
     ASSERT(isMainThread());
     ProcessWarming::initializeNames();
-    CSSParserContext context(HTMLQuirksMode);
-    CSSParser parser(context);
+    CSSParser parser(contentExtensionCSSParserContext());
     return !!parser.parseSelector(selector);
 }
 
+WebCore::CSSParserContext contentExtensionCSSParserContext()
+{
+    WebCore::CSSParserContext context(HTMLQuirksMode);
+    context.hasPseudoClassEnabled = true;
+    return context;
+}
+
 static std::optional<Expected<Action, std::error_code>> loadAction(const JSON::Object& ruleObject, const String& urlFilter)
 {
     auto actionObject = ruleObject.getObject("action"_s);
diff --git a/Source/WebCore/contentextensions/ContentExtensionParser.h b/Source/WebCore/contentextensions/ContentExtensionParser.h
@@ -34,13 +34,17 @@
 
 namespace WebCore {
 
+struct CSSParserContext;
+
 namespace ContentExtensions {
 
 class ContentExtensionRule;
 
 WEBCORE_EXPORT Expected<Vector<ContentExtensionRule>, std::error_code> parseRuleList(const String&);
 WEBCORE_EXPORT bool isValidCSSSelector(const String&);
 
+CSSParserContext contentExtensionCSSParserContext();
+
 } // namespace ContentExtensions
 } // namespace WebCore
 
diff --git a/Source/WebCore/contentextensions/ContentExtensionStyleSheet.cpp b/Source/WebCore/contentextensions/ContentExtensionStyleSheet.cpp
@@ -29,6 +29,7 @@
 #if ENABLE(CONTENT_EXTENSIONS)
 
 #include "CSSStyleSheet.h"
+#include "ContentExtensionParser.h"
 #include "ContentExtensionsBackend.h"
 #include "Document.h"
 #include "StyleSheetContents.h"
@@ -38,7 +39,7 @@ namespace WebCore {
 namespace ContentExtensions {
 
 ContentExtensionStyleSheet::ContentExtensionStyleSheet(Document& document)
-    : m_styleSheet(CSSStyleSheet::create(StyleSheetContents::create(), document))
+    : m_styleSheet(CSSStyleSheet::create(StyleSheetContents::create(contentExtensionCSSParserContext()), document))
 {
     m_styleSheet->contents().setIsUserStyleSheet(true);
 }
diff --git a/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp b/Tools/TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp
@@ -29,6 +29,7 @@
 
 #include "Utilities.h"
 #include <JavaScriptCore/InitializeThreading.h>
+#include <WebCore/CSSParserContext.h>
 #include <WebCore/CombinedURLFilters.h>
 #include <WebCore/CommonAtomStrings.h>
 #include <WebCore/ContentExtensionActions.h>

Original file line number	Diff line number	Diff line change
`@@ -206,11 +206,17 @@ bool isValidCSSSelector(const String& selector)`
`206`	`206`	`{`
`207`	`207`	`ASSERT(isMainThread());`
`208`	`208`	`ProcessWarming::initializeNames();`
`209`		`- CSSParserContext context(HTMLQuirksMode);`
`210`		`- CSSParser parser(context);`
	`209`	`+ CSSParser parser(contentExtensionCSSParserContext());`
`211`	`210`	`return !!parser.parseSelector(selector);`
`212`	`211`	`}`
`213`	`212`
	`213`	`+WebCore::CSSParserContext contentExtensionCSSParserContext()`
	`214`	`+{`
	`215`	`+ WebCore::CSSParserContext context(HTMLQuirksMode);`
	`216`	`+ context.hasPseudoClassEnabled = true;`
	`217`	`+ return context;`
	`218`	`+}`
	`219`	`+`
`214`	`220`	`static std::optional<Expected<Action, std::error_code>> loadAction(const JSON::Object& ruleObject, const String& urlFilter)`
`215`	`221`	`{`
`216`	`222`	`auto actionObject = ruleObject.getObject("action"_s);`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@`
`29`	`29`	`#if ENABLE(CONTENT_EXTENSIONS)`
`30`	`30`
`31`	`31`	`#include "CSSStyleSheet.h"`
	`32`	`+#include "ContentExtensionParser.h"`
`32`	`33`	`#include "ContentExtensionsBackend.h"`
`33`	`34`	`#include "Document.h"`
`34`	`35`	`#include "StyleSheetContents.h"`
`@@ -38,7 +39,7 @@ namespace WebCore {`
`38`	`39`	`namespace ContentExtensions {`
`39`	`40`
`40`	`41`	`ContentExtensionStyleSheet::ContentExtensionStyleSheet(Document& document)`
`41`		`- : m_styleSheet(CSSStyleSheet::create(StyleSheetContents::create(), document))`
	`42`	`+ : m_styleSheet(CSSStyleSheet::create(StyleSheetContents::create(contentExtensionCSSParserContext()), document))`
`42`	`43`	`{`
`43`	`44`	`m_styleSheet->contents().setIsUserStyleSheet(true);`
`44`	`45`	`}`