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

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

Powered by Google App Engine
This is Rietveld 408576698