Fix CSS.supports for origin trial enabled property/value

- currently when CSS.supports is called it does not pass in the
  ExecutionContext to the css parser context, hence it does not support
  Origin Trial enabled properties/values.

- This changeset added plumbing to pass in the top level document to
  CSSParserContext which we extracted from ExecutionContext.

- Repurposed one of the ParseValue overload and change all its callsite
  to pass in ExecutionContext, they were previously passing in
  ExecutionContext->GetSecureContext()

- CSSParserContext used in support parsing are constructed using the
  document if the execution context belongs to one. We then override
  the parser mode to kHTMLStandardMode as quirks mode values must not
  be supported in CSS.supports method according to
  https://quirks.spec.whatwg.org/#css
  This is also in line with current behaviours before document
  is added to the context.

- Added virtual test that checks for CSS.supports(condition) and
  CSS.supports(property, value)

Bug: 1134237
Change-Id: I4c1b3cd2707f3ce5495ee298a909e3f42946fc09
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2477014Reviewed-by: Jeremy Roman <jbroman@chromium.org>
Reviewed-by: Anders Hartvoll Ruud <andruud@chromium.org>
Reviewed-by: Jason Chase <chasej@chromium.org>
Commit-Queue: Rodney Ding <rodneyding@google.com>
Cr-Commit-Position: refs/heads/master@{#821909}

third_party/blink/renderer/core/css/dom_window_css.cc

@@ -67,14 +67,13 @@ bool DOMWindowCSS::supports(const ExecutionContext* execution_context,
   auto* dummy_style =
       MakeGarbageCollected<MutableCSSPropertyValueSet>(kHTMLStandardMode);
   return CSSParser::ParseValue(dummy_style, unresolved_property, value, false,
-                               execution_context->GetSecureContextMode())
+                               execution_context)
       .did_parse;
 }
 
 bool DOMWindowCSS::supports(const ExecutionContext* execution_context,
                             const String& condition_text) {
-  return CSSParser::ParseSupportsCondition(
-      condition_text, execution_context->GetSecureContextMode());
+  return CSSParser::ParseSupportsCondition(condition_text, execution_context);
 }
 
 String DOMWindowCSS::escape(const String& ident) {

third_party/blink/renderer/core/css/font_face_set_document.cc

@@ -166,8 +166,7 @@ bool FontFaceSetDocument::ResolveFontStyle(const String& font_string,
 
   // Interpret fontString in the same way as the 'font' attribute of
   // CanvasRenderingContext2D.
-  auto* parsed_style = CSSParser::ParseFont(
-      font_string, GetExecutionContext()->GetSecureContextMode());
+  auto* parsed_style = CSSParser::ParseFont(font_string, GetExecutionContext());
   if (!parsed_style)
     return false;
 

third_party/blink/renderer/core/css/font_face_set_worker.cc

@@ -76,8 +76,7 @@ bool FontFaceSetWorker::ResolveFontStyle(const String& font_string,
 
   // Interpret fontString in the same way as the 'font' attribute of
   // CanvasRenderingContext2D.
-  auto* parsed_style = CSSParser::ParseFont(
-      font_string, GetExecutionContext()->GetSecureContextMode());
+  auto* parsed_style = CSSParser::ParseFont(font_string, GetExecutionContext());
   if (!parsed_style)
     return false;
 

third_party/blink/renderer/core/css/parser/css_parser.cc

@@ -20,6 +20,7 @@
 #include "third_party/blink/renderer/core/css/style_color.h"
 #include "third_party/blink/renderer/core/css/style_rule.h"
 #include "third_party/blink/renderer/core/css/style_sheet_contents.h"
+#include "third_party/blink/renderer/core/frame/local_dom_window.h"
 #include "third_party/blink/renderer/core/layout/layout_theme.h"
 #include "third_party/blink/renderer/platform/heap/heap.h"
 
@@ -90,10 +91,12 @@ MutableCSSPropertyValueSet::SetResult CSSParser::ParseValue(
     CSSPropertyID unresolved_property,
     const String& string,
     bool important,
-    SecureContextMode secure_context_mode) {
-  return ParseValue(declaration, unresolved_property, string, important,
-                    secure_context_mode,
-                    static_cast<StyleSheetContents*>(nullptr));
+    const ExecutionContext* execution_context) {
+  return ParseValue(
+      declaration, unresolved_property, string, important,
+      execution_context ? execution_context->GetSecureContextMode()
+                        : SecureContextMode::kInsecureContext,
+      static_cast<StyleSheetContents*>(nullptr), execution_context);
 }
 
 MutableCSSPropertyValueSet::SetResult CSSParser::ParseValue(
@@ -102,7 +105,8 @@ MutableCSSPropertyValueSet::SetResult CSSParser::ParseValue(
     const String& string,
     bool important,
     SecureContextMode secure_context_mode,
-    StyleSheetContents* style_sheet) {
+    StyleSheetContents* style_sheet,
+    const ExecutionContext* execution_context) {
   if (string.IsEmpty()) {
     bool did_parse = false;
     bool did_change = false;
@@ -124,6 +128,12 @@ MutableCSSPropertyValueSet::SetResult CSSParser::ParseValue(
     context =
         MakeGarbageCollected<CSSParserContext>(style_sheet->ParserContext());
     context->SetMode(parser_mode);
+  } else if (IsA<LocalDOMWindow>(execution_context)) {
+    // Create parser context using document if it exists so it can check for
+    // origin trial enabled property/value.
+    context = MakeGarbageCollected<CSSParserContext>(
+        *To<LocalDOMWindow>(execution_context)->document());
+    context->SetMode(parser_mode);
   } else {
     context = MakeGarbageCollected<CSSParserContext>(parser_mode,
                                                      secure_context_mode);
@@ -211,13 +221,23 @@ StyleRuleKeyframe* CSSParser::ParseKeyframeRule(const CSSParserContext* context,
   return To<StyleRuleKeyframe>(keyframe);
 }
 
-bool CSSParser::ParseSupportsCondition(const String& condition,
-                                       SecureContextMode secure_context_mode) {
+bool CSSParser::ParseSupportsCondition(
+    const String& condition,
+    const ExecutionContext* execution_context) {
   // window.CSS.supports requires to parse as-if it was wrapped in parenthesis.
   String wrapped_condition = "(" + condition + ")";
   CSSTokenizer tokenizer(wrapped_condition);
   CSSParserTokenStream stream(tokenizer);
-  CSSParserImpl parser(StrictCSSParserContext(secure_context_mode));
+  DCHECK(execution_context);
+  // Create parser context using document so it can check for origin trial
+  // enabled property/value.
+  CSSParserContext* context = MakeGarbageCollected<CSSParserContext>(
+      *To<LocalDOMWindow>(execution_context)->document());
+  // Override the parser mode interpreted from the document as the spec
+  // https://quirks.spec.whatwg.org/#css requires quirky values and colors
+  // must not be supported in CSS.supports() method.
+  context->SetMode(kHTMLStandardMode);
+  CSSParserImpl parser(context);
   CSSSupportsParser::Result result =
       CSSSupportsParser::ConsumeSupportsCondition(stream, parser);
   if (!stream.AtEnd())
@@ -293,11 +313,13 @@ CSSPrimitiveValue* CSSParser::ParseLengthPercentage(
                                                    kValueRangeAll);
 }
 
-MutableCSSPropertyValueSet* CSSParser::ParseFont(const String& string,
-                                                 SecureContextMode mode) {
+MutableCSSPropertyValueSet* CSSParser::ParseFont(
+    const String& string,
+    const ExecutionContext* execution_context) {
   auto* set =
       MakeGarbageCollected<MutableCSSPropertyValueSet>(kHTMLStandardMode);
-  ParseValue(set, CSSPropertyID::kFont, string, true /* important */, mode);
+  ParseValue(set, CSSPropertyID::kFont, string, true /* important */,
+             execution_context);
   if (set->IsEmpty())
     return nullptr;
   const CSSValue* font_size =

third_party/blink/renderer/core/css/parser/css_parser.h

@@ -18,6 +18,7 @@ class Color;
 class CSSParserObserver;
 class CSSSelectorList;
 class Element;
+class ExecutionContext;
 class ImmutableCSSPropertyValueSet;
 class StyleRuleBase;
 class StyleRuleKeyframe;
@@ -59,14 +60,15 @@ class CORE_EXPORT CSSParser {
       CSSPropertyID unresolved_property,
       const String&,
       bool important,
-      SecureContextMode);
+      const ExecutionContext* execution_context = nullptr);
   static MutableCSSPropertyValueSet::SetResult ParseValue(
       MutableCSSPropertyValueSet*,
       CSSPropertyID unresolved_property,
       const String&,
       bool important,
       SecureContextMode,
-      StyleSheetContents*);
+      StyleSheetContents*,
+      const ExecutionContext* execution_context = nullptr);
 
   static MutableCSSPropertyValueSet::SetResult ParseValueForCustomProperty(
       MutableCSSPropertyValueSet*,
@@ -96,7 +98,7 @@ class CORE_EXPORT CSSParser {
   static StyleRuleKeyframe* ParseKeyframeRule(const CSSParserContext*,
                                               const String&);
 
-  static bool ParseSupportsCondition(const String&, SecureContextMode);
+  static bool ParseSupportsCondition(const String&, const ExecutionContext*);
 
   // The color will only be changed when string contains a valid CSS color, so
   // callers can set it to a default color and ignore the boolean result.
@@ -119,7 +121,7 @@ class CORE_EXPORT CSSParser {
   // https://html.spec.whatwg.org/multipage/canvas.html#dom-context-2d-font
   // https://drafts.csswg.org/css-font-loading/#find-the-matching-font-faces
   static MutableCSSPropertyValueSet* ParseFont(const String&,
-                                               SecureContextMode);
+                                               const ExecutionContext*);
 
  private:
   static MutableCSSPropertyValueSet::SetResult ParseValue(

third_party/blink/renderer/core/css/parser/css_parser_context.h

@@ -52,7 +52,7 @@ class CORE_EXPORT CSSParserContext final
                    SecureContextMode,
                    SelectorProfile = kLiveProfile,
                    const Document* use_counter_document = nullptr);
-  CSSParserContext(const Document&);
+  explicit CSSParserContext(const Document&);
   CSSParserContext(const Document&,
                    const KURL& base_url_override,
                    bool origin_clean,

third_party/blink/renderer/core/css/resolver/font_style_resolver_test.cc

@@ -13,8 +13,7 @@ namespace blink {
 TEST(FontStyleResolverTest, Simple) {
   auto* style =
       MakeGarbageCollected<MutableCSSPropertyValueSet>(kHTMLStandardMode);
-  CSSParser::ParseValue(style, CSSPropertyID::kFont, "15px Ahem", true,
-                        SecureContextMode::kInsecureContext);
+  CSSParser::ParseValue(style, CSSPropertyID::kFont, "15px Ahem", true);
 
   FontDescription desc = FontStyleResolver::ComputeFont(*style, nullptr);
 
@@ -26,8 +25,7 @@ TEST(FontStyleResolverTest, Simple) {
 TEST(FontStyleResolverTest, InvalidSize) {
   auto* style =
       MakeGarbageCollected<MutableCSSPropertyValueSet>(kHTMLStandardMode);
-  CSSParser::ParseValue(style, CSSPropertyID::kFont, "-1px Ahem", true,
-                        SecureContextMode::kInsecureContext);
+  CSSParser::ParseValue(style, CSSPropertyID::kFont, "-1px Ahem", true);
 
   FontDescription desc = FontStyleResolver::ComputeFont(*style, nullptr);
 
@@ -39,8 +37,7 @@ TEST(FontStyleResolverTest, InvalidSize) {
 TEST(FontStyleResolverTest, InvalidWeight) {
   auto* style =
       MakeGarbageCollected<MutableCSSPropertyValueSet>(kHTMLStandardMode);
-  CSSParser::ParseValue(style, CSSPropertyID::kFont, "wrong 1px Ahem", true,
-                        SecureContextMode::kInsecureContext);
+  CSSParser::ParseValue(style, CSSPropertyID::kFont, "wrong 1px Ahem", true);
 
   FontDescription desc = FontStyleResolver::ComputeFont(*style, nullptr);
 
@@ -53,8 +50,7 @@ TEST(FontStyleResolverTest, InvalidEverything) {
   auto* style =
       MakeGarbageCollected<MutableCSSPropertyValueSet>(kHTMLStandardMode);
   CSSParser::ParseValue(style, CSSPropertyID::kFont,
-                        "wrong wrong wrong 1px Ahem", true,
-                        SecureContextMode::kInsecureContext);
+                        "wrong wrong wrong 1px Ahem", true);
 
   FontDescription desc = FontStyleResolver::ComputeFont(*style, nullptr);
 
@@ -66,8 +62,7 @@ TEST(FontStyleResolverTest, InvalidEverything) {
 TEST(FontStyleResolverTest, RelativeSize) {
   auto* style =
       MakeGarbageCollected<MutableCSSPropertyValueSet>(kHTMLStandardMode);
-  CSSParser::ParseValue(style, CSSPropertyID::kFont, "italic 2ex Ahem", true,
-                        SecureContextMode::kInsecureContext);
+  CSSParser::ParseValue(style, CSSPropertyID::kFont, "italic 2ex Ahem", true);
 
   FontDescription desc = FontStyleResolver::ComputeFont(*style, nullptr);
 

third_party/blink/renderer/core/css/threaded/css_parser_threaded_test.cc

@@ -27,8 +27,7 @@ class CSSParserThreadedTest : public MultiThreadedTest {
                                                const String& text) {
     auto* style =
         MakeGarbageCollected<MutableCSSPropertyValueSet>(kHTMLStandardMode);
-    CSSParser::ParseValue(style, prop, text, true,
-                          SecureContextMode::kInsecureContext);
+    CSSParser::ParseValue(style, prop, text, true);
     return style;
   }
 };

third_party/blink/renderer/core/css/threaded/font_object_threaded_test.cc

@@ -34,8 +34,7 @@ TSAN_TEST(FontObjectThreadedTest, GetFontDefinition) {
   RunOnThreads([]() {
     auto* style =
         MakeGarbageCollected<MutableCSSPropertyValueSet>(kHTMLStandardMode);
-    CSSParser::ParseValue(style, CSSPropertyID::kFont, "15px Ahem", true,
-                          SecureContextMode::kInsecureContext);
+    CSSParser::ParseValue(style, CSSPropertyID::kFont, "15px Ahem", true);
 
     FontDescription desc = FontStyleResolver::ComputeFont(*style, nullptr);
 

third_party/blink/renderer/core/html/canvas/canvas_font_cache.cc

@@ -91,8 +91,8 @@ MutableCSSPropertyValueSet* CanvasFontCache::ParseFont(
     DCHECK(!add_result.is_new_entry);
     parsed_style = i->value;
   } else {
-    parsed_style = CSSParser::ParseFont(
-        font_string, document_->GetExecutionContext()->GetSecureContextMode());
+    parsed_style =
+        CSSParser::ParseFont(font_string, document_->GetExecutionContext());
     if (!parsed_style)
       return nullptr;
     fetched_fonts_.insert(font_string, parsed_style);

third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.cc

@@ -408,9 +408,8 @@ void OffscreenCanvasRenderingContext2D::setFont(const String& new_font) {
     if (!style)
       return;
 
-    CSSParser::ParseValue(
-        style, CSSPropertyID::kFont, new_font, true,
-        Host()->GetTopExecutionContext()->GetSecureContextMode());
+    CSSParser::ParseValue(style, CSSPropertyID::kFont, new_font, true,
+                          Host()->GetTopExecutionContext());
 
     // According to
     // http://lists.w3.org/Archives/Public/public-html/2009Jul/0947.html,

third_party/blink/web_tests/TestExpectations

@@ -6182,8 +6182,6 @@ crbug.com/1133821 virtual/off-main-thread-css-paint/external/wpt/css/css-paint-a
 crbug.com/1135405 http/tests/devtools/sources/debugger-pause/debugger-pause-infinite-loop.js [ Pass Timeout ]
 crbug.com/1135978 [ Linux Release ] fast/dom/css-delete-doc.html [ Pass Timeout ]
 
-crbug.com/1134237 virtual/origin-trials-runtimeflags-disabled/http/tests/origin_trials/webexposed/beforematch-origin-trial-interfaces.html [ Failure ]
-
 # Sheriff 2020-10-09
 crbug.com/1136687 external/wpt/pointerevents/pointerlock/pointerevent_pointerlock_supercedes_capture.html [ Pass Failure ]
 crbug.com/1136726 [ Linux ] virtual/gpu-rasterization/images/imagemap-focus-ring-outline-color-not-inherited-from-map.html [ Failure ]

third_party/blink/web_tests/http/tests/origin_trials/webexposed/content-visibility-value-supports-condition-hidden-matchable-rule.html

+<!DOCTYPE html>
+<meta charset="utf-8">
+<!-- Generate token with the command:
+generate_token.py http://127.0.0.1:8000 BeforeMatchEvent --expire-timestamp=2000000000 --version 3
+-->
+
+<meta http-equiv="origin-trial" content="A6qG2zhYsapjwU1J8SBwg56JXGIaUKzBXWy2hJ8V1U2fX/ZRPCwdajgTdBT/BFdDTmst9Dl2uFqsxc/3LPqmFgQAAABYeyJvcmlnaW4iOiAiaHR0cDovLzEyNy4wLjAuMTo4MDAwIiwgImZlYXR1cmUiOiAiQmVmb3JlTWF0Y2hFdmVudCIsICJleHBpcnkiOiAyMDAwMDAwMDAwfQ==">
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<body>
+<script>
+test(t => {
+  assert_equals(document.body.onbeforematch, null,
+    'onbeforematch should be null instead of undefined when the feature is enabled.');
+
+  assert_true(CSS.supports('content-visibility: hidden-matchable'),
+    'CSS.supports() should show that hidden-matchable rule is enabled when the feature is enabled.');
+
+}, 'Tests feature detection for the BeforeMatchEvent origin trial');
+</script>

third_party/blink/web_tests/http/tests/origin_trials/webexposed/beforematch-origin-trial-interfaces.html → third_party/blink/web_tests/http/tests/origin_trials/webexposed/content-visibility-value-supports-hidden-matchable-value.html

@@ -16,7 +16,7 @@ test(t => {
     'onbeforematch should be null instead of undefined when the feature is enabled.');
 
   assert_true(CSS.supports('content-visibility', 'hidden-matchable'),
-    'CSS.supports() should show that hidden-matchable is enabled when the feature is enabled.');
+    'CSS.supports() should show that hidden-matchable value is enabled when the feature is enabled.');
 
 }, 'Tests feature detection for the BeforeMatchEvent origin trial');
 </script>