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

Side by Side Diff: cc/test/begin_frame_args_test.cc

Issue 1132753008: Replaced TestNowSource with SimpleTestTickClock. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebasing and additional code changes. 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/test/begin_frame_args_test.h" 5 #include "cc/test/begin_frame_args_test.h"
6 6
7 #include "base/time/time.h" 7 #include "base/time/time.h"
8 #include "cc/output/begin_frame_args.h" 8 #include "cc/output/begin_frame_args.h"
9 #include "ui/gfx/frame_time.h" 9 #include "ui/gfx/frame_time.h"
10 10
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 BeginFrameArgs CreateExpiredBeginFrameArgsForTesting( 50 BeginFrameArgs CreateExpiredBeginFrameArgsForTesting(
51 BeginFrameArgs::CreationLocation location) { 51 BeginFrameArgs::CreationLocation location) {
52 base::TimeTicks now = gfx::FrameTime::Now(); 52 base::TimeTicks now = gfx::FrameTime::Now();
53 return BeginFrameArgs::Create( 53 return BeginFrameArgs::Create(
54 location, now, now - BeginFrameArgs::DefaultInterval(), 54 location, now, now - BeginFrameArgs::DefaultInterval(),
55 BeginFrameArgs::DefaultInterval(), BeginFrameArgs::NORMAL); 55 BeginFrameArgs::DefaultInterval(), BeginFrameArgs::NORMAL);
56 } 56 }
57 57
58 BeginFrameArgs CreateBeginFrameArgsForTesting( 58 BeginFrameArgs CreateBeginFrameArgsForTesting(
59 BeginFrameArgs::CreationLocation location, 59 BeginFrameArgs::CreationLocation location,
60 scoped_refptr<TestNowSource> now_src) { 60 base::SimpleTestTickClock* now_src) {
61 base::TimeTicks now = now_src->Now(); 61 base::TimeTicks now = now_src->NowTicks();
62 return BeginFrameArgs::Create( 62 return BeginFrameArgs::Create(
63 location, now, now + (BeginFrameArgs::DefaultInterval() / 2), 63 location, now, now + (BeginFrameArgs::DefaultInterval() / 2),
64 BeginFrameArgs::DefaultInterval(), BeginFrameArgs::NORMAL); 64 BeginFrameArgs::DefaultInterval(), BeginFrameArgs::NORMAL);
65 } 65 }
66 66
67 BeginFrameArgs CreateExpiredBeginFrameArgsForTesting( 67 BeginFrameArgs CreateExpiredBeginFrameArgsForTesting(
68 BeginFrameArgs::CreationLocation location, 68 BeginFrameArgs::CreationLocation location,
69 scoped_refptr<TestNowSource> now_src) { 69 base::SimpleTestTickClock* now_src) {
70 base::TimeTicks now = now_src->Now(); 70 base::TimeTicks now = now_src->NowTicks();
71 return BeginFrameArgs::Create( 71 return BeginFrameArgs::Create(
72 location, now, now - BeginFrameArgs::DefaultInterval(), 72 location, now, now - BeginFrameArgs::DefaultInterval(),
73 BeginFrameArgs::DefaultInterval(), BeginFrameArgs::NORMAL); 73 BeginFrameArgs::DefaultInterval(), BeginFrameArgs::NORMAL);
74 } 74 }
75 75
76 bool operator==(const BeginFrameArgs& lhs, const BeginFrameArgs& rhs) { 76 bool operator==(const BeginFrameArgs& lhs, const BeginFrameArgs& rhs) {
77 return (lhs.type == rhs.type) && (lhs.frame_time == rhs.frame_time) && 77 return (lhs.type == rhs.type) && (lhs.frame_time == rhs.frame_time) &&
78 (lhs.deadline == rhs.deadline) && (lhs.interval == rhs.interval); 78 (lhs.deadline == rhs.deadline) && (lhs.interval == rhs.interval);
79 } 79 }
80 80
81 ::std::ostream& operator<<(::std::ostream& os, const BeginFrameArgs& args) { 81 ::std::ostream& operator<<(::std::ostream& os, const BeginFrameArgs& args) {
82 PrintTo(args, &os); 82 PrintTo(args, &os);
83 return os; 83 return os;
84 } 84 }
85 85
86 void PrintTo(const BeginFrameArgs& args, ::std::ostream* os) { 86 void PrintTo(const BeginFrameArgs& args, ::std::ostream* os) {
87 *os << "BeginFrameArgs(" << BeginFrameArgs::TypeToString(args.type) << ", " 87 *os << "BeginFrameArgs(" << BeginFrameArgs::TypeToString(args.type) << ", "
88 << args.frame_time.ToInternalValue() << ", " 88 << args.frame_time.ToInternalValue() << ", "
89 << args.deadline.ToInternalValue() << ", " 89 << args.deadline.ToInternalValue() << ", "
90 << args.interval.InMicroseconds() << "us)"; 90 << args.interval.InMicroseconds() << "us)";
91 } 91 }
92 92
93 } // namespace cc 93 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698