Title: [208899] trunk
Revision
208899
Author
[email protected]
Date
2016-11-18 14:30:44 -0800 (Fri, 18 Nov 2016)

Log Message

Better testing for accessibility media queries
https://bugs.webkit.org/show_bug.cgi?id=164954
<rdar://problem/29338292>

Reviewed by Myles Maxfield.

Source/WebCore:

Provide an override mode for the accessibility media queries
that rely on system settings. This way we can test that they
are least responding to something.

Tests: fast/media/mq-inverted-colors-forced-value.html
       fast/media/mq-monochrome-forced-value.html

* css/MediaQueryEvaluator.cpp: Query the Settings to see if we're
forcing a value.
(WebCore::monochromeEvaluate):
(WebCore::invertedColorsEvaluate):
(WebCore::prefersReducedMotionEvaluate):
* page/Settings.h:
* testing/InternalSettings.cpp: Add new forcing values for inverted-colors
and monochrome.
(WebCore::InternalSettings::Backup::Backup):
(WebCore::InternalSettings::Backup::restoreTo):
(WebCore::settingsToInternalSettingsValue):
(WebCore::internalSettingsToSettingsValue):
(WebCore::InternalSettings::forcedColorsAreInvertedAccessibilityValue):
(WebCore::InternalSettings::setForcedColorsAreInvertedAccessibilityValue):
(WebCore::InternalSettings::forcedDisplayIsMonochromeAccessibilityValue):
(WebCore::InternalSettings::setForcedDisplayIsMonochromeAccessibilityValue):
(WebCore::InternalSettings::forcedPrefersReducedMotionAccessibilityValue):
(WebCore::InternalSettings::setForcedPrefersReducedMotionAccessibilityValue):
(WebCore::InternalSettings::forcedPrefersReducedMotionValue): Deleted.
(WebCore::InternalSettings::setForcedPrefersReducedMotionValue): Deleted.
* testing/InternalSettings.h:
* testing/InternalSettings.idl:

LayoutTests:

* fast/media/mq-inverted-colors-forced-value-expected.html: Added.
* fast/media/mq-inverted-colors-forced-value.html: Copied from LayoutTests/fast/media/mq-prefers-reduced-motion-forced-value.html.
* fast/media/mq-monochrome-forced-value-expected.html: Added.
* fast/media/mq-monochrome-forced-value.html: Added.
* fast/media/mq-prefers-reduced-motion-forced-value.html:

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (208898 => 208899)


--- trunk/LayoutTests/ChangeLog	2016-11-18 22:29:11 UTC (rev 208898)
+++ trunk/LayoutTests/ChangeLog	2016-11-18 22:30:44 UTC (rev 208899)
@@ -1,3 +1,17 @@
+2016-11-18  Dean Jackson  <[email protected]>
+
+        Better testing for accessibility media queries
+        https://bugs.webkit.org/show_bug.cgi?id=164954
+        <rdar://problem/29338292>
+
+        Reviewed by Myles Maxfield.
+
+        * fast/media/mq-inverted-colors-forced-value-expected.html: Added.
+        * fast/media/mq-inverted-colors-forced-value.html: Copied from LayoutTests/fast/media/mq-prefers-reduced-motion-forced-value.html.
+        * fast/media/mq-monochrome-forced-value-expected.html: Added.
+        * fast/media/mq-monochrome-forced-value.html: Added.
+        * fast/media/mq-prefers-reduced-motion-forced-value.html:
+
 2016-11-18  Ryan Haddad  <[email protected]>
 
         Marking http/tests/misc/link-rel-icon-beforeload.html as failing on mac-wk1.

Added: trunk/LayoutTests/fast/media/mq-inverted-colors-forced-value-expected.html (0 => 208899)


