Commit fdd951e1 authored by Rune Lillesveen's avatar Rune Lillesveen Committed by Commit Bot

Remove MediaQueryPrefersColorScheme runtime flag.

This feature has been enabled since M-76.

Bug: 889087
Change-Id: I54fbf2851fe7da7c442f6abb05010405f7f27fca
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1992321Reviewed-by: default avatarXiaocheng Hu <xiaochengh@chromium.org>
Commit-Queue: Rune Lillesveen <futhark@chromium.org>
Cr-Commit-Position: refs/heads/master@{#729917}
parent d1ce2d33
...@@ -80,11 +80,9 @@ static inline bool FeatureWithValidIdent(const String& media_feature, ...@@ -80,11 +80,9 @@ static inline bool FeatureWithValidIdent(const String& media_feature,
ident == CSSValueID::kRec2020; ident == CSSValueID::kRec2020;
} }
if (RuntimeEnabledFeatures::MediaQueryPrefersColorSchemeEnabled()) { if (media_feature == media_feature_names::kPrefersColorSchemeMediaFeature) {
if (media_feature == media_feature_names::kPrefersColorSchemeMediaFeature) { return ident == CSSValueID::kNoPreference || ident == CSSValueID::kDark ||
return ident == CSSValueID::kNoPreference || ident == CSSValueID::kDark || ident == CSSValueID::kLight;
ident == CSSValueID::kLight;
}
} }
if (media_feature == media_feature_names::kPrefersReducedMotionMediaFeature) if (media_feature == media_feature_names::kPrefersReducedMotionMediaFeature)
......
...@@ -1494,8 +1494,6 @@ TEST_F(StyleEngineTest, MediaQueriesChangeDefaultFontSize) { ...@@ -1494,8 +1494,6 @@ TEST_F(StyleEngineTest, MediaQueriesChangeDefaultFontSize) {
} }
TEST_F(StyleEngineTest, MediaQueriesChangeColorScheme) { TEST_F(StyleEngineTest, MediaQueriesChangeColorScheme) {
ScopedMediaQueryPrefersColorSchemeForTest feature_scope(true);
GetDocument().body()->SetInnerHTMLFromString(R"HTML( GetDocument().body()->SetInnerHTMLFromString(R"HTML(
<style> <style>
body { color: red } body { color: red }
...@@ -1521,8 +1519,6 @@ TEST_F(StyleEngineTest, MediaQueriesChangeColorScheme) { ...@@ -1521,8 +1519,6 @@ TEST_F(StyleEngineTest, MediaQueriesChangeColorScheme) {
} }
TEST_F(StyleEngineTest, MediaQueriesChangeColorSchemeForcedDarkMode) { TEST_F(StyleEngineTest, MediaQueriesChangeColorSchemeForcedDarkMode) {
ScopedMediaQueryPrefersColorSchemeForTest feature_scope(true);
GetDocument().GetSettings()->SetForceDarkModeEnabled(true); GetDocument().GetSettings()->SetForceDarkModeEnabled(true);
ColorSchemeHelper color_scheme_helper; ColorSchemeHelper color_scheme_helper;
color_scheme_helper.SetPreferredColorScheme(GetDocument(), color_scheme_helper.SetPreferredColorScheme(GetDocument(),
...@@ -1668,8 +1664,6 @@ TEST_F(StyleEngineTest, MediaQueriesChangeForcedColorsAndPreferredColorScheme) { ...@@ -1668,8 +1664,6 @@ TEST_F(StyleEngineTest, MediaQueriesChangeForcedColorsAndPreferredColorScheme) {
} }
TEST_F(StyleEngineTest, MediaQueriesColorSchemeOverride) { TEST_F(StyleEngineTest, MediaQueriesColorSchemeOverride) {
ScopedMediaQueryPrefersColorSchemeForTest feature_scope(true);
EXPECT_EQ(PreferredColorScheme::kLight, EXPECT_EQ(PreferredColorScheme::kLight,
Platform::Current()->ThemeEngine()->PreferredColorScheme()); Platform::Current()->ThemeEngine()->PreferredColorScheme());
......
...@@ -30,13 +30,11 @@ namespace blink { ...@@ -30,13 +30,11 @@ namespace blink {
class HTMLMetaElementTest : public PageTestBase, class HTMLMetaElementTest : public PageTestBase,
private ScopedDisplayCutoutAPIForTest, private ScopedDisplayCutoutAPIForTest,
private ScopedMetaColorSchemeForTest, private ScopedMetaColorSchemeForTest,
private ScopedMediaQueryPrefersColorSchemeForTest,
private ScopedCSSColorSchemeForTest { private ScopedCSSColorSchemeForTest {
public: public:
HTMLMetaElementTest() HTMLMetaElementTest()
: ScopedDisplayCutoutAPIForTest(true), : ScopedDisplayCutoutAPIForTest(true),
ScopedMetaColorSchemeForTest(true), ScopedMetaColorSchemeForTest(true),
ScopedMediaQueryPrefersColorSchemeForTest(true),
ScopedCSSColorSchemeForTest(true) {} ScopedCSSColorSchemeForTest(true) {}
void SetUp() override { void SetUp() override {
PageTestBase::SetUp(); PageTestBase::SetUp();
......
...@@ -1007,10 +1007,6 @@ ...@@ -1007,10 +1007,6 @@
{ {
name: "MediaQueryNavigationControls", name: "MediaQueryNavigationControls",
}, },
{
name: "MediaQueryPrefersColorScheme",
status: "stable",
},
{ {
name: "MediaQueryShape", name: "MediaQueryShape",
status: "experimental", status: "experimental",
......
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