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

Unified Diff: cc/trees/layer_tree_host_unittest.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/trees/layer_tree_host_unittest.cc
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index 14b182ae61e485efc50afc7fa9357b51f9d20842..afeed90ae2ca0ee7f4557615d5bcb6c5e5b2731a 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -61,7 +61,6 @@
#include "third_party/khronos/GLES2/gl2.h"
#include "third_party/khronos/GLES2/gl2ext.h"
#include "third_party/skia/include/core/SkPicture.h"
-#include "ui/gfx/frame_time.h"
#include "ui/gfx/geometry/point_conversions.h"
#include "ui/gfx/geometry/size_conversions.h"
#include "ui/gfx/geometry/vector2d_conversions.h"
@@ -1234,7 +1233,7 @@ class LayerTreeHostTestFrameTimeUpdatesAfterDraw : public LayerTreeHostTest {
// Since we might use a low-resolution clock on Windows, we need to
// make sure that the clock has incremented past first_frame_time_.
- while (first_frame_time_ == gfx::FrameTime::Now()) {
+ while (first_frame_time_ == base::TimeTicks::Now()) {
}
return;
@@ -5860,14 +5859,14 @@ class LayerTreeHostTestSynchronousCompositeSwapPromise
scoped_ptr<SwapPromise> swap_promise0(
new TestSwapPromise(&swap_promise_result_[0]));
layer_tree_host()->QueueSwapPromise(swap_promise0.Pass());
- layer_tree_host()->Composite(gfx::FrameTime::Now());
+ layer_tree_host()->Composite(base::TimeTicks::Now());
// Fail to swap (no damage).
scoped_ptr<SwapPromise> swap_promise1(
new TestSwapPromise(&swap_promise_result_[1]));
layer_tree_host()->QueueSwapPromise(swap_promise1.Pass());
layer_tree_host()->SetNeedsCommit();
- layer_tree_host()->Composite(gfx::FrameTime::Now());
+ layer_tree_host()->Composite(base::TimeTicks::Now());
// Fail to draw (not visible).
scoped_ptr<SwapPromise> swap_promise2(
@@ -5875,7 +5874,7 @@ class LayerTreeHostTestSynchronousCompositeSwapPromise
layer_tree_host()->QueueSwapPromise(swap_promise2.Pass());
layer_tree_host()->SetNeedsDisplayOnAllLayers();
layer_tree_host()->SetVisible(false);
- layer_tree_host()->Composite(gfx::FrameTime::Now());
+ layer_tree_host()->Composite(base::TimeTicks::Now());
EndTest();
}

Powered by Google App Engine
This is Rietveld 408576698