--- trunk/LayoutTests/fast/media/mq-inverted-colors-forced-value-expected.html	                        (rev 0)
+++ trunk/LayoutTests/fast/media/mq-inverted-colors-forced-value-expected.html	2016-11-18 22:30:44 UTC (rev 208899)
@@ -0,0 +1,14 @@
+<html>
+<head>
+<title>CSS4 media query test: inverted-colors.</title>
+<style type="text/css">
+p { color: green; }
+</style>
+</head>
+<body>
+  <p id="a">This text should be green.</p>
+  <p id="b">This text should be green.</p>
+  <p id="c">This text should be green.</p>
+  <p id="d">This text should be green.</p>
+</body>
+</html>
Property changes on: trunk/LayoutTests/fast/media/mq-inverted-colors-forced-value-expected.html
___________________________________________________________________

Added: svn:eol-style

+native \ No newline at end of property

Added: svn:keywords

+Date Revision \ No newline at end of property

Added: svn:mime-type

+text/html \ No newline at end of property

Copied: trunk/LayoutTests/fast/media/mq-inverted-colors-forced-value.html (from rev 208898, trunk/LayoutTests/fast/media/mq-prefers-reduced-motion-forced-value.html) (0 => 208899)


--- trunk/LayoutTests/fast/media/mq-inverted-colors-forced-value.html	                        (rev 0)
+++ trunk/LayoutTests/fast/media/mq-inverted-colors-forced-value.html	2016-11-18 22:30:44 UTC (rev 208899)
@@ -0,0 +1,32 @@
+<html>
+<head>
+<title>CSS4 media query test: inverted-colors.</title>
+<style type="text/css">
+p { color: black; }
+</style>
+<script>
+window.addEventListener("load", function () {
+    if (!window.internals)
+        return;
+
+    window.internals.settings.forcedColorsAreInvertedAccessibilityValue = "on";
+    if (window.matchMedia("(inverted-colors)").matches)
+        document.getElementById("a").style.color = "green";
+    if (window.matchMedia("(inverted-colors: inverted)").matches)
+        document.getElementById("b").style.color = "green";
+
+    window.internals.settings.forcedColorsAreInvertedAccessibilityValue = "off";
+    if (!window.matchMedia("(inverted-colors)").matches)
+        document.getElementById("c").style.color = "green";
+    if (window.matchMedia("(inverted-colors: none)").matches)
+        document.getElementById("d").style.color = "green";
+}, false);
+</script>
+</head>
+<body>
+  <p id="a">This text should be green.</p>
+  <p id="b">This text should be green.</p>
+  <p id="c">This text should be green.</p>
+  <p id="d">This text should be green.</p>
+</body>
+</html>

Added: trunk/LayoutTests/fast/media/mq-monochrome-forced-value-expected.html (0 => 208899)


