Index: cc/texture_update_controller.cc |
diff --git a/cc/texture_update_controller.cc b/cc/texture_update_controller.cc |
index 1a28ab92d6cbf0be56672b8f1ebab284e0b74a3a..b11c4ed2790352357cf5bc0191f10d86a31f4f5f 100644 |
--- a/cc/texture_update_controller.cc |
+++ b/cc/texture_update_controller.cc |
@@ -34,21 +34,21 @@ const size_t maxBlockingUpdateIntervals = 4; |
namespace cc { |
-size_t CCTextureUpdateController::maxPartialTextureUpdates() |
+size_t TextureUpdateController::maxPartialTextureUpdates() |
{ |
return partialTextureUpdatesMax; |
} |
-size_t CCTextureUpdateController::maxFullUpdatesPerTick(TextureUploader* uploader) |
+size_t TextureUpdateController::maxFullUpdatesPerTick(TextureUploader* uploader) |
{ |
double texturesPerSecond = uploader->estimatedTexturesPerSecond(); |
size_t texturesPerTick = floor(textureUpdateTickRate * texturesPerSecond); |
return texturesPerTick ? texturesPerTick : 1; |
} |
-CCTextureUpdateController::CCTextureUpdateController(CCTextureUpdateControllerClient* client, CCThread* thread, scoped_ptr<CCTextureUpdateQueue> queue, CCResourceProvider* resourceProvider, TextureUploader* uploader) |
+TextureUpdateController::TextureUpdateController(TextureUpdateControllerClient* client, Thread* thread, scoped_ptr<TextureUpdateQueue> queue, ResourceProvider* resourceProvider, TextureUploader* uploader) |
: m_client(client) |
- , m_timer(new CCTimer(thread, this)) |
+ , m_timer(new Timer(thread, this)) |
, m_queue(queue.Pass()) |
, m_resourceProvider(resourceProvider) |
, m_uploader(uploader) |
@@ -57,11 +57,11 @@ CCTextureUpdateController::CCTextureUpdateController(CCTextureUpdateControllerCl |
{ |
} |
-CCTextureUpdateController::~CCTextureUpdateController() |
+TextureUpdateController::~TextureUpdateController() |
{ |
} |
-void CCTextureUpdateController::performMoreUpdates( |
+void TextureUpdateController::performMoreUpdates( |
base::TimeTicks timeLimit) |
{ |
m_timeLimit = timeLimit; |
@@ -84,12 +84,12 @@ void CCTextureUpdateController::performMoreUpdates( |
updateMoreTexturesNow(); |
} |
-void CCTextureUpdateController::discardUploadsToEvictedResources() |
+void TextureUpdateController::discardUploadsToEvictedResources() |
{ |
m_queue->clearUploadsToEvictedResources(); |
} |
-void CCTextureUpdateController::finalize() |
+void TextureUpdateController::finalize() |
{ |
size_t uploadCount = 0; |
while (m_queue->fullUploadSize()) { |
@@ -126,33 +126,33 @@ void CCTextureUpdateController::finalize() |
} |
} |
-void CCTextureUpdateController::onTimerFired() |
+void TextureUpdateController::onTimerFired() |
{ |
if (!updateMoreTexturesIfEnoughTimeRemaining()) |
m_client->readyToFinalizeTextureUpdates(); |
} |
-base::TimeTicks CCTextureUpdateController::now() const |
+base::TimeTicks TextureUpdateController::now() const |
{ |
return base::TimeTicks::Now(); |
} |
-base::TimeDelta CCTextureUpdateController::updateMoreTexturesTime() const |
+base::TimeDelta TextureUpdateController::updateMoreTexturesTime() const |
{ |
return base::TimeDelta::FromMilliseconds(textureUpdateTickRate * 1000); |
} |
-size_t CCTextureUpdateController::updateMoreTexturesSize() const |
+size_t TextureUpdateController::updateMoreTexturesSize() const |
{ |
return m_textureUpdatesPerTick; |
} |
-size_t CCTextureUpdateController::maxBlockingUpdates() const |
+size_t TextureUpdateController::maxBlockingUpdates() const |
{ |
return updateMoreTexturesSize() * maxBlockingUpdateIntervals; |
} |
-bool CCTextureUpdateController::updateMoreTexturesIfEnoughTimeRemaining() |
+bool TextureUpdateController::updateMoreTexturesIfEnoughTimeRemaining() |
{ |
// Blocking uploads will increase when we're too aggressive in our upload |
// time estimate. We use a different timeout here to prevent unnecessary |
@@ -173,7 +173,7 @@ bool CCTextureUpdateController::updateMoreTexturesIfEnoughTimeRemaining() |
return true; |
} |
-void CCTextureUpdateController::updateMoreTexturesNow() |
+void TextureUpdateController::updateMoreTexturesNow() |
{ |
size_t uploads = std::min( |
m_queue->fullUploadSize(), updateMoreTexturesSize()); |