| Index: cc/resources/resource_update_controller.h
|
| diff --git a/cc/resources/resource_update_controller.h b/cc/resources/resource_update_controller.h
|
| index 46800e598d77d7d601dc011368e41d52e0215911..4bd5cb8d780378a640180cf196cde8c439d721d6 100644
|
| --- a/cc/resources/resource_update_controller.h
|
| +++ b/cc/resources/resource_update_controller.h
|
| @@ -11,6 +11,7 @@
|
| #include "base/time/time.h"
|
| #include "cc/base/cc_export.h"
|
| #include "cc/resources/resource_update_queue.h"
|
| +#include "ui/gfx/frame_time.h"
|
|
|
| namespace base { class SingleThreadTaskRunner; }
|
|
|
| @@ -43,12 +44,12 @@ class CC_EXPORT ResourceUpdateController {
|
| // Discard uploads to textures that were evicted on the impl thread.
|
| void DiscardUploadsToEvictedResources();
|
|
|
| - void PerformMoreUpdates(base::TimeTicks time_limit);
|
| + void PerformMoreUpdates(gfx::FrameTime time_limit);
|
| void Finalize();
|
|
|
|
|
| // Virtual for testing.
|
| - virtual base::TimeTicks Now() const;
|
| + virtual gfx::FrameTime Now() const;
|
| virtual base::TimeDelta UpdateMoreTexturesTime() const;
|
| virtual size_t UpdateMoreTexturesSize() const;
|
|
|
| @@ -75,7 +76,7 @@ class CC_EXPORT ResourceUpdateController {
|
| scoped_ptr<ResourceUpdateQueue> queue_;
|
| bool contents_textures_purged_;
|
| ResourceProvider* resource_provider_;
|
| - base::TimeTicks time_limit_;
|
| + gfx::FrameTime time_limit_;
|
| size_t texture_updates_per_tick_;
|
| bool first_update_attempt_;
|
| base::SingleThreadTaskRunner* task_runner_;
|
|
|