diff options
author | bors-servo <servo-ops@mozilla.com> | 2020-06-16 03:25:29 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-16 03:25:29 -0400 |
commit | ba5568a0a60cbd4bbedd3b766b7182824d75b131 (patch) | |
tree | ebf1b7c38ff7d98f195b331c81fbcb88287393f0 /components/layout_2020/flow | |
parent | 19c1f72eb2fe5178311161b6c85a67956a5a69b3 (diff) | |
parent | 4a3995bb375d43d53666a348ec0c08065784f6ea (diff) | |
download | servo-ba5568a0a60cbd4bbedd3b766b7182824d75b131.tar.gz servo-ba5568a0a60cbd4bbedd3b766b7182824d75b131.zip |
Auto merge of #26921 - mrobinson:animation-set-key, r=jdm
Add DocumentAnimationSet and AnimationSetKey
This will be used in order to hold animations for pseudo elements in the
DocumentAnimationSet. Also no longer store the OpaqueNode in the
animation and transition data structures. This is already part of the
DocumentAnimationSet key.
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes do not require tests because they should not change behavior.
<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
Diffstat (limited to 'components/layout_2020/flow')
-rw-r--r-- | components/layout_2020/flow/root.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/components/layout_2020/flow/root.rs b/components/layout_2020/flow/root.rs index 46b7cf8438c..55c325a3cd0 100644 --- a/components/layout_2020/flow/root.rs +++ b/components/layout_2020/flow/root.rs @@ -35,6 +35,7 @@ use gfx_traits::print_tree::PrintTree; use script_layout_interface::wrapper_traits::LayoutNode; use script_layout_interface::{LayoutElementType, LayoutNodeType}; use servo_arc::Arc; +use style::animation::AnimationSetKey; use style::dom::OpaqueNode; use style::properties::ComputedValues; use style::values::computed::Length; @@ -446,10 +447,10 @@ impl FragmentTree { }) } - pub fn remove_nodes_in_fragment_tree_from_set(&self, set: &mut FxHashSet<OpaqueNode>) { + pub fn remove_nodes_in_fragment_tree_from_set(&self, set: &mut FxHashSet<AnimationSetKey>) { self.find(|fragment, _| { if let Some(tag) = fragment.tag().as_ref() { - set.remove(&tag.node()); + set.remove(&AnimationSetKey(tag.node())); } None::<()> }); |