Unreviewed, rolling out r226385.
authorjlewis3@apple.com <jlewis3@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 8 Jan 2018 22:35:59 +0000 (22:35 +0000)
committerjlewis3@apple.com <jlewis3@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 8 Jan 2018 22:35:59 +0000 (22:35 +0000)
The test introduced with this was a flaky since being added.

Reverted changeset:

"AX: when invert colors is on, double-invert certain media
elements in UserAgentStyleSheet"
https://bugs.webkit.org/show_bug.cgi?id=168447
https://trac.webkit.org/changeset/226385

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@226541 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/TestExpectations
LayoutTests/accessibility/smart-invert-expected.txt [deleted file]
LayoutTests/accessibility/smart-invert-reference-expected.html [deleted file]
LayoutTests/accessibility/smart-invert-reference.html [deleted file]
LayoutTests/accessibility/smart-invert.html [deleted file]
LayoutTests/platform/ios-wk2/TestExpectations
LayoutTests/platform/mac-wk2/TestExpectations
Source/WebCore/ChangeLog
Source/WebCore/Modules/modern-media-controls/controls/media-controls.css
Source/WebCore/css/html.css

index f7f96a4..0169a74 100644 (file)
@@ -1,3 +1,16 @@
+2018-01-08  Matt Lewis  <jlewis3@apple.com>
+
+        Unreviewed, rolling out r226385.
+
+        The test introduced with this was a flaky since being added.
+
+        Reverted changeset:
+
+        "AX: when invert colors is on, double-invert certain media
+        elements in UserAgentStyleSheet"
+        https://bugs.webkit.org/show_bug.cgi?id=168447
+        https://trac.webkit.org/changeset/226385
+
 2018-01-08  Ryan Haddad  <ryanhaddad@apple.com>
 
         Skip http/tests/resourceLoadStatistics/clear-in-memory-and-persistent-store.html
index b24cafc..d43e541 100644 (file)
@@ -118,8 +118,6 @@ editing/selection/character-granularity-rect.html [ Skip ]
 editing/input/focus-change-with-marked-text.html [ Skip ]
 
 # These only run on Mac and iOS WK2
-accessibility/smart-invert.html [ Skip ]
-accessibility/smart-invert-reference.html [ Skip ]
 fast/media/mq-inverted-colors-live-update.html [ Skip ]
 fast/media/mq-inverted-colors-live-update-in-subframes.html [ Skip ]
 fast/media/mq-monochrome-live-update.html [ Skip ]
