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

Unified Diff: cc/frame_rate_controller.cc

Issue 11189043: cc: Rename cc classes and members to match filenames (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 side-by-side diff with in-line comments
Download patch
Index: cc/frame_rate_controller.cc
diff --git a/cc/frame_rate_controller.cc b/cc/frame_rate_controller.cc
index 59090d1fbe4d37b871d1b33a3819f4b7dfa7a8fd..f1526b42074f46555383bf04633da6d29947d4d1 100644
--- a/cc/frame_rate_controller.cc
+++ b/cc/frame_rate_controller.cc
@@ -14,32 +14,32 @@
namespace {
// This will be the maximum number of pending frames unless
-// CCFrameRateController::setMaxFramesPending is called.
+// FrameRateController::setMaxFramesPending is called.
const int defaultMaxFramesPending = 2;
} // namespace
namespace cc {
-class CCFrameRateControllerTimeSourceAdapter : public CCTimeSourceClient {
+class FrameRateControllerTimeSourceAdapter : public TimeSourceClient {
public:
- static scoped_ptr<CCFrameRateControllerTimeSourceAdapter> create(CCFrameRateController* frameRateController) {
- return make_scoped_ptr(new CCFrameRateControllerTimeSourceAdapter(frameRateController));
+ static scoped_ptr<FrameRateControllerTimeSourceAdapter> create(FrameRateController* frameRateController) {
+ return make_scoped_ptr(new FrameRateControllerTimeSourceAdapter(frameRateController));
}
- virtual ~CCFrameRateControllerTimeSourceAdapter() {}
+ virtual ~FrameRateControllerTimeSourceAdapter() {}
virtual void onTimerTick() OVERRIDE {
m_frameRateController->onTimerTick();
}
private:
- explicit CCFrameRateControllerTimeSourceAdapter(CCFrameRateController* frameRateController)
+ explicit FrameRateControllerTimeSourceAdapter(FrameRateController* frameRateController)
: m_frameRateController(frameRateController) {}
- CCFrameRateController* m_frameRateController;
+ FrameRateController* m_frameRateController;
};
-CCFrameRateController::CCFrameRateController(scoped_refptr<CCTimeSource> timer)
+FrameRateController::FrameRateController(scoped_refptr<TimeSource> timer)
: m_client(0)
, m_numFramesPending(0)
, m_maxFramesPending(defaultMaxFramesPending)
@@ -48,32 +48,32 @@ CCFrameRateController::CCFrameRateController(scoped_refptr<CCTimeSource> timer)
, m_swapBuffersCompleteSupported(true)
, m_isTimeSourceThrottling(true)
{
- m_timeSourceClientAdapter = CCFrameRateControllerTimeSourceAdapter::create(this);
+ m_timeSourceClientAdapter = FrameRateControllerTimeSourceAdapter::create(this);
m_timeSource->setClient(m_timeSourceClientAdapter.get());
}
-CCFrameRateController::CCFrameRateController(CCThread* thread)
+FrameRateController::FrameRateController(Thread* thread)
: m_client(0)
, m_numFramesPending(0)
, m_maxFramesPending(defaultMaxFramesPending)
, m_active(false)
, m_swapBuffersCompleteSupported(true)
, m_isTimeSourceThrottling(false)
- , m_manualTicker(new CCTimer(thread, this))
+ , m_manualTicker(new Timer(thread, this))
{
}
-CCFrameRateController::~CCFrameRateController()
+FrameRateController::~FrameRateController()
{
if (m_isTimeSourceThrottling)
m_timeSource->setActive(false);
}
-void CCFrameRateController::setActive(bool active)
+void FrameRateController::setActive(bool active)
{
if (m_active == active)
return;
- TRACE_EVENT1("cc", "CCFrameRateController::setActive", "active", active);
+ TRACE_EVENT1("cc", "FrameRateController::setActive", "active", active);
m_active = active;
if (m_isTimeSourceThrottling)
@@ -86,24 +86,24 @@ void CCFrameRateController::setActive(bool active)
}
}
-void CCFrameRateController::setMaxFramesPending(int maxFramesPending)
+void FrameRateController::setMaxFramesPending(int maxFramesPending)
{
ASSERT(maxFramesPending > 0);
m_maxFramesPending = maxFramesPending;
}
-void CCFrameRateController::setTimebaseAndInterval(base::TimeTicks timebase, base::TimeDelta interval)
+void FrameRateController::setTimebaseAndInterval(base::TimeTicks timebase, base::TimeDelta interval)
{
if (m_isTimeSourceThrottling)
m_timeSource->setTimebaseAndInterval(timebase, interval);
}
-void CCFrameRateController::setSwapBuffersCompleteSupported(bool supported)
+void FrameRateController::setSwapBuffersCompleteSupported(bool supported)
{
m_swapBuffersCompleteSupported = supported;
}
-void CCFrameRateController::onTimerTick()
+void FrameRateController::onTimerTick()
{
ASSERT(m_active);
@@ -117,18 +117,18 @@ void CCFrameRateController::onTimerTick()
postManualTick();
}
-void CCFrameRateController::postManualTick()
+void FrameRateController::postManualTick()
{
if (m_active)
m_manualTicker->startOneShot(0);
}
-void CCFrameRateController::onTimerFired()
+void FrameRateController::onTimerFired()
{
onTimerTick();
}
-void CCFrameRateController::didBeginFrame()
+void FrameRateController::didBeginFrame()
{
if (m_swapBuffersCompleteSupported)
m_numFramesPending++;
@@ -136,7 +136,7 @@ void CCFrameRateController::didBeginFrame()
postManualTick();
}
-void CCFrameRateController::didFinishFrame()
+void FrameRateController::didFinishFrame()
{
ASSERT(m_swapBuffersCompleteSupported);
@@ -145,12 +145,12 @@ void CCFrameRateController::didFinishFrame()
postManualTick();
}
-void CCFrameRateController::didAbortAllPendingFrames()
+void FrameRateController::didAbortAllPendingFrames()
{
m_numFramesPending = 0;
}
-base::TimeTicks CCFrameRateController::nextTickTime()
+base::TimeTicks FrameRateController::nextTickTime()
{
if (m_isTimeSourceThrottling)
return m_timeSource->nextTickTime();

Powered by Google App Engine
This is Rietveld 408576698