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

Unified Diff: ui/compositor/layer_animator_collection.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: ui/compositor/layer_animator_collection.cc
diff --git a/ui/compositor/layer_animator_collection.cc b/ui/compositor/layer_animator_collection.cc
index babdcb6f6b2bb0b2ba8f7992f2aebdaa96009d76..42dee6c259dd31f0ceb8d03df46bd7ad4daa7de4 100644
--- a/ui/compositor/layer_animator_collection.cc
+++ b/ui/compositor/layer_animator_collection.cc
@@ -9,12 +9,11 @@
#include "base/time/time.h"
#include "ui/compositor/compositor.h"
#include "ui/compositor/layer_animator.h"
-#include "ui/gfx/frame_time.h"
namespace ui {
LayerAnimatorCollection::LayerAnimatorCollection(Compositor* compositor)
- : compositor_(compositor), last_tick_time_(gfx::FrameTime::Now()) {
+ : compositor_(compositor), last_tick_time_(base::TimeTicks::Now()) {
}
LayerAnimatorCollection::~LayerAnimatorCollection() {
@@ -26,7 +25,7 @@ void LayerAnimatorCollection::StartAnimator(
scoped_refptr<LayerAnimator> animator) {
DCHECK_EQ(0U, animators_.count(animator));
if (!animators_.size())
- last_tick_time_ = gfx::FrameTime::Now();
+ last_tick_time_ = base::TimeTicks::Now();
animators_.insert(animator);
if (animators_.size() == 1U && compositor_)
compositor_->AddAnimationObserver(this);

Powered by Google App Engine
This is Rietveld 408576698