summaryrefslogtreecommitdiffstats
path: root/cc/output
diff options
context:
space:
mode:
authorbrianderson@chromium.org <brianderson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-11 12:48:23 +0000
committerbrianderson@chromium.org <brianderson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-11 12:48:23 +0000
commit1d142de8f8fa739199f6f19c94b2c6a01e12603a (patch)
tree754cf5c3f42902c3f7daa6886fe10bc71de2d0bc /cc/output
parent384daf4d199e8ee29356a2aa61e6915caf5a7100 (diff)
downloadchromium_src-1d142de8f8fa739199f6f19c94b2c6a01e12603a.zip
chromium_src-1d142de8f8fa739199f6f19c94b2c6a01e12603a.tar.gz
chromium_src-1d142de8f8fa739199f6f19c94b2c6a01e12603a.tar.bz2
cc: Fix negative EstimatedParentDrawTimes
BUG=380987 Review URL: https://codereview.chromium.org/311263016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276369 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/output')
-rw-r--r--cc/output/begin_frame_args.cc4
-rw-r--r--cc/output/begin_frame_args.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/cc/output/begin_frame_args.cc b/cc/output/begin_frame_args.cc
index a592ecc..065cadd 100644
--- a/cc/output/begin_frame_args.cc
+++ b/cc/output/begin_frame_args.cc
@@ -52,8 +52,8 @@ BeginFrameArgs BeginFrameArgs::CreateForSynchronousCompositor(
// produce output, the Renderer Impl thread the middle 1/3 of a frame to produce
// ouput, and the Renderer Main thread the first 1/3 of a frame to produce
// output.
-base::TimeDelta BeginFrameArgs::DefaultDeadlineAdjustment() {
- return base::TimeDelta::FromMicroseconds(-16666 / 3);
+base::TimeDelta BeginFrameArgs::DefaultEstimatedParentDrawTime() {
+ return base::TimeDelta::FromMicroseconds(16666 / 3);
}
base::TimeDelta BeginFrameArgs::DefaultInterval() {
diff --git a/cc/output/begin_frame_args.h b/cc/output/begin_frame_args.h
index 6312e21..91ad182 100644
--- a/cc/output/begin_frame_args.h
+++ b/cc/output/begin_frame_args.h
@@ -25,7 +25,7 @@ struct CC_EXPORT BeginFrameArgs {
// This is the default delta that will be used to adjust the deadline when
// proper draw-time estimations are not yet available.
- static base::TimeDelta DefaultDeadlineAdjustment();
+ static base::TimeDelta DefaultEstimatedParentDrawTime();
// This is the default interval to use to avoid sprinkling the code with
// magic numbers.