diff options
| author | mithro <mithro@mithis.com> | 2014-11-09 22:21:45 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-10 06:22:00 +0000 |
| commit | cfdec29c10b50750d042f4bcfdce3ccb56b4cd81 (patch) | |
| tree | c0ee6190551fcd20fd08cd750640d391303318b4 /cc/scheduler/scheduler_settings.h | |
| parent | 8e9c4026e0ddad6915b29c252ee7f061b70c50a0 (diff) | |
| download | chromium_src-cfdec29c10b50750d042f4bcfdce3ccb56b4cd81.zip chromium_src-cfdec29c10b50750d042f4bcfdce3ccb56b4cd81.tar.gz chromium_src-cfdec29c10b50750d042f4bcfdce3ccb56b4cd81.tar.bz2 | |
Revert of Moving background animation ticking from LayerTreeHostImpl into the Scheduler. (patchset #10 id:480001 of https://codereview.chromium.org/595973002/)
Reason for revert:
Reverting because it breaks the following interactive_ui_tests;
* InterruptedAutoStartEnrollment
* LoginUIVisible
* PRE_InterruptedAutoStartEnrollment
* PRE_LoginUIVisible
The failure log is;
[27898:27924:1109/213628:FATAL:layer_animation_controller.cc(215)] Check failed: last_tick_time_ != base::TimeTicks().
#0 0x7f92b9beb75e base::debug::StackTrace::StackTrace()
#1 0x7f92b9c7ec82 logging::LogMessage::~LogMessage()
#2 0x7f92b8cdafc4 cc::LayerAnimationController::UpdateState()
#3 0x7f92b8fe9474 cc::LayerTreeHostImpl::UpdateAnimationState()
#4 0x7f92b902ecf4 cc::ThreadProxy::DrawSwapInternal()
#5 0x7f92b902f542 cc::ThreadProxy::ScheduledActionDrawAndSwapIfPossible()
#6 0x7f92b902f59c cc::ThreadProxy::ScheduledActionDrawAndSwapIfPossible()
#7 0x7f92b8f83324 cc::Scheduler::DrawAndSwapIfPossible()
#8 0x7f92b8f80541 cc::Scheduler::ProcessScheduledActions()
#9 0x7f92b8f7f54d cc::Scheduler::OnBeginImplFrameDeadline()
Original issue's description:
> Moving background animation ticking from LayerTreeHostImpl into the Scheduler.
>
> Background ticking currently happens in the LayerTreeHostImpl, this makes it very hard to preserve the monotonicity guarantee needed by frame times. http://crrev.com/267783004 set up the scheduler to become the source of background ticks and this CL makes use of that functionality.
>
> BUG=345459
>
> Committed: https://crrev.com/4df3c4366015739a7c6b6c1539a8d7c9198e38ef
> Cr-Commit-Position: refs/heads/master@{#302757}
>
> Committed: https://crrev.com/185438b3e5e3f43ce2996da0022f510fbe193a6e
> Cr-Commit-Position: refs/heads/master@{#303423}
TBR=danakj@chromium.org,brianderson@chromium.org,skyostil@chromium.org,ajuma@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=345459
Review URL: https://codereview.chromium.org/713783002
Cr-Commit-Position: refs/heads/master@{#303426}
Diffstat (limited to 'cc/scheduler/scheduler_settings.h')
| -rw-r--r-- | cc/scheduler/scheduler_settings.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/cc/scheduler/scheduler_settings.h b/cc/scheduler/scheduler_settings.h index 561d265..8607991 100644 --- a/cc/scheduler/scheduler_settings.h +++ b/cc/scheduler/scheduler_settings.h @@ -6,7 +6,6 @@ #define CC_SCHEDULER_SCHEDULER_SETTINGS_H_ #include "base/memory/ref_counted.h" -#include "base/time/time.h" #include "base/values.h" #include "cc/base/cc_export.h" @@ -34,8 +33,6 @@ class CC_EXPORT SchedulerSettings { bool throttle_frame_production; bool disable_hi_res_timer_tasks_on_battery; - base::TimeDelta background_frame_interval; - scoped_refptr<base::debug::ConvertableToTraceFormat> AsValue() const; }; |