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

Side by Side Diff: cc/active_animation.cc

Issue 11410021: Remove WTF and WebCore from cc/ and webkit/compositor_bindings/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix content_browsertests Created 8 years, 1 month 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/DEPS ('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"
6
7 #include "cc/active_animation.h" 5 #include "cc/active_animation.h"
8 6
9 #include <cmath> 7 #include <cmath>
10 8
11 #include "base/debug/trace_event.h" 9 #include "base/debug/trace_event.h"
12 #include "base/string_util.h" 10 #include "base/string_util.h"
13 #include "cc/animation_curve.h" 11 #include "cc/animation_curve.h"
14 12
15 namespace { 13 namespace {
16 14
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 { 199 {
202 // Currently, we only push changes due to pausing and resuming animations on the main thread. 200 // Currently, we only push changes due to pausing and resuming animations on the main thread.
203 if (m_runState == ActiveAnimation::Paused || other->m_runState == ActiveAnim ation::Paused) { 201 if (m_runState == ActiveAnimation::Paused || other->m_runState == ActiveAnim ation::Paused) {
204 other->m_runState = m_runState; 202 other->m_runState = m_runState;
205 other->m_pauseTime = m_pauseTime; 203 other->m_pauseTime = m_pauseTime;
206 other->m_totalPausedTime = m_totalPausedTime; 204 other->m_totalPausedTime = m_totalPausedTime;
207 } 205 }
208 } 206 }
209 207
210 } // namespace cc 208 } // namespace cc
OLDNEW
« no previous file with comments | « cc/DEPS ('k') | cc/active_animation_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698