--- trunk/LayoutTests/fast/media/mq-monochrome-forced-value-expected.html	                        (rev 0)
+++ trunk/LayoutTests/fast/media/mq-monochrome-forced-value-expected.html	2016-11-18 22:30:44 UTC (rev 208899)
@@ -0,0 +1,12 @@
+<html>
+<head>
+<title>CSS4 media query test: monochrome.</title>
+<style type="text/css">
+p { color: #888; }
+</style>
+</head>
+<body>
+  <p id="a">This text should be mid grey #888.</p>
+  <p id="b">This text should be mid grey #888.</p>
+</body>
+</html>
Property changes on: trunk/LayoutTests/fast/media/mq-monochrome-forced-value-expected.html
___________________________________________________________________

Added: svn:eol-style

+native \ No newline at end of property

Added: svn:keywords

+Date Revision \ No newline at end of property

Added: svn:mime-type

+text/html \ No newline at end of property

Added: trunk/LayoutTests/fast/media/mq-monochrome-forced-value.html (0 => 208899)


--- trunk/LayoutTests/fast/media/mq-monochrome-forced-value.html	                        (rev 0)
+++ trunk/LayoutTests/fast/media/mq-monochrome-forced-value.html	2016-11-18 22:30:44 UTC (rev 208899)
@@ -0,0 +1,26 @@
+<html>
+<head>
+<title>CSS4 media query test: monochrome.</title>
+<style type="text/css">
+p { color: black; }
+</style>
+<script>
+window.addEventListener("load", function () {
+    if (!window.internals)
+        return;
+
+    window.internals.settings.forcedDisplayIsMonochromeAccessibilityValue = "on";
+    if (window.matchMedia("(monochrome)").matches)
+        document.getElementById("a").style.color = "#888";
+
+    window.internals.settings.forcedDisplayIsMonochromeAccessibilityValue = "off";
+    if (!window.matchMedia("(monochrome)").matches)
+        document.getElementById("b").style.color = "#888";
+}, false);
+</script>
+</head>
+<body>
+  <p id="a">This text should be mid grey #888.</p>
+  <p id="b">This text should be mid grey #888.</p>
+</body>
+</html>
Property changes on: trunk/LayoutTests/fast/media/mq-monochrome-forced-value.html
___________________________________________________________________

Added: svn:eol-style

+native \ No newline at end of property

Added: svn:keywords

+Date Revision \ No newline at end of property

Added: svn:mime-type

+text/html \ No newline at end of property

Modified: trunk/LayoutTests/fast/media/mq-prefers-reduced-motion-forced-value.html (208898 => 208899)


--- trunk/LayoutTests/fast/media/mq-prefers-reduced-motion-forced-value.html	2016-11-18 22:29:11 UTC (rev 208898)
+++ trunk/LayoutTests/fast/media/mq-prefers-reduced-motion-forced-value.html	2016-11-18 22:30:44 UTC (rev 208899)
@@ -9,13 +9,13 @@
     if (!window.internals)
         return;
 
-    window.internals.settings.forcedPrefersReducedMotionValue = "on";
+    window.internals.settings.forcedPrefersReducedMotionAccessibilityValue = "on";
     if (window.matchMedia("(prefers-reduced-motion)").matches)
         document.getElementById("a").style.color = "green";
     if (window.matchMedia("(prefers-reduced-motion: reduce)").matches)
         document.getElementById("b").style.color = "green";
 
-    window.internals.settings.forcedPrefersReducedMotionValue = "off";
+    window.internals.settings.forcedPrefersReducedMotionAccessibilityValue = "off";
     if (!window.matchMedia("(prefers-reduced-motion)").matches)
         document.getElementById("c").style.color = "green";
     if (window.matchMedia("(prefers-reduced-motion: default)").matches)

Modified: trunk/Source/WebCore/ChangeLog (208898 => 208899)


--- trunk/Source/WebCore/ChangeLog	2016-11-18 22:29:11 UTC (rev 208898)
+++ trunk/Source/WebCore/ChangeLog	2016-11-18 22:30:44 UTC (rev 208899)
@@ -1,3 +1,41 @@
+2016-11-18  Dean Jackson  <[email protected]>
+
+        Better testing for accessibility media queries
+        https://bugs.webkit.org/show_bug.cgi?id=164954
+        <rdar://problem/29338292>
+
+        Reviewed by Myles Maxfield.
+
+        Provide an override mode for the accessibility media queries
+        that rely on system settings. This way we can test that they
+        are least responding to something.
+
+        Tests: fast/media/mq-inverted-colors-forced-value.html
+               fast/media/mq-monochrome-forced-value.html
+
+        * css/MediaQueryEvaluator.cpp: Query the Settings to see if we're
+        forcing a value.
+        (WebCore::monochromeEvaluate):
+        (WebCore::invertedColorsEvaluate):
+        (WebCore::prefersReducedMotionEvaluate):
+        * page/Settings.h:
+        * testing/InternalSettings.cpp: Add new forcing values for inverted-colors
+        and monochrome.
+        (WebCore::InternalSettings::Backup::Backup):
+        (WebCore::InternalSettings::Backup::restoreTo):
+        (WebCore::settingsToInternalSettingsValue):
+        (WebCore::internalSettingsToSettingsValue):
+        (WebCore::InternalSettings::forcedColorsAreInvertedAccessibilityValue):
+        (WebCore::InternalSettings::setForcedColorsAreInvertedAccessibilityValue):
+        (WebCore::InternalSettings::forcedDisplayIsMonochromeAccessibilityValue):
+        (WebCore::InternalSettings::setForcedDisplayIsMonochromeAccessibilityValue):
+        (WebCore::InternalSettings::forcedPrefersReducedMotionAccessibilityValue):
+        (WebCore::InternalSettings::setForcedPrefersReducedMotionAccessibilityValue):
+        (WebCore::InternalSettings::forcedPrefersReducedMotionValue): Deleted.
+        (WebCore::InternalSettings::setForcedPrefersReducedMotionValue): Deleted.
+        * testing/InternalSettings.h:
+        * testing/InternalSettings.idl:
+
 2016-11-18  Myles C. Maxfield  <[email protected]>
 
         Unsupported emoji are invisible

Modified: trunk/Source/WebCore/css/MediaQueryEvaluator.cpp (208898 => 208899)


--- trunk/Source/WebCore/css/MediaQueryEvaluator.cpp	2016-11-18 22:29:11 UTC (rev 208898)
+++ trunk/Source/WebCore/css/MediaQueryEvaluator.cpp	2016-11-18 22:30:44 UTC (rev 208899)
@@ -261,16 +261,34 @@
 
 static bool monochromeEvaluate(CSSValue* value, const CSSToLengthConversionData& conversionData, Frame& frame, MediaFeaturePrefix op)
 {
-    if (!screenIsMonochrome(frame.mainFrame().view()))
+    bool isMonochrome;
+
+    if (frame.settings().forcedDisplayIsMonochromeAccessibilityValue() == Settings::ForcedAccessibilityValue::On)
+        isMonochrome = true;
+    else if (frame.settings().forcedDisplayIsMonochromeAccessibilityValue() == Settings::ForcedAccessibilityValue::Off)
+        isMonochrome = false;
+    else
+        isMonochrome = screenIsMonochrome(frame.mainFrame().view());
+
+    if (!isMonochrome)
         return zeroEvaluate(value, op);
     return colorEvaluate(value, conversionData, frame, op);
 }
 
-static bool invertedColorsEvaluate(CSSValue* value, const CSSToLengthConversionData&, Frame&, MediaFeaturePrefix)
+static bool invertedColorsEvaluate(CSSValue* value, const CSSToLengthConversionData&, Frame& frame, MediaFeaturePrefix)
 {
-    bool isInverted = screenHasInvertedColors();
+    bool isInverted;
+
+    if (frame.settings().forcedColorsAreInvertedAccessibilityValue() == Settings::ForcedAccessibilityValue::On)
+        isInverted = true;
+    else if (frame.settings().forcedColorsAreInvertedAccessibilityValue() == Settings::ForcedAccessibilityValue::Off)
+        isInverted = false;
+    else
+        isInverted = screenHasInvertedColors();
+
     if (!value)
         return isInverted;
+
     return downcast<CSSPrimitiveValue>(*value).valueID() == (isInverted ? CSSValueInverted : CSSValueNone);
 }
 
@@ -657,16 +675,16 @@
 
 static bool prefersReducedMotionEvaluate(CSSValue* value, const CSSToLengthConversionData&, Frame& frame, MediaFeaturePrefix)
 {
-#if USE(NEW_THEME)
-    bool userPrefersReducedMotion = platformTheme()->userPrefersReducedMotion();
-#else
     bool userPrefersReducedMotion = false;
-#endif
 
-    if (frame.settings().forcedPrefersReducedMotionValue() == Settings::ForcedPrefersReducedMotionValue::On)
+    if (frame.settings().forcedPrefersReducedMotionAccessibilityValue() == Settings::ForcedAccessibilityValue::On)
         userPrefersReducedMotion = true;
-    else if (frame.settings().forcedPrefersReducedMotionValue() == Settings::ForcedPrefersReducedMotionValue::Off)
+    else if (frame.settings().forcedPrefersReducedMotionAccessibilityValue() == Settings::ForcedAccessibilityValue::Off)
         userPrefersReducedMotion = false;
+#if PLATFORM(IOS) || USE(NEW_THEME)
+    else
+        userPrefersReducedMotion = platformTheme()->userPrefersReducedMotion();
+#endif
 
     if (!value)
         return userPrefersReducedMotion;

Modified: trunk/Source/WebCore/page/Settings.h (208898 => 208899)


--- trunk/Source/WebCore/page/Settings.h	2016-11-18 22:29:11 UTC (rev 208898)
+++ trunk/Source/WebCore/page/Settings.h	2016-11-18 22:30:44 UTC (rev 208899)
@@ -98,8 +98,10 @@
 
     void pageDestroyed() { m_page = nullptr; }
 
-    enum class ForcedPrefersReducedMotionValue { System, On, Off };
-    static const Settings::ForcedPrefersReducedMotionValue defaultForcedPrefersReducedMotionValue = ForcedPrefersReducedMotionValue::System;
+    enum class ForcedAccessibilityValue { System, On, Off };
+    static const Settings::ForcedAccessibilityValue defaultForcedColorsAreInvertedAccessibilityValue = ForcedAccessibilityValue::System;
+    static const Settings::ForcedAccessibilityValue defaultForcedDisplayIsMonochromeAccessibilityValue = ForcedAccessibilityValue::System;
+    static const Settings::ForcedAccessibilityValue defaultForcedPrefersReducedMotionAccessibilityValue = ForcedAccessibilityValue::System;
 
     WEBCORE_EXPORT void setStandardFontFamily(const AtomicString&, UScriptCode = USCRIPT_COMMON);
     WEBCORE_EXPORT const AtomicString& standardFontFamily(UScriptCode = USCRIPT_COMMON) const;

Modified: trunk/Source/WebCore/page/Settings.in (208898 => 208899)


--- trunk/Source/WebCore/page/Settings.in	2016-11-18 22:29:11 UTC (rev 208898)
+++ trunk/Source/WebCore/page/Settings.in	2016-11-18 22:30:44 UTC (rev 208899)
@@ -286,7 +286,9 @@
 quickTimePluginReplacementEnabled initial=defaultQuickTimePluginReplacementEnabled
 youTubeFlashPluginReplacementEnabled initial=defaultYouTubeFlashPluginReplacementEnabled
 
-forcedPrefersReducedMotionValue type=ForcedPrefersReducedMotionValue, initial=defaultForcedPrefersReducedMotionValue
+forcedColorsAreInvertedAccessibilityValue type=ForcedAccessibilityValue, initial=defaultForcedColorsAreInvertedAccessibilityValue
+forcedDisplayIsMonochromeAccessibilityValue type=ForcedAccessibilityValue, initial=defaultForcedDisplayIsMonochromeAccessibilityValue
+forcedPrefersReducedMotionAccessibilityValue type=ForcedAccessibilityValue, initial=defaultForcedPrefersReducedMotionAccessibilityValue
 
 asyncImageDecodingEnabled initial=true
 

Modified: trunk/Source/WebCore/testing/InternalSettings.cpp (208898 => 208899)


--- trunk/Source/WebCore/testing/InternalSettings.cpp	2016-11-18 22:29:11 UTC (rev 208898)
+++ trunk/Source/WebCore/testing/InternalSettings.cpp	2016-11-18 22:30:44 UTC (rev 208899)
@@ -97,7 +97,9 @@
     , m_userInterfaceDirectionPolicy(settings.userInterfaceDirectionPolicy())
     , m_systemLayoutDirection(settings.systemLayoutDirection())
     , m_pdfImageCachingPolicy(settings.pdfImageCachingPolicy())
-    , m_forcedPrefersReducedMotionValue(settings.forcedPrefersReducedMotionValue())
+    , m_forcedColorsAreInvertedAccessibilityValue(settings.forcedColorsAreInvertedAccessibilityValue())
+    , m_forcedDisplayIsMonochromeAccessibilityValue(settings.forcedDisplayIsMonochromeAccessibilityValue())
+    , m_forcedPrefersReducedMotionAccessibilityValue(settings.forcedPrefersReducedMotionAccessibilityValue())
 {
 }
 
@@ -177,7 +179,9 @@
     settings.setUserInterfaceDirectionPolicy(m_userInterfaceDirectionPolicy);
     settings.setSystemLayoutDirection(m_systemLayoutDirection);
     settings.setPdfImageCachingPolicy(m_pdfImageCachingPolicy);
-    settings.setForcedPrefersReducedMotionValue(m_forcedPrefersReducedMotionValue);
+    settings.setForcedColorsAreInvertedAccessibilityValue(m_forcedColorsAreInvertedAccessibilityValue);
+    settings.setForcedDisplayIsMonochromeAccessibilityValue(m_forcedDisplayIsMonochromeAccessibilityValue);
+    settings.setForcedPrefersReducedMotionAccessibilityValue(m_forcedPrefersReducedMotionAccessibilityValue);
     Settings::setAllowsAnySSLCertificate(false);
 }
 
@@ -751,38 +755,66 @@
     return { };
 }
 
