Remove WebKit::Platform dependencies from cc

cc/resource_update_controller.cc

 // Copyright 2012 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/resource_update_controller.h"
 
 #include "base/debug/trace_event.h"
 #include "cc/prioritized_texture.h"
 #include "cc/proxy.h"
 #include "cc/resource_provider.h"
 #include "cc/texture_copier.h"
+#include "cc/thread.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/skia/include/gpu/SkGpuDevice.h"
 #include <limits>
 #include <public/WebGraphicsContext3D.h>
 #include <public/WebSharedGraphicsContext3D.h>
 
 using WebKit::WebGraphicsContext3D;
 using WebKit::WebSharedGraphicsContext3D;
 
 namespace {
@@ skipping 40 matching lines @@
 size_t ResourceUpdateController::maxFullUpdatesPerTick(
     ResourceProvider* resourceProvider)
 {
     double texturesPerSecond = resourceProvider->estimatedUploadsPerSecond();
     size_t texturesPerTick = floor(textureUpdateTickRate * texturesPerSecond);
     return texturesPerTick ? texturesPerTick : 1;
 }
 
 ResourceUpdateController::ResourceUpdateController(ResourceUpdateControllerClient* client, Thread* thread, scoped_ptr<ResourceUpdateQueue> queue, ResourceProvider* resourceProvider)
     : m_client(client)
-    , m_timer(new Timer(thread, this))
     , m_queue(queue.Pass())
     , m_resourceProvider(resourceProvider)
     , m_textureUpdatesPerTick(maxFullUpdatesPerTick(resourceProvider))
     , m_firstUpdateAttempt(true)
+    , m_thread(thread)
+    , m_weakFactory(ALLOW_THIS_IN_INITIALIZER_LIST(this))
+    , m_taskPosted(false)
 {
 }
 
 ResourceUpdateController::~ResourceUpdateController()
 {
 }
 
 void ResourceUpdateController::performMoreUpdates(
     base::TimeTicks timeLimit)
 {
     m_timeLimit = timeLimit;
 
     // Update already in progress.
-    if (m_timer->isActive())
+    if (m_taskPosted)
         return;
 
     // Call updateMoreTexturesNow() directly unless it's the first update
     // attempt. This ensures that we empty the update queue in a finite
     // amount of time.
     if (m_firstUpdateAttempt) {
         // Post a 0-delay task when no updates were left. When it runs,
         // readyToFinalizeTextureUpdates() will be called.
-        if (!updateMoreTexturesIfEnoughTimeRemaining())
-            m_timer->startOneShot(0);
+        if (!updateMoreTexturesIfEnoughTimeRemaining()) {
+            m_taskPosted = true;
+            m_thread->postTask(base::Bind(&ResourceUpdateController::onTimerFired,
+                                          m_weakFactory.GetWeakPtr()));
+        }
 
         m_firstUpdateAttempt = false;
     } else
         updateMoreTexturesNow();
 }
 
 void ResourceUpdateController::discardUploadsToEvictedResources()
 {
     m_queue->clearUploadsToEvictedResources();
 }
@@ skipping 102 matching lines @@
         // If we've performed any texture copies, we need to insert a flush
         // here into the compositor context before letting the main thread
         // proceed as it may make draw calls to the source texture of one of
         // our copy operations.
         copier->flush();
     }
 }
 
 void ResourceUpdateController::onTimerFired()
 {
+    m_taskPosted = false;
     ResourceProvider::debugNotifyEnterZone(0xB000000);
     if (!updateMoreTexturesIfEnoughTimeRemaining())
         m_client->readyToFinalizeTextureUpdates();
     ResourceProvider::debugNotifyLeaveZone();
 }
 
 base::TimeTicks ResourceUpdateController::now() const
 {
     return base::TimeTicks::Now();
 }
@@ skipping 12 matching lines @@
 {
     return updateMoreTexturesSize() * maxBlockingUpdateIntervals;
 }
 
 bool ResourceUpdateController::updateMoreTexturesIfEnoughTimeRemaining()
 {
     // Blocking uploads will increase when we're too aggressive in our upload
     // time estimate. We use a different timeout here to prevent unnecessary
     // amounts of idle time when blocking uploads have reached the max.
     if (m_resourceProvider->numBlockingUploads() >= maxBlockingUpdates()) {
-        m_timer->startOneShot(uploaderBusyTickRate);
+        m_taskPosted = true;
+        m_thread->postDelayedTask(base::Bind(&ResourceUpdateController::onTimerFired,
+                                             m_weakFactory.GetWeakPtr()),
+                                 uploaderBusyTickRate * 1000);
         return true;
     }
 
     if (!m_queue->fullUploadSize())
         return false;
 
     bool hasTimeRemaining = m_timeLimit.is_null() ||
         this->now() < m_timeLimit - updateMoreTexturesTime();
     if (hasTimeRemaining)
         updateMoreTexturesNow();
 
     return true;
 }
 
 void ResourceUpdateController::updateMoreTexturesNow()
 {
     size_t uploads = std::min(
         m_queue->fullUploadSize(), updateMoreTexturesSize());
-    m_timer->startOneShot(
-        updateMoreTexturesTime().InSecondsF() / updateMoreTexturesSize() *
-        uploads);
+    m_taskPosted = true;
+    m_thread->postDelayedTask(base::Bind(&ResourceUpdateController::onTimerFired,
+                                         m_weakFactory.GetWeakPtr()),
+                              updateMoreTexturesTime().InSecondsF() / updateMoreTexturesSize() * uploads * 1000);
 
     if (!uploads)
         return;
 
     size_t uploadCount = 0;
     while (m_queue->fullUploadSize() && uploadCount < uploads) {
         if (!(uploadCount % textureUploadFlushPeriod) && uploadCount)
             m_resourceProvider->shallowFlushIfSupported();
         updateTexture(m_queue->takeFirstFullUpload());
         uploadCount++;
     }
     m_resourceProvider->shallowFlushIfSupported();
 }
 
 }  // namespace cc