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

Unified Diff: cc/resources/resource_provider.cc

Issue 1143433005: Remove gfx::FrameTime for a single clock source (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Handling patch for mac files Created 5 years, 7 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
Index: cc/resources/resource_provider.cc
diff --git a/cc/resources/resource_provider.cc b/cc/resources/resource_provider.cc
index db1b35eb0ccaadeaa428bd4540771b2cc1f71e91..46fbac841b41de30c9fe013c5746047bec313c9a 100644
--- a/cc/resources/resource_provider.cc
+++ b/cc/resources/resource_provider.cc
@@ -27,7 +27,6 @@
#include "third_party/skia/include/core/SkSurface.h"
#include "third_party/skia/include/gpu/GrContext.h"
#include "third_party/skia/include/gpu/GrTextureProvider.h"
-#include "ui/gfx/frame_time.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/geometry/vector2d.h"
#include "ui/gfx/gpu_memory_buffer.h"
@@ -837,8 +836,9 @@ base::TimeTicks ResourceProvider::EstimatedUploadCompletionTime(
// Software resource uploads happen on impl thread, so don't bother batching
// them up and trying to wait for them to complete.
if (!texture_uploader_) {
- return gfx::FrameTime::Now() + base::TimeDelta::FromMicroseconds(
- base::Time::kMicrosecondsPerSecond * kSoftwareUploadTickRate);
+ return base::TimeTicks::Now() +
+ base::TimeDelta::FromMicroseconds(
+ base::Time::kMicrosecondsPerSecond * kSoftwareUploadTickRate);
}
base::TimeDelta upload_one_texture_time =
@@ -847,7 +847,7 @@ base::TimeTicks ResourceProvider::EstimatedUploadCompletionTime(
uploads_per_tick;
size_t total_uploads = NumBlockingUploads() + uploads_per_tick;
- return gfx::FrameTime::Now() + upload_one_texture_time * total_uploads;
+ return base::TimeTicks::Now() + upload_one_texture_time * total_uploads;
}
ResourceProvider::Resource* ResourceProvider::InsertResource(

Powered by Google App Engine
This is Rietveld 408576698