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

Side by Side Diff: cc/active_animation.cc

Issue 11228059: cc: Remove CC*.h temporary includes, part 6/4. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase - fix conflicts 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/CCThreadedTest.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 <cmath>
10
10 #include "base/debug/trace_event.h" 11 #include "base/debug/trace_event.h"
11 #include "base/string_util.h" 12 #include "base/string_util.h"
12 #include <cmath> 13 #include "cc/animation_curve.h"
13 14
14 namespace { 15 namespace {
15 16
16 // This should match the RunState enum. 17 // This should match the RunState enum.
17 static const char* const s_runStateNames[] = { 18 static const char* const s_runStateNames[] = {
18 "WaitingForNextTick", 19 "WaitingForNextTick",
19 "WaitingForTargetAvailability", 20 "WaitingForTargetAvailability",
20 "WaitingForStartTime", 21 "WaitingForStartTime",
21 "WaitingForDeletion", 22 "WaitingForDeletion",
22 "Running", 23 "Running",
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 { 201 {
201 // Currently, we only push changes due to pausing and resuming animations on the main thread. 202 // Currently, we only push changes due to pausing and resuming animations on the main thread.
202 if (m_runState == ActiveAnimation::Paused || other->m_runState == ActiveAnim ation::Paused) { 203 if (m_runState == ActiveAnimation::Paused || other->m_runState == ActiveAnim ation::Paused) {
203 other->m_runState = m_runState; 204 other->m_runState = m_runState;
204 other->m_pauseTime = m_pauseTime; 205 other->m_pauseTime = m_pauseTime;
205 other->m_totalPausedTime = m_totalPausedTime; 206 other->m_totalPausedTime = m_totalPausedTime;
206 } 207 }
207 } 208 }
208 209
209 } // namespace cc 210 } // namespace cc
OLDNEW
« no previous file with comments | « cc/CCThreadedTest.h ('k') | cc/active_animation_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698