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

Side by Side Diff: cc/frame_rate_controller.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/frame_rate_controller.h ('k') | cc/frame_rate_counter.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 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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 "CCFrameRateController.h" 7 #include "CCFrameRateController.h"
8 8
9 #include "CCDelayBasedTimeSource.h" 9 #include "CCDelayBasedTimeSource.h"
10 #include "CCTimeSource.h" 10 #include "cc/time_source.h"
11 #include "TraceEvent.h" 11 #include "TraceEvent.h"
12 #include <wtf/CurrentTime.h> 12 #include <wtf/CurrentTime.h>
13 13
14 namespace { 14 namespace {
15 15
16 // This will be the maximum number of pending frames unless 16 // This will be the maximum number of pending frames unless
17 // CCFrameRateController::setMaxFramesPending is called. 17 // CCFrameRateController::setMaxFramesPending is called.
18 const int defaultMaxFramesPending = 2; 18 const int defaultMaxFramesPending = 2;
19 19
20 } // namespace 20 } // namespace
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 152
153 base::TimeTicks CCFrameRateController::nextTickTime() 153 base::TimeTicks CCFrameRateController::nextTickTime()
154 { 154 {
155 if (m_isTimeSourceThrottling) 155 if (m_isTimeSourceThrottling)
156 return m_timeSource->nextTickTime(); 156 return m_timeSource->nextTickTime();
157 157
158 return base::TimeTicks(); 158 return base::TimeTicks();
159 } 159 }
160 160
161 } 161 }
OLDNEW
« no previous file with comments | « cc/frame_rate_controller.h ('k') | cc/frame_rate_counter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698