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

Unified Diff: cc/resources/resource_update_controller.cc

Issue 12962007: cc: Chromify resource_update_queue (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 7 years, 9 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
« no previous file with comments | « cc/resources/prioritized_resource_unittest.cc ('k') | cc/resources/resource_update_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/resource_update_controller.cc
diff --git a/cc/resources/resource_update_controller.cc b/cc/resources/resource_update_controller.cc
index b568f5cc0a3e3c6fab2a50f17e97b3a8414c77a9..1dc36b50bf911a20ab53bbb2ca5cd4baf972348c 100644
--- a/cc/resources/resource_update_controller.cc
+++ b/cc/resources/resource_update_controller.cc
@@ -107,7 +107,7 @@ void ResourceUpdateController::PerformMoreUpdates(
}
void ResourceUpdateController::DiscardUploadsToEvictedResources() {
- queue_->clearUploadsToEvictedResources();
+ queue_->ClearUploadsToEvictedResources();
}
void ResourceUpdateController::UpdateTexture(ResourceUpdate update) {
@@ -183,18 +183,18 @@ void ResourceUpdateController::UpdateTexture(ResourceUpdate update) {
}
void ResourceUpdateController::Finalize() {
- while (queue_->fullUploadSize())
- UpdateTexture(queue_->takeFirstFullUpload());
+ while (queue_->FullUploadSize())
+ UpdateTexture(queue_->TakeFirstFullUpload());
- while (queue_->partialUploadSize())
- UpdateTexture(queue_->takeFirstPartialUpload());
+ while (queue_->PartialUploadSize())
+ UpdateTexture(queue_->TakeFirstPartialUpload());
resource_provider_->FlushUploads();
- if (queue_->copySize()) {
+ if (queue_->CopySize()) {
TextureCopier* copier = resource_provider_->texture_copier();
- while (queue_->copySize())
- copier->CopyTexture(queue_->takeFirstCopy());
+ while (queue_->CopySize())
+ copier->CopyTexture(queue_->TakeFirstCopy());
// If we've performed any texture copies, we need to insert a flush
// here into the compositor context before letting the main thread
@@ -234,7 +234,7 @@ base::TimeDelta ResourceUpdateController::PendingUpdateTime() const {
bool ResourceUpdateController::UpdateMoreTexturesIfEnoughTimeRemaining() {
while (resource_provider_->NumBlockingUploads() < MaxBlockingUpdates()) {
- if (!queue_->fullUploadSize())
+ if (!queue_->FullUploadSize())
return false;
if (!time_limit_.is_null()) {
@@ -261,13 +261,13 @@ bool ResourceUpdateController::UpdateMoreTexturesIfEnoughTimeRemaining() {
void ResourceUpdateController::UpdateMoreTexturesNow() {
size_t uploads = std::min(
- queue_->fullUploadSize(), UpdateMoreTexturesSize());
+ queue_->FullUploadSize(), UpdateMoreTexturesSize());
if (!uploads)
return;
- while (queue_->fullUploadSize() && uploads--)
- UpdateTexture(queue_->takeFirstFullUpload());
+ while (queue_->FullUploadSize() && uploads--)
+ UpdateTexture(queue_->TakeFirstFullUpload());
resource_provider_->FlushUploads();
}
« no previous file with comments | « cc/resources/prioritized_resource_unittest.cc ('k') | cc/resources/resource_update_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698