content/browser/web_contents/aura/overscroll_window_animation_unittest.cc - Issue 1143433005: Remove gfx::FrameTime for a single clock source

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/web_contents/aura/overscroll_window_animation_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

« cc/scheduler/begin_frame_source.cc ('K') | « content/browser/web_contents/aura/overscroll_navigation_overlay_unittest.cc ('k') | content/renderer/gpu/render_widget_compositor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/web_contents/aura/overscroll_window_animation_unittest.cc

diff --git a/content/browser/web_contents/aura/overscroll_window_animation_unittest.cc b/content/browser/web_contents/aura/overscroll_window_animation_unittest.cc

index 527b0c7bd6ef8880d064e7d6a6353a0e6e6e5b86..cb077262dbe6e779095c47dff02e587db2572c2b 100644

--- a/content/browser/web_contents/aura/overscroll_window_animation_unittest.cc

+++ b/content/browser/web_contents/aura/overscroll_window_animation_unittest.cc

@@ -10,7 +10,6 @@

#include "ui/compositor/scoped_animation_duration_scale_mode.h"

#include "ui/compositor/scoped_layer_animation_settings.h"

#include "ui/compositor/test/layer_animator_test_controller.h"

-#include "ui/gfx/frame_time.h"

namespace content {

@@ -204,7 +203,7 @@ TEST_F(OverscrollWindowAnimationTest, NewOverscrollCompletesPreviousGesture) {

base::TimeDelta duration = settings.GetTransitionDuration();

test_controller.StartThreadedAnimationsIfNeeded();

- base::TimeTicks start_time = gfx::FrameTime::Now();

+ base::TimeTicks start_time = base::TimeTicks::Now();

// Halfway through the animation, OverscrollCompleting should have been fired.

animator->Step(start_time + duration / 2);