-InternalSettings::ForcedPrefersReducedMotionValue InternalSettings::forcedPrefersReducedMotionValue() const
+static InternalSettings::ForcedAccessibilityValue settingsToInternalSettingsValue(Settings::ForcedAccessibilityValue value)
 {
-    switch (settings().forcedPrefersReducedMotionValue()) {
-    case Settings::ForcedPrefersReducedMotionValue::System:
-        return InternalSettings::ForcedPrefersReducedMotionValue::System;
-    case Settings::ForcedPrefersReducedMotionValue::On:
-        return InternalSettings::ForcedPrefersReducedMotionValue::On;
-    case Settings::ForcedPrefersReducedMotionValue::Off:
-        return InternalSettings::ForcedPrefersReducedMotionValue::Off;
+    switch (value) {
+    case Settings::ForcedAccessibilityValue::System:
+        return InternalSettings::ForcedAccessibilityValue::System;
+    case Settings::ForcedAccessibilityValue::On:
+        return InternalSettings::ForcedAccessibilityValue::On;
+    case Settings::ForcedAccessibilityValue::Off:
+        return InternalSettings::ForcedAccessibilityValue::Off;
     }
 
     ASSERT_NOT_REACHED();
-    return InternalSettings::ForcedPrefersReducedMotionValue::Off;
+    return InternalSettings::ForcedAccessibilityValue::Off;
 }
 
-void InternalSettings::setForcedPrefersReducedMotionValue(InternalSettings::ForcedPrefersReducedMotionValue value)
+static Settings::ForcedAccessibilityValue internalSettingsToSettingsValue(InternalSettings::ForcedAccessibilityValue value)
 {
     switch (value) {
-    case InternalSettings::ForcedPrefersReducedMotionValue::System:
-        settings().setForcedPrefersReducedMotionValue(Settings::ForcedPrefersReducedMotionValue::System);
-        return;
-    case InternalSettings::ForcedPrefersReducedMotionValue::On:
-        settings().setForcedPrefersReducedMotionValue(Settings::ForcedPrefersReducedMotionValue::On);
-        return;
-    case InternalSettings::ForcedPrefersReducedMotionValue::Off:
-        settings().setForcedPrefersReducedMotionValue(Settings::ForcedPrefersReducedMotionValue::Off);
-        return;
+    case InternalSettings::ForcedAccessibilityValue::System:
+        return Settings::ForcedAccessibilityValue::System;
+    case InternalSettings::ForcedAccessibilityValue::On:
+        return Settings::ForcedAccessibilityValue::On;
+    case InternalSettings::ForcedAccessibilityValue::Off:
+        return Settings::ForcedAccessibilityValue::Off;
     }
 
     ASSERT_NOT_REACHED();
+    return Settings::ForcedAccessibilityValue::Off;
 }
 
+InternalSettings::ForcedAccessibilityValue InternalSettings::forcedColorsAreInvertedAccessibilityValue() const
+{
+    return settingsToInternalSettingsValue(settings().forcedColorsAreInvertedAccessibilityValue());
+}
+
+void InternalSettings::setForcedColorsAreInvertedAccessibilityValue(InternalSettings::ForcedAccessibilityValue value)
+{
+    settings().setForcedColorsAreInvertedAccessibilityValue(internalSettingsToSettingsValue(value));
+}
+
+InternalSettings::ForcedAccessibilityValue InternalSettings::forcedDisplayIsMonochromeAccessibilityValue() const
+{
+    return settingsToInternalSettingsValue(settings().forcedDisplayIsMonochromeAccessibilityValue());
+}
+
+void InternalSettings::setForcedDisplayIsMonochromeAccessibilityValue(InternalSettings::ForcedAccessibilityValue value)
+{
+    settings().setForcedDisplayIsMonochromeAccessibilityValue(internalSettingsToSettingsValue(value));
+}
+
+InternalSettings::ForcedAccessibilityValue InternalSettings::forcedPrefersReducedMotionAccessibilityValue() const
+{
+    return settingsToInternalSettingsValue(settings().forcedPrefersReducedMotionAccessibilityValue());
+}
+
+void InternalSettings::setForcedPrefersReducedMotionAccessibilityValue(InternalSettings::ForcedAccessibilityValue value)
+{
+    settings().setForcedPrefersReducedMotionAccessibilityValue(internalSettingsToSettingsValue(value));
+}
+
 // If you add to this class, make sure that you update the Backup class for test reproducability!
 
 }

