Remove WebKit::Platform dependencies from cc

cc/frame_rate_controller.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "cc/frame_rate_controller.h"
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "cc/delay_based_time_source.h"
 #include "cc/time_source.h"
+#include "cc/thread.h"
 
 namespace {
 
 // This will be the maximum number of pending frames unless
 // FrameRateController::setMaxFramesPending is called.
 const int defaultMaxFramesPending = 2;
 
 }  // namespace
 
 namespace cc {
@@ skipping 17 matching lines @@
 };
 
 FrameRateController::FrameRateController(scoped_refptr<TimeSource> timer)
     : m_client(0)
     , m_numFramesPending(0)
     , m_maxFramesPending(defaultMaxFramesPending)
     , m_timeSource(timer)
     , m_active(false)
     , m_swapBuffersCompleteSupported(true)
     , m_isTimeSourceThrottling(true)
+    , m_thread(0)
+    , m_weakFactory(ALLOW_THIS_IN_INITIALIZER_LIST(this))
 {
     m_timeSourceClientAdapter = FrameRateControllerTimeSourceAdapter::create(this);
     m_timeSource->setClient(m_timeSourceClientAdapter.get());
 }
 
 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 Timer(thread, this))
+    , m_thread(thread)
+    , m_weakFactory(ALLOW_THIS_IN_INITIALIZER_LIST(this))
 {
 }
 
 FrameRateController::~FrameRateController()
 {
     if (m_isTimeSourceThrottling)
         m_timeSource->setActive(false);
 }
 
 void FrameRateController::setActive(bool active)
 {
     if (m_active == active)
         return;
     TRACE_EVENT1("cc", "FrameRateController::setActive", "active", active);
     m_active = active;
 
     if (m_isTimeSourceThrottling)
         m_timeSource->setActive(active);
     else {
         if (active)
             postManualTick();
         else
-            m_manualTicker->stop();
+            m_weakFactory.InvalidateWeakPtrs();
     }
 }
 
 void FrameRateController::setMaxFramesPending(int maxFramesPending)
 {
     DCHECK(maxFramesPending > 0);
     m_maxFramesPending = maxFramesPending;
 }
 
 void FrameRateController::setTimebaseAndInterval(base::TimeTicks timebase, base::TimeDelta interval)
@@ skipping 17 matching lines @@
     if (m_client)
         m_client->vsyncTick(throttled);
 
     if (m_swapBuffersCompleteSupported && !m_isTimeSourceThrottling && m_numFramesPending < m_maxFramesPending)
         postManualTick();
 }
 
 void FrameRateController::postManualTick()
 {
     if (m_active)
-        m_manualTicker->startOneShot(0);
+        m_thread->postTask(base::Bind(&FrameRateController::manualTick, m_weakFactory.GetWeakPtr()));
 }
 
-void FrameRateController::onTimerFired()
+void FrameRateController::manualTick()
 {
     onTimerTick();
 }
 
 void FrameRateController::didBeginFrame()
 {
     if (m_swapBuffersCompleteSupported)
         m_numFramesPending++;
     else if (!m_isTimeSourceThrottling)
         postManualTick();
@@ skipping 15 matching lines @@
 
 base::TimeTicks FrameRateController::nextTickTime()
 {
     if (m_isTimeSourceThrottling)
         return m_timeSource->nextTickTime();
 
     return base::TimeTicks();
 }
 
 }