diff --git a/LayoutTests/accessibility/smart-invert-expected.txt b/LayoutTests/accessibility/smart-invert-expected.txt
deleted file mode 100644 (file)
index 242b0cf..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-       
-       
-      
-DEFAULTS
-PASS: filter for IMG#a is 'none'.
-PASS: filter for PICTURE#b is 'none'.
-PASS: filter for VIDEO#c is 'none'.
-PASS: filter for VIDEO#d is 'none'.
-PASS: filter for IMG.no-invert is 'none'.
-PASS: filter for PICTURE.no-invert is 'none'.
-PASS: filter for VIDEO.no-invert is 'none'.
-PASS: filter for VIDEO.no-invert is 'none'.
-PASS: filter for IMG.preserve-filter is 'blur(3px)'.
-PASS: filter for PICTURE.preserve-filter is 'blur(3px)'.
-PASS: filter for VIDEO.preserve-filter is 'blur(3px)'.
-PASS: filter for VIDEO.preserve-filter is 'blur(3px)'.
-
-AFTER INVERT-COLORS IS APPLIED
-PASS: filter for IMG#a is 'none'. Change once IMG/PICTURE elements are inverted, too.
-PASS: filter for PICTURE#b is 'none'. Change once IMG/PICTURE elements are inverted, too.
-PASS: filter for VIDEO#c is 'invert(1)'.
-PASS: filter for VIDEO#d is 'invert(1)'.
-PASS: filter for IMG.fallback is 'none'.
-PASS: filter for IMG.no-invert is 'none'.
-PASS: filter for PICTURE.no-invert is 'none'.
-PASS: filter for VIDEO.no-invert is 'none'.
-PASS: filter for VIDEO.no-invert is 'none'.
-PASS: filter for IMG.preserve-filter is 'blur(3px)'.
-PASS: filter for PICTURE.preserve-filter is 'blur(3px)'.
-PASS: filter for VIDEO.preserve-filter is 'blur(3px)'.
-PASS: filter for VIDEO.preserve-filter is 'blur(3px)'.
-
diff --git a/LayoutTests/accessibility/smart-invert-reference-expected.html b/LayoutTests/accessibility/smart-invert-reference-expected.html
deleted file mode 100644 (file)
index 15165b7..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-<head>
-<title>Smart Invert Images and Video Test</title>
-<style type="text/css">
-    /* Testing explicit author overrides. */
-    .invert { filter: invert(1); }
-    .no-invert { filter: none; }
-    .preserve-filter { filter: blur(3px); }
-    #result { position: absolute; top: -5000px; }
-</style>
-</head>
-<body>
-
-  <img src="../compositing/resources/simple_image.png" alt="">
-  <picture><img class="fallback" src="../compositing/resources/simple_image.png" alt=""></picture>
-  <video class="invert" poster="../compositing/resources/simple_image.png"></video>
-  <video class="invert" poster="../compositing/resources/simple_image.png" controls></video>
-  <br>
-  <img class="no-invert" src="../compositing/resources/simple_image.png">
-  <picture class="no-invert"><img class="fallback" src="../compositing/resources/simple_image.png" alt=""></picture>
-  <video class="no-invert" poster="../compositing/resources/simple_image.png"></video>
-  <video class="no-invert" poster="../compositing/resources/simple_image.png" controls></video>
-  <br>
-  <img class="preserve-filter" src="../compositing/resources/simple_image.png" alt="">
-  <picture class="preserve-filter"><img class="fallback" src="../compositing/resources/simple_image.png" alt=""></picture>
-  <video class="preserve-filter" poster="../compositing/resources/simple_image.png"></video>
-  <video class="preserve-filter" poster="../compositing/resources/simple_image.png" controls></video>
-  
-  <div id="result"></div>
-</body>
-</html>
diff --git a/LayoutTests/accessibility/smart-invert-reference.html b/LayoutTests/accessibility/smart-invert-reference.html
deleted file mode 100644 (file)
index f992c0a..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-<html>
-<head>
-<title>Smart Invert Images and Video Ref Test</title>
-<style type="text/css">
-    /* Testing explicit author overrides. */
-    .no-invert { filter: none; }
-    .preserve-filter { filter: blur(3px); }
-</style>
-<script>
-if (window.testRunner)
-    testRunner.waitUntilDone();
-
-const NONE_VALUE = "none";
-const INVERTED_VALUE = "invert(1)";
-const PRESERVED_VALUE = "blur(3px)";
-
-function getUIScript() {
-    return `
-    (function() {
-        uiController.simulateAccessibilitySettingsChangeNotification(function() {
-            uiController.uiScriptComplete("Done");
-        });
-    })();`
-}
-
-function runTest() {
-    if (!window.internals)
-        return;
-    window.internals.settings.forcedColorsAreInvertedAccessibilityValue = "on";
-    if (testRunner.runUIScript) {
-        testRunner.runUIScript(getUIScript(), function(result) {
-            testRunner.notifyDone();
-        });
-    }
-}
-window.addEventListener("load", runTest, false);
-</script>
-</head>
-<body>
-
-  <img id="a" src="../compositing/resources/simple_image.png" alt="">
-  <picture id="b"><img class="fallback" src="../compositing/resources/simple_image.png" alt=""></picture>
-  <video id="c" poster="../compositing/resources/simple_image.png"></video>
-  <video id="d" poster="../compositing/resources/simple_image.png" controls></video>
-  <br>
-  <img class="no-invert" src="../compositing/resources/simple_image.png">
-  <picture class="no-invert"><img class="fallback" src="../compositing/resources/simple_image.png" alt=""></picture>
-  <video class="no-invert" poster="../compositing/resources/simple_image.png"></video>
-  <video class="no-invert" poster="../compositing/resources/simple_image.png" controls></video>
-  <br>
-  <img class="preserve-filter" src="../compositing/resources/simple_image.png" alt="">
-  <picture class="preserve-filter"><img class="fallback" src="../compositing/resources/simple_image.png" alt=""></picture>
-  <video class="preserve-filter" poster="../compositing/resources/simple_image.png"></video>
-  <video class="preserve-filter" poster="../compositing/resources/simple_image.png" controls></video>
-  
-  <div id="result"></div>
-</body>
-</html>
diff --git a/LayoutTests/accessibility/smart-invert.html b/LayoutTests/accessibility/smart-invert.html
deleted file mode 100644 (file)
index 58a5407..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-<html>
-<head>
-<title>Smart Invert Images and Video Test</title>
-<style type="text/css">
-    /* Testing explicit author overrides. */
-    .no-invert { filter: none; }
-    .preserve-filter { filter: blur(3px); }
-</style>
-<script>
-if (window.testRunner)
-    testRunner.waitUntilDone();
-
-const NONE_VALUE = "none";
-const INVERTED_VALUE = "invert(1)";
-const PRESERVED_VALUE = "blur(3px)";
-
-function getUIScript() {
-    return `
-    (function() {
-        uiController.simulateAccessibilitySettingsChangeNotification(function() {
-            uiController.uiScriptComplete("Done");
-        });
-    })();`
-}
-
-function expectFilterValueForElements(value, elements, msg) {
-    if (typeof msg !== "string")
-        msg = "";
-    let result = document.getElementById("result");
-    for (el of elements) {
-        var filter = window.getComputedStyle(el).filter;
-        var resultString = filter === value ? "PASS" : "FAIL";
-        resultString += ": filter for " + el.tagName;
-        resultString += el.id ? "#" + el.id : "";
-        resultString += el.className ? "." + el.className : "";
-        resultString += " is '" + filter + "'.";
-        resultString += filter !== value ? "Expected: '" + value + "'." : "";
-        resultString += msg ? " " + msg : "";
-        resultString += "<br>";
-        result.innerHTML += resultString;
-    }
-}
-
-function runTest() {
-    if (!window.internals)
-        return;
-
-    document.getElementById("result").innerHTML += "DEFAULTS<br>";
-
-    // Elements img, picture, video should not be inverted by default.
-    expectFilterValueForElements(NONE_VALUE, document.querySelectorAll("#a, #b, #c, #d, .no-invert"));
-
-    // Verify default for elements with author-provided filter values.
-    expectFilterValueForElements(PRESERVED_VALUE, document.querySelectorAll(".preserve-filter"));
-
-    window.internals.settings.forcedColorsAreInvertedAccessibilityValue = "on";
-    
-    if (testRunner.runUIScript) {
-        testRunner.runUIScript(getUIScript(), function(result) {
-
-            document.getElementById("result").innerHTML += "<br>AFTER INVERT-COLORS IS APPLIED<br>";
-
-            // Eventually elements img amd picture will be double-inverted when invert colors is on. Not shipping yet.
-            expectFilterValueForElements(NONE_VALUE, document.querySelectorAll("#a, #b"), "Change once IMG/PICTURE elements are inverted, too.");
-
-            // Element <video> should be double-inverted when invert colors is on.
-            expectFilterValueForElements(INVERTED_VALUE, document.querySelectorAll("#c, #d"));            
-
-            // Verify it is not applied to nested picture>img (fallback images).
-            expectFilterValueForElements(NONE_VALUE, document.querySelectorAll("#b > img"));
-
-            // Author overrides should be supported.
-            expectFilterValueForElements(NONE_VALUE, document.querySelectorAll(".no-invert"));
-            expectFilterValueForElements(PRESERVED_VALUE, document.querySelectorAll(".preserve-filter"));
-            
-            testRunner.dumpAsText();
-            testRunner.notifyDone();
-        });
-    }
-}
-
-window.addEventListener("load", runTest, false);
-</script>
-</head>
-<body>
-
-  <img id="a">
-  <picture id="b"><img class="fallback"></picture>
-  <video id="c"></video>
-  <video id="d" controls></video>
-  <br>
-  <img class="no-invert">
-  <picture class="no-invert"><img class="fallback" alt=""></picture>
-  <video class="no-invert"></video>
-  <video class="no-invert" controls></video>
-  <br>
-  <img class="preserve-filter" alt="">
-  <picture class="preserve-filter"><img class="fallback" alt=""></picture>
-  <video class="preserve-filter"></video>
-  <video class="preserve-filter" controls></video>
-  
-  <div id="result"></div>
-</body>
-</html>
index 3ea0ef8..cd9a829 100644 (file)
@@ -15,8 +15,6 @@ scrollingcoordinator/ios [ Pass ]
 tiled-drawing/ios [ Pass ]
 editing/selection/character-granularity-rect.html [ Pass ]
 
-accessibility/smart-invert.html [ Pass ]
-accessibility/smart-invert-reference.html [ Pass ]
 fast/media/mq-inverted-colors-live-update.html [ Pass ]
 fast/media/mq-inverted-colors-live-update-in-subframes.html [ Pass ]
 fast/media/mq-monochrome-live-update.html [ Pass ]
index 3a42785..7e0824c 100644 (file)
@@ -13,8 +13,6 @@ swipe [ Pass ]
 fast/events/autoscroll-when-zoomed.html [ Pass ]
 fast/events/autoscroll-main-document.html [ Pass ]
 
-accessibility/smart-invert.html [ Pass ]
-accessibility/smart-invert-reference.html [ Pass ]
 fast/media/mq-inverted-colors-live-update.html [ Pass ]
 fast/media/mq-inverted-colors-live-update-in-subframes.html [ Pass ]
 fast/media/mq-monochrome-live-update.html [ Pass ]
index ad04c59..aea087b 100644 (file)
@@ -1,3 +1,16 @@
+2018-01-08  Matt Lewis  <jlewis3@apple.com>
+
+        Unreviewed, rolling out r226385.
+
+        The test introduced with this was a flaky since being added.
+
+        Reverted changeset:
+
+        "AX: when invert colors is on, double-invert certain media
+        elements in UserAgentStyleSheet"
+        https://bugs.webkit.org/show_bug.cgi?id=168447
+        https://trac.webkit.org/changeset/226385
+
 2018-01-08  Youenn Fablet  <youenn@apple.com>
 
         SWClientConnection should not keep references to service worker jobs
index 464c111..8c53772 100644 (file)
     from { opacity: 0 }
     to   { opacity: 1 }
 }
-
-/* Default support for "Smart Invert" where all content color except media is inverted. */ 
-@media (inverted-colors) {
-    :host { filter: invert(100%); } /* WebKit native audio and video. */
-    picture { filter: none; } /* Don't invert the control buttons. */
-}
\ No newline at end of file
index f9c7499..f9fc6d9 100644 (file)
@@ -1236,7 +1236,3 @@ attachment {
 
 /* noscript is handled internally, as it depends on settings. */
 
-/* Default support for "Smart Invert" where all content color except media is inverted. */ 
-@media (inverted-colors) {
-    video { filter: invert(100%); }  /* Only videos double-inverted for now. */
-}