Modified: trunk/Source/WebCore/testing/InternalSettings.h (208898 => 208899)


--- trunk/Source/WebCore/testing/InternalSettings.h	2016-11-18 22:29:11 UTC (rev 208898)
+++ trunk/Source/WebCore/testing/InternalSettings.h	2016-11-18 22:30:44 UTC (rev 208899)
@@ -99,9 +99,13 @@
     ExceptionOr<bool> variationFontsEnabled();
     ExceptionOr<void> setVariationFontsEnabled(bool);
 
-    enum class ForcedPrefersReducedMotionValue { System, On, Off };
-    ForcedPrefersReducedMotionValue forcedPrefersReducedMotionValue() const;
-    void setForcedPrefersReducedMotionValue(ForcedPrefersReducedMotionValue);
+    enum class ForcedAccessibilityValue { System, On, Off };
+    ForcedAccessibilityValue forcedColorsAreInvertedAccessibilityValue() const;
+    void setForcedColorsAreInvertedAccessibilityValue(ForcedAccessibilityValue);
+    ForcedAccessibilityValue forcedDisplayIsMonochromeAccessibilityValue() const;
+    void setForcedDisplayIsMonochromeAccessibilityValue(ForcedAccessibilityValue);
+    ForcedAccessibilityValue forcedPrefersReducedMotionAccessibilityValue() const;
+    void setForcedPrefersReducedMotionAccessibilityValue(ForcedAccessibilityValue);
 
     static void setAllowsAnySSLCertificate(bool);
 
@@ -178,7 +182,9 @@
         UserInterfaceDirectionPolicy m_userInterfaceDirectionPolicy;
         TextDirection m_systemLayoutDirection;
         PDFImageCachingPolicy m_pdfImageCachingPolicy;
-        Settings::ForcedPrefersReducedMotionValue m_forcedPrefersReducedMotionValue;
+        Settings::ForcedAccessibilityValue m_forcedColorsAreInvertedAccessibilityValue;
+        Settings::ForcedAccessibilityValue m_forcedDisplayIsMonochromeAccessibilityValue;
+        Settings::ForcedAccessibilityValue m_forcedPrefersReducedMotionAccessibilityValue;
     };
 
     Page* m_page;

Modified: trunk/Source/WebCore/testing/InternalSettings.idl (208898 => 208899)


--- trunk/Source/WebCore/testing/InternalSettings.idl	2016-11-18 22:29:11 UTC (rev 208898)
+++ trunk/Source/WebCore/testing/InternalSettings.idl	2016-11-18 22:30:44 UTC (rev 208899)
@@ -24,7 +24,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-enum ForcedPrefersReducedMotionValue { "system", "on", "off" };
+enum ForcedAccessibilityValue { "system", "on", "off" };
 
 [
     NoInterfaceObject,
@@ -92,7 +92,9 @@
     [MayThrowException] boolean variationFontsEnabled();
     [MayThrowException] void setVariationFontsEnabled(boolean enabled);
 
-    attribute ForcedPrefersReducedMotionValue forcedPrefersReducedMotionValue;
+    attribute ForcedAccessibilityValue forcedColorsAreInvertedAccessibilityValue;
+    attribute ForcedAccessibilityValue forcedDisplayIsMonochromeAccessibilityValue;
+    attribute ForcedAccessibilityValue forcedPrefersReducedMotionAccessibilityValue;
 
     void setInputEventsEnabled(boolean enabled);
 };
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to