Skip to content

GitLab

T
tangled
Commit 803a72fb authored by Eric Willigers's avatar Eric Willigers Committed by Commit Bot
Browse files
Options

CSS Animation: CSSRotateInterpolationType typo fix 

LHS and RHS of comparison were identical, when we should have been
comparing the current parent rotation with the stored parent rotation.

Added a responsive animation test where the inherited rotation
changes from none.

BUG=806085

Change-Id: I9fc85ff2b7ddd894bd07d03eed90f8c23f26f6e4
Reviewed-on: https://chromium-review.googlesource.com/890682Reviewed-by: default avatarDarren Shen <shend@chromium.org>
Commit-Queue: Eric Willigers <ericwilligers@chromium.org>
Cr-Commit-Position: refs/heads/master@{#532305}
parent 9280456f
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 1 deletion
third_party/WebKit/LayoutTests/animations/responsive/animations-responsive-rotate.html 0 → 100644
View file @ 803a72fb
<!DOCTYPE html>
<script src="../../resources/testharness.js"></script>
<script src="../../resources/testharnessreport.js"></script>
<div id='container'>
<div id='element'></div>
</div>
<script>
var element = document.getElementById('element');
var container = document.getElementById('container');
test(function() {
container.style.rotate = 'none';
var player = element.animate([{rotate: 'inherit'}, {rotate: '100deg'}], 10);
player.pause();
player.currentTime = 2;
container.style.rotate = '200deg';
assert_equals(getComputedStyle(element).rotate, '180deg');
}, 'Rotate responsive to inherited rotate changes');
</script>
third_party/WebKit/Source/core/animation/CSSRotateInterpolationType.cpp
View file @ 803a72fb
......@@ -163,7 +163,7 @@ class InheritedRotationChecker
const InterpolationValue& underlying) const final {
OptionalRotation inherited_rotation = GetRotation(*state.ParentStyle());
if (inherited_rotation_.IsNone() || inherited_rotation.IsNone())
return inherited_rotation.IsNone() == inherited_rotation.IsNone();
return inherited_rotation_.IsNone() == inherited_rotation.IsNone();
return inherited_rotation_.GetRotation().axis ==
inherited_rotation.GetRotation().axis &&
inherited_rotation_.GetRotation().angle ==
......
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