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

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

Issue 1663963004: Blink Compositor Animation: Use PassOwnPtr in CompositorFactory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@curves
Patch Set: 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/animation/AnimationTimeline.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 904 matching lines...) Expand 10 before | Expand all | Expand 10 after
915 void Animation::endUpdatingState() 915 void Animation::endUpdatingState()
916 { 916 {
917 ASSERT(m_stateIsBeingUpdated); 917 ASSERT(m_stateIsBeingUpdated);
918 m_stateIsBeingUpdated = false; 918 m_stateIsBeingUpdated = false;
919 } 919 }
920 920
921 void Animation::createCompositorPlayer() 921 void Animation::createCompositorPlayer()
922 { 922 {
923 if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled() && Platfor m::current()->isThreadedAnimationEnabled() && !m_compositorPlayer) { 923 if (RuntimeEnabledFeatures::compositorAnimationTimelinesEnabled() && Platfor m::current()->isThreadedAnimationEnabled() && !m_compositorPlayer) {
924 ASSERT(Platform::current()->compositorSupport()); 924 ASSERT(Platform::current()->compositorSupport());
925 m_compositorPlayer = adoptPtr(CompositorFactory::current().createAnimati onPlayer()); 925 m_compositorPlayer = CompositorFactory::current().createAnimationPlayer( );
926 ASSERT(m_compositorPlayer); 926 ASSERT(m_compositorPlayer);
927 m_compositorPlayer->setAnimationDelegate(this); 927 m_compositorPlayer->setAnimationDelegate(this);
928 attachCompositorTimeline(); 928 attachCompositorTimeline();
929 } 929 }
930 930
931 attachCompositedLayers(); 931 attachCompositedLayers();
932 } 932 }
933 933
934 void Animation::destroyCompositorPlayer() 934 void Animation::destroyCompositorPlayer()
935 { 935 {
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
1096 visitor->trace(m_content); 1096 visitor->trace(m_content);
1097 visitor->trace(m_timeline); 1097 visitor->trace(m_timeline);
1098 visitor->trace(m_pendingFinishedEvent); 1098 visitor->trace(m_pendingFinishedEvent);
1099 visitor->trace(m_finishedPromise); 1099 visitor->trace(m_finishedPromise);
1100 visitor->trace(m_readyPromise); 1100 visitor->trace(m_readyPromise);
1101 RefCountedGarbageCollectedEventTargetWithInlineData<Animation>::trace(visito r); 1101 RefCountedGarbageCollectedEventTargetWithInlineData<Animation>::trace(visito r);
1102 ActiveDOMObject::trace(visitor); 1102 ActiveDOMObject::trace(visitor);
1103 } 1103 }
1104 1104
1105 } // namespace blink 1105 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/animation/AnimationTimeline.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698