Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(39)

Unified Diff: third_party/WebKit/LayoutTests/compositing/squashing/dont-squash-into-animated-layers.html

Issue 1730653002: Move squash preventing reasons out of compositing reasons (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Bug and test fixes. Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/compositing/squashing/dont-squash-into-blend-mode.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/LayoutTests/compositing/squashing/dont-squash-into-animated-layers.html
diff --git a/third_party/WebKit/LayoutTests/compositing/squashing/dont-squash-into-animated-layers.html b/third_party/WebKit/LayoutTests/compositing/squashing/dont-squash-into-animated-layers.html
index 7b2c5d5c95154eabaaf33c17629d198ed76d67ba..006e4ed632d1fea1e6ddb376349dac4b2bd81628 100644
--- a/third_party/WebKit/LayoutTests/compositing/squashing/dont-squash-into-animated-layers.html
+++ b/third_party/WebKit/LayoutTests/compositing/squashing/dont-squash-into-animated-layers.html
@@ -1,21 +1,31 @@
<!doctype HTML>
Any errors will show below this line.
-<div id="target" style="position: absolute; width: 200px; height: 200px; will-change: transform; transition: transform 0.1s cubic-bezier(0.23, 1, 0.32, 1); background: lightblue"></div>
+<style>
+@keyframes twiddle {
+ 0% { transform: rotate(0deg); }
+ 100% { transform: rotate(180deg); }
+}
+
+.animated {
+ animation: twiddle 3s alternate infinite linear;
+ width: 100px;
+ height: 100px;
+ background: orange;
+}
+</style>
+<div id="target" class="animated" style="position: absolute; width: 200px; height: 200px; background: lightblue"></div>
<div style="position: absolute; width: 200px; height: 200px; top: 100px; left: 100px; background: lightgray"></div>
<script src="../../resources/testharness.js"></script>
<script>
if (window.testRunner) {
testRunner.dumpAsText();
- testRunner.waitUntilDone();
}
onload = function() {
target.style.transform = "translateX(10px)";
- requestAnimationFrame(function() {
- if (window.internals) {
- var layers = JSON.parse(internals.layerTreeAsText(document, 1));
- assert_true(layers.children[0].children[1].compositingReasons[1] == "Cannot squash into a layer that is animating.");
- }
- testRunner.notifyDone();
- });
+ if (window.internals) {
+ var layers = JSON.parse(internals.layerTreeAsText(document, 1));
+ assert_true(layers.children[0].children[1].compositingReasons[1] == "Layer was separately composited because it could not be squashed.");
+ assert_true(layers.children[0].children[1].squashingDisallowedReasons[0] == "Cannot squash into a layer that is animating.");
+ }
};
-</script>
+</script>
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/compositing/squashing/dont-squash-into-blend-mode.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698