diff options
author | mithro@mithis.com <mithro@mithis.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-19 17:36:34 +0000 |
---|---|---|
committer | mithro@mithis.com <mithro@mithis.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-19 17:36:34 +0000 |
commit | 569006a7d4f76f3dffeaf7b8f5a9ef2c825713ce (patch) | |
tree | 4de0247c1fad574c0a04600ef53aa32ab3b4dc10 /cc/output/begin_frame_args.cc | |
parent | d83a5e8aeea8b3ecce28747dc422272787d27be3 (diff) | |
download | chromium_src-569006a7d4f76f3dffeaf7b8f5a9ef2c825713ce.zip chromium_src-569006a7d4f76f3dffeaf7b8f5a9ef2c825713ce.tar.gz chromium_src-569006a7d4f76f3dffeaf7b8f5a9ef2c825713ce.tar.bz2 |
Adding gtest helpers for BeginFrameArgs.
* Allow BeginFrameArgs inside an EXPECT_EQ call.
EXPECT_EQ(args1, args2)
* Allow gtest to pretty print BeginFrameArgs objects.
Output use to look like;
---------------------------------------------------
Expected: args1
Which is:
16 byte object <0xFF 0xFF 0xFF 0x01 ...>
Actual: args2
Which is:
16 byte object <0xFF 0xFF 0xFF 0x01 ...>
---------------------------------------------------
Output now looks like;
---------------------------------------------------
Expected: args1
Which is:
BeginFrameArgs(1, 2, 3)
Actual: args2
Which is:
BeginFrameArgs(1, 2, 4)
---------------------------------------------------
BUG=371223
Review URL: https://codereview.chromium.org/273823002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271413 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/output/begin_frame_args.cc')
-rw-r--r-- | cc/output/begin_frame_args.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cc/output/begin_frame_args.cc b/cc/output/begin_frame_args.cc index 2d7cd96..a592ecc 100644 --- a/cc/output/begin_frame_args.cc +++ b/cc/output/begin_frame_args.cc @@ -37,12 +37,13 @@ scoped_ptr<base::Value> BeginFrameArgs::AsValue() const { return state.PassAs<base::Value>(); } -BeginFrameArgs BeginFrameArgs::CreateForSynchronousCompositor() { +BeginFrameArgs BeginFrameArgs::CreateForSynchronousCompositor( + base::TimeTicks now) { // For WebView/SynchronousCompositor, we always want to draw immediately, // so we set the deadline to 0 and guess that the interval is 16 milliseconds. - return BeginFrameArgs(gfx::FrameTime::Now(), - base::TimeTicks(), - DefaultInterval()); + if (now.is_null()) + now = gfx::FrameTime::Now(); + return BeginFrameArgs(now, base::TimeTicks(), DefaultInterval()); } // This is a hard-coded deadline adjustment that assumes 60Hz, to be used in |