content/browser/android/overscroll_controller_android.cc - Issue 1195453003: Add missing null-check in OverscrollControllerAndroid::Animate()

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/android/overscroll_controller_android.cc

Issue 1195453003: Add missing null-check in OverscrollControllerAndroid::Animate() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 6 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 side-by-side diff with in-line comments

Download patch

Index: content/browser/android/overscroll_controller_android.cc

diff --git a/content/browser/android/overscroll_controller_android.cc b/content/browser/android/overscroll_controller_android.cc

index d73cd22247cab5c23cf7caed53ea3628ad5ab35c..8608f52a6703a8e74abecf9cb6aceb9349801407 100644

--- a/content/browser/android/overscroll_controller_android.cc

+++ b/content/browser/android/overscroll_controller_android.cc

@@ -226,7 +226,7 @@ void OverscrollControllerAndroid::OnOverscrolled(

bool OverscrollControllerAndroid::Animate(base::TimeTicks current_time,

cc::Layer* parent_layer) {

DCHECK(parent_layer);

- if (!enabled_)

+ if (!enabled_ || !glow_effect_)

return false;

return glow_effect_->Animate(current_time, parent_layer);

« no previous file with comments | « no previous file | no next file » | no next file with comments »