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

Side by Side Diff: sky/engine/core/animation/css/CSSAnimations.cpp

Issue 768493002: Get rid of CompositingState. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: fix incorrect case. Created 6 years 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 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 { 291 {
292 if (!m_pendingUpdate) { 292 if (!m_pendingUpdate) {
293 m_previousActiveInterpolationsForAnimations.clear(); 293 m_previousActiveInterpolationsForAnimations.clear();
294 return; 294 return;
295 } 295 }
296 296
297 OwnPtr<CSSAnimationUpdate> update = m_pendingUpdate.release(); 297 OwnPtr<CSSAnimationUpdate> update = m_pendingUpdate.release();
298 298
299 m_previousActiveInterpolationsForAnimations.swap(update->activeInterpolation sForAnimations()); 299 m_previousActiveInterpolationsForAnimations.swap(update->activeInterpolation sForAnimations());
300 300
301 // FIXME: cancelling, pausing, unpausing animations all query compositingSta te, which is not necessarily up to date here
302 // since we call this from recalc style.
303 // https://code.google.com/p/chromium/issues/detail?id=339847
304 DisableCompositingQueryAsserts disabler;
305
306 for (Vector<AtomicString>::const_iterator iter = update->cancelledAnimationN ames().begin(); iter != update->cancelledAnimationNames().end(); ++iter) { 301 for (Vector<AtomicString>::const_iterator iter = update->cancelledAnimationN ames().begin(); iter != update->cancelledAnimationNames().end(); ++iter) {
307 RefPtr<AnimationPlayer> player = m_animations.take(*iter); 302 RefPtr<AnimationPlayer> player = m_animations.take(*iter);
308 player->cancel(); 303 player->cancel();
309 player->update(TimingUpdateOnDemand); 304 player->update(TimingUpdateOnDemand);
310 } 305 }
311 306
312 for (Vector<AtomicString>::const_iterator iter = update->animationsWithPause Toggled().begin(); iter != update->animationsWithPauseToggled().end(); ++iter) { 307 for (Vector<AtomicString>::const_iterator iter = update->animationsWithPause Toggled().begin(); iter != update->animationsWithPauseToggled().end(); ++iter) {
313 AnimationPlayer* player = m_animations.get(*iter); 308 AnimationPlayer* player = m_animations.get(*iter);
314 if (player->paused()) 309 if (player->paused())
315 player->unpause(); 310 player->unpause();
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
687 case CSSPropertyWebkitTransitionDuration: 682 case CSSPropertyWebkitTransitionDuration:
688 case CSSPropertyWebkitTransitionProperty: 683 case CSSPropertyWebkitTransitionProperty:
689 case CSSPropertyWebkitTransitionTimingFunction: 684 case CSSPropertyWebkitTransitionTimingFunction:
690 return false; 685 return false;
691 default: 686 default:
692 return true; 687 return true;
693 } 688 }
694 } 689 }
695 690
696 } // namespace blink 691 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698