Commit 8d9baff7 authored by Anders Hartvoll Ruud's avatar Anders Hartvoll Ruud Committed by Commit Bot

Remove runtime flag CSSSupportsSelector

Bug: 979041
Change-Id: I11e132a51dfe8284c1fb7f9ab3f87dbe07e74dde
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2509852Reviewed-by: default avatarRune Lillesveen <futhark@chromium.org>
Commit-Queue: Anders Hartvoll Ruud <andruud@chromium.org>
Cr-Commit-Position: refs/heads/master@{#822810}
parent e6b17930
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#include "third_party/blink/renderer/core/css/parser/css_parser_token_stream.h" #include "third_party/blink/renderer/core/css/parser/css_parser_token_stream.h"
#include "third_party/blink/renderer/core/css/parser/css_selector_parser.h" #include "third_party/blink/renderer/core/css/parser/css_selector_parser.h"
#include "third_party/blink/renderer/core/css_value_keywords.h" #include "third_party/blink/renderer/core/css_value_keywords.h"
#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
namespace blink { namespace blink {
...@@ -194,8 +193,6 @@ CSSSupportsParser::Result CSSSupportsParser::ConsumeSupportsFeature( ...@@ -194,8 +193,6 @@ CSSSupportsParser::Result CSSSupportsParser::ConsumeSupportsFeature(
CSSSupportsParser::Result CSSSupportsParser::ConsumeSupportsSelectorFn( CSSSupportsParser::Result CSSSupportsParser::ConsumeSupportsSelectorFn(
const CSSParserToken& first_token, const CSSParserToken& first_token,
CSSParserTokenStream& stream) { CSSParserTokenStream& stream) {
if (!RuntimeEnabledFeatures::CSSSupportsSelectorEnabled())
return Result::kParseFailure;
DCHECK(IsSupportsSelectorFn(first_token, stream.Peek())); DCHECK(IsSupportsSelectorFn(first_token, stream.Peek()));
auto block = stream.ConsumeUntilPeekedTypeIs<kRightParenthesisToken>(); auto block = stream.ConsumeUntilPeekedTypeIs<kRightParenthesisToken>();
if (CSSSelectorParser::SupportsComplexSelector(block, parser_.GetContext())) if (CSSSelectorParser::SupportsComplexSelector(block, parser_.GetContext()))
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#include "third_party/blink/renderer/core/css/parser/css_parser_impl.h" #include "third_party/blink/renderer/core/css/parser/css_parser_impl.h"
#include "third_party/blink/renderer/core/css/parser/css_parser_token_stream.h" #include "third_party/blink/renderer/core/css/parser/css_parser_token_stream.h"
#include "third_party/blink/renderer/core/css/parser/css_tokenizer.h" #include "third_party/blink/renderer/core/css/parser/css_tokenizer.h"
#include "third_party/blink/renderer/platform/testing/runtime_enabled_features_test_helpers.h"
namespace blink { namespace blink {
...@@ -200,21 +199,18 @@ TEST_F(CSSSupportsParserTest, ConsumeSupportsInParens) { ...@@ -200,21 +199,18 @@ TEST_F(CSSSupportsParserTest, ConsumeSupportsInParens) {
ConsumeSupportsInParens("(color:red)and (color:green)")); ConsumeSupportsInParens("(color:red)and (color:green)"));
EXPECT_EQ(Result::kSupported, EXPECT_EQ(Result::kSupported,
ConsumeSupportsInParens("(color:red)or (color:green)")); ConsumeSupportsInParens("(color:red)or (color:green)"));
{ EXPECT_EQ(Result::kSupported,
ScopedCSSSupportsSelectorForTest css_supports_selector(true); ConsumeSupportsInParens("selector(div)or (color:green)"));
EXPECT_EQ(Result::kSupported, EXPECT_EQ(Result::kSupported,
ConsumeSupportsInParens("selector(div)or (color:green)")); ConsumeSupportsInParens("selector(div)and (color:green)"));
EXPECT_EQ(Result::kSupported,
ConsumeSupportsInParens("selector(div)and (color:green)")); // Invalid <supports-selector-fn> formerly handled by
// ConsumeSupportsSelectorFn()
// Invalid <supports-selector-fn> formerly handled by EXPECT_EQ(Result::kParseFailure, ConsumeSupportsInParens("#test"));
// ConsumeSupportsSelectorFn() EXPECT_EQ(Result::kParseFailure, ConsumeSupportsInParens("test"));
EXPECT_EQ(Result::kParseFailure, ConsumeSupportsInParens("#test"));
EXPECT_EQ(Result::kParseFailure, ConsumeSupportsInParens("test")); // Invalid <supports-selector-fn> but valid <general-enclosed>
EXPECT_EQ(Result::kUnsupported, ConsumeSupportsInParens("test(1)"));
// Invalid <supports-selector-fn> but valid <general-enclosed>
EXPECT_EQ(Result::kUnsupported, ConsumeSupportsInParens("test(1)"));
}
// Invalid <supports-decl> formerly handled by ConsumeSupportsDecl() // Invalid <supports-decl> formerly handled by ConsumeSupportsDecl()
EXPECT_EQ(Result::kParseFailure, ConsumeSupportsInParens("")); EXPECT_EQ(Result::kParseFailure, ConsumeSupportsInParens(""));
...@@ -230,8 +226,6 @@ TEST_F(CSSSupportsParserTest, ConsumeSupportsInParens) { ...@@ -230,8 +226,6 @@ TEST_F(CSSSupportsParserTest, ConsumeSupportsInParens) {
} }
TEST_F(CSSSupportsParserTest, ConsumeSupportsSelectorFn) { TEST_F(CSSSupportsParserTest, ConsumeSupportsSelectorFn) {
ScopedCSSSupportsSelectorForTest css_supports_selector(true);
EXPECT_EQ(Result::kSupported, ConsumeSupportsSelectorFn("selector(*)")); EXPECT_EQ(Result::kSupported, ConsumeSupportsSelectorFn("selector(*)"));
EXPECT_EQ(Result::kSupported, ConsumeSupportsSelectorFn("selector(*:hover)")); EXPECT_EQ(Result::kSupported, ConsumeSupportsSelectorFn("selector(*:hover)"));
EXPECT_EQ(Result::kSupported, ConsumeSupportsSelectorFn("selector(:hover)")); EXPECT_EQ(Result::kSupported, ConsumeSupportsSelectorFn("selector(:hover)"));
...@@ -294,14 +288,6 @@ TEST_F(CSSSupportsParserTest, ConsumeSupportsSelectorFn) { ...@@ -294,14 +288,6 @@ TEST_F(CSSSupportsParserTest, ConsumeSupportsSelectorFn) {
ConsumeSupportsSelectorFn("selector(::asdf)")); ConsumeSupportsSelectorFn("selector(::asdf)"));
} }
TEST_F(CSSSupportsParserTest, ConsumeSupportsSelectorFnWithFeatureDisabled) {
ScopedCSSSupportsSelectorForTest css_supports_selector(false);
EXPECT_EQ(Result::kParseFailure, ConsumeSupportsSelectorFn("selector(*)"));
EXPECT_EQ(Result::kParseFailure, ConsumeSupportsSelectorFn("selector(div)"));
EXPECT_EQ(Result::kParseFailure, ConsumeSupportsSelectorFn("selector(.a)"));
}
TEST_F(CSSSupportsParserTest, ConsumeSupportsDecl) { TEST_F(CSSSupportsParserTest, ConsumeSupportsDecl) {
EXPECT_EQ(Result::kSupported, ConsumeSupportsDecl("(color:red)")); EXPECT_EQ(Result::kSupported, ConsumeSupportsDecl("(color:red)"));
EXPECT_EQ(Result::kSupported, ConsumeSupportsDecl("(color: red)")); EXPECT_EQ(Result::kSupported, ConsumeSupportsDecl("(color: red)"));
...@@ -328,11 +314,7 @@ TEST_F(CSSSupportsParserTest, ConsumeSupportsDecl) { ...@@ -328,11 +314,7 @@ TEST_F(CSSSupportsParserTest, ConsumeSupportsDecl) {
TEST_F(CSSSupportsParserTest, ConsumeSupportsFeature) { TEST_F(CSSSupportsParserTest, ConsumeSupportsFeature) {
EXPECT_EQ(Result::kSupported, ConsumeSupportsFeature("(color:red)")); EXPECT_EQ(Result::kSupported, ConsumeSupportsFeature("(color:red)"));
EXPECT_EQ(Result::kParseFailure, ConsumeSupportsFeature("asdf(1)"));
{
ScopedCSSSupportsSelectorForTest css_supports_selector(true);
EXPECT_EQ(Result::kParseFailure, ConsumeSupportsFeature("asdf(1)"));
}
} }
TEST_F(CSSSupportsParserTest, ConsumeGeneralEnclosed) { TEST_F(CSSSupportsParserTest, ConsumeGeneralEnclosed) {
......
...@@ -609,10 +609,6 @@ ...@@ -609,10 +609,6 @@
name: "CSSSnapSize", name: "CSSSnapSize",
status: "experimental", status: "experimental",
}, },
{
name: "CSSSupportsSelector",
status: "stable",
},
// Make system color keywords compute to themselves. // Make system color keywords compute to themselves.
// https://github.com/w3c/csswg-drafts/issues/3847 // https://github.com/w3c/csswg-drafts/issues/3847
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment