| Index: cc/resources/resource_update_controller.cc
|
| diff --git a/cc/resources/resource_update_controller.cc b/cc/resources/resource_update_controller.cc
|
| index 59c536b0844b495712447d1ec17c31c627915b85..29fa4dd258a9473b758fc90909768faa80d5d3ce 100644
|
| --- a/cc/resources/resource_update_controller.cc
|
| +++ b/cc/resources/resource_update_controller.cc
|
| @@ -56,7 +56,7 @@ ResourceUpdateController::ResourceUpdateController(
|
| ResourceUpdateController::~ResourceUpdateController() {}
|
|
|
| void ResourceUpdateController::PerformMoreUpdates(
|
| - base::TimeTicks time_limit) {
|
| + gfx::FrameTime time_limit) {
|
| time_limit_ = time_limit;
|
|
|
| // Update already in progress.
|
| @@ -113,7 +113,7 @@ void ResourceUpdateController::OnTimerFired() {
|
| client_->ReadyToFinalizeTextureUpdates();
|
| }
|
|
|
| -base::TimeTicks ResourceUpdateController::Now() const {
|
| +gfx::FrameTime ResourceUpdateController::Now() const {
|
| return gfx::FrameTime::Now();
|
| }
|
|
|
| @@ -142,7 +142,8 @@ bool ResourceUpdateController::UpdateMoreTexturesIfEnoughTimeRemaining() {
|
|
|
| if (!time_limit_.is_null()) {
|
| // Estimated completion time of all pending updates.
|
| - base::TimeTicks completion_time = Now() + PendingUpdateTime();
|
| + gfx::FrameTime completion_time =
|
| + Now() + PendingUpdateTime();
|
|
|
| // Time remaining based on current completion estimate.
|
| base::TimeDelta time_remaining = time_limit_ - completion_time;
|
|
|