Commit 5ceb3257 authored by Saman Sami's avatar Saman Sami Committed by Commit Bot

Fix segfault in FlingScheduler

Don't call into |fling_controller_| if it's destroyed.

Bug: 852264
Change-Id: I71081588f0b7e5bf882c28231e3d6b20026e4611
Reviewed-on: https://chromium-review.googlesource.com/1099145Reviewed-by: default avatarDave Tapuska <dtapuska@chromium.org>
Commit-Queue: Saman Sami <samans@chromium.org>
Cr-Commit-Position: refs/heads/master@{#567258}
parent 2cf20af4
......@@ -78,7 +78,9 @@ ui::Compositor* FlingScheduler::GetCompositor() {
}
void FlingScheduler::OnAnimationStep(base::TimeTicks timestamp) {
fling_controller_->ProgressFling(timestamp);
DCHECK(observed_compositor_);
if (fling_controller_)
fling_controller_->ProgressFling(timestamp);
}
void FlingScheduler::OnCompositingShuttingDown(ui::Compositor* compositor) {
......
......@@ -66,7 +66,9 @@ ui::WindowAndroid* FlingSchedulerAndroid::GetRootWindow() {
}
void FlingSchedulerAndroid::OnAnimate(base::TimeTicks frame_begin_time) {
fling_controller_->ProgressFling(frame_begin_time);
DCHECK(observed_window_);
if (fling_controller_)
fling_controller_->ProgressFling(frame_begin_time);
}
} // namespace content
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment