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

Side by Side Diff: cc/active_animation.cc

Issue 11145033: cc: Get rid of CC*.h temporary header files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased - fixed the conflicts hopefuly Created 8 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « cc/CCYUVVideoDrawQuad.h ('k') | cc/active_animation_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 6
7 #include "CCActiveAnimation.h" 7 #include "cc/active_animation.h"
8 8
9 #include "CCAnimationCurve.h" 9 #include "cc/animation_curve.h"
10 #include "TraceEvent.h" 10 #include "TraceEvent.h"
11 #ifdef LOG 11 #ifdef LOG
12 #undef LOG 12 #undef LOG
13 #endif 13 #endif
14 #include "base/string_util.h" 14 #include "base/string_util.h"
15 #include <cmath> 15 #include <cmath>
16 16
17 namespace { 17 namespace {
18 18
19 // This should match the RunState enum. 19 // This should match the RunState enum.
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 { 203 {
204 // Currently, we only push changes due to pausing and resuming animations on the main thread. 204 // Currently, we only push changes due to pausing and resuming animations on the main thread.
205 if (m_runState == CCActiveAnimation::Paused || other->m_runState == CCActive Animation::Paused) { 205 if (m_runState == CCActiveAnimation::Paused || other->m_runState == CCActive Animation::Paused) {
206 other->m_runState = m_runState; 206 other->m_runState = m_runState;
207 other->m_pauseTime = m_pauseTime; 207 other->m_pauseTime = m_pauseTime;
208 other->m_totalPausedTime = m_totalPausedTime; 208 other->m_totalPausedTime = m_totalPausedTime;
209 } 209 }
210 } 210 }
211 211
212 } // namespace cc 212 } // namespace cc
OLDNEW
« no previous file with comments | « cc/CCYUVVideoDrawQuad.h ('k') | cc/active_animation_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698