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

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: Merge master + s/scoped_ptr/unique_ptr/ Created 4 years, 8 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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 78
79 void ElementAnimations::restartAnimationOnCompositor() 79 void ElementAnimations::restartAnimationOnCompositor()
80 { 80 {
81 for (const auto& entry : m_animations) 81 for (const auto& entry : m_animations)
82 entry.key->restartAnimationOnCompositor(); 82 entry.key->restartAnimationOnCompositor();
83 } 83 }
84 84
85 DEFINE_TRACE(ElementAnimations) 85 DEFINE_TRACE(ElementAnimations)
86 { 86 {
87 visitor->trace(m_cssAnimations); 87 visitor->trace(m_cssAnimations);
88 visitor->trace(m_customCompositorAnimations);
88 visitor->trace(m_animationStack); 89 visitor->trace(m_animationStack);
89 visitor->trace(m_animations); 90 visitor->trace(m_animations);
90 } 91 }
91 92
92 const ComputedStyle* ElementAnimations::baseComputedStyle() const 93 const ComputedStyle* ElementAnimations::baseComputedStyle() const
93 { 94 {
94 #if !ENABLE(ASSERT) 95 #if !ENABLE(ASSERT)
95 if (isAnimationStyleChange()) 96 if (isAnimationStyleChange())
96 return m_baseComputedStyle.get(); 97 return m_baseComputedStyle.get();
97 #endif 98 #endif
(...skipping 23 matching lines...) Expand all
121 // TODO(rune@opera.com): The FontFaceCache version number may be increased w ithout forcing 122 // TODO(rune@opera.com): The FontFaceCache version number may be increased w ithout forcing
122 // a style recalc (see crbug.com/471079). ComputedStyle objects created with different cache 123 // a style recalc (see crbug.com/471079). ComputedStyle objects created with different cache
123 // versions will not be considered equal as Font::operator== will compare ve rsions, hence 124 // versions will not be considered equal as Font::operator== will compare ve rsions, hence
124 // ComputedStyle::operator== will return false. We avoid using baseComputedS tyle (the check for 125 // ComputedStyle::operator== will return false. We avoid using baseComputedS tyle (the check for
125 // isFallbackValid()) in that case to avoid triggering the ComputedStyle com parison ASSERT 126 // isFallbackValid()) in that case to avoid triggering the ComputedStyle com parison ASSERT
126 // in updateBaseComputedStyle. 127 // in updateBaseComputedStyle.
127 return m_animationStyleChange && (!m_baseComputedStyle || m_baseComputedStyl e->font().isFallbackValid()); 128 return m_animationStyleChange && (!m_baseComputedStyle || m_baseComputedStyl e->font().isFallbackValid());
128 } 129 }
129 130
130 } // namespace blink 131 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/animation/ElementAnimations.h ('k') | third_party/WebKit/Source/core/core.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698