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

Side by Side Diff: third_party/WebKit/Source/core/animation/ElementAnimations.cpp

Issue 1602343002: compositor-worker: cc->blink mutation plumbing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@compositor-worker-ian-patch
Patch Set: Use animation machinery instead of updating inline style 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 94
95 void ElementAnimations::restartAnimationOnCompositor() 95 void ElementAnimations::restartAnimationOnCompositor()
96 { 96 {
97 for (const auto& entry : m_animations) 97 for (const auto& entry : m_animations)
98 entry.key->restartAnimationOnCompositor(); 98 entry.key->restartAnimationOnCompositor();
99 } 99 }
100 100
101 DEFINE_TRACE(ElementAnimations) 101 DEFINE_TRACE(ElementAnimations)
102 { 102 {
103 visitor->trace(m_cssAnimations); 103 visitor->trace(m_cssAnimations);
104 visitor->trace(m_compositorMutationAnimations);
104 visitor->trace(m_animationStack); 105 visitor->trace(m_animationStack);
105 visitor->trace(m_animations); 106 visitor->trace(m_animations);
106 #if !ENABLE(OILPAN) 107 #if !ENABLE(OILPAN)
107 visitor->trace(m_effects); 108 visitor->trace(m_effects);
108 #endif 109 #endif
109 } 110 }
110 111
111 const ComputedStyle* ElementAnimations::baseComputedStyle() const 112 const ComputedStyle* ElementAnimations::baseComputedStyle() const
112 { 113 {
113 #if !ENABLE(ASSERT) 114 #if !ENABLE(ASSERT)
(...skipping 26 matching lines...) Expand all
140 // TODO(rune@opera.com): The FontFaceCache version number may be increased w ithout forcing 141 // TODO(rune@opera.com): The FontFaceCache version number may be increased w ithout forcing
141 // a style recalc (see crbug.com/471079). ComputedStyle objects created with different cache 142 // a style recalc (see crbug.com/471079). ComputedStyle objects created with different cache
142 // versions will not be considered equal as Font::operator== will compare ve rsions, hence 143 // versions will not be considered equal as Font::operator== will compare ve rsions, hence
143 // ComputedStyle::operator== will return false. We avoid using baseComputedS tyle (the check for 144 // ComputedStyle::operator== will return false. We avoid using baseComputedS tyle (the check for
144 // isFallbackValid()) in that case to avoid triggering the ComputedStyle com parison ASSERT 145 // isFallbackValid()) in that case to avoid triggering the ComputedStyle com parison ASSERT
145 // in updateBaseComputedStyle. 146 // in updateBaseComputedStyle.
146 return m_animationStyleChange && (!m_baseComputedStyle || m_baseComputedStyl e->font().isFallbackValid()); 147 return m_animationStyleChange && (!m_baseComputedStyle || m_baseComputedStyl e->font().isFallbackValid());
147 } 148 }
148 149
149 } // namespace blink 150 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698