Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1147)

Side by Side 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/android/overscroll_controller_android.h" 5 #include "content/browser/android/overscroll_controller_android.h"
6 6
7 #include "base/android/build_info.h" 7 #include "base/android/build_info.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "cc/layers/layer.h" 9 #include "cc/layers/layer.h"
10 #include "cc/output/compositor_frame_metadata.h" 10 #include "cc/output/compositor_frame_metadata.h"
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 gfx::ScaleVector2d( 219 gfx::ScaleVector2d(
220 params.causal_event_viewport_point.OffsetFromOrigin(), 220 params.causal_event_viewport_point.OffsetFromOrigin(),
221 dpi_scale_))) { 221 dpi_scale_))) {
222 SetNeedsAnimate(); 222 SetNeedsAnimate();
223 } 223 }
224 } 224 }
225 225
226 bool OverscrollControllerAndroid::Animate(base::TimeTicks current_time, 226 bool OverscrollControllerAndroid::Animate(base::TimeTicks current_time,
227 cc::Layer* parent_layer) { 227 cc::Layer* parent_layer) {
228 DCHECK(parent_layer); 228 DCHECK(parent_layer);
229 if (!enabled_) 229 if (!enabled_ || !glow_effect_)
230 return false; 230 return false;
231 231
232 return glow_effect_->Animate(current_time, parent_layer); 232 return glow_effect_->Animate(current_time, parent_layer);
233 } 233 }
234 234
235 void OverscrollControllerAndroid::OnFrameMetadataUpdated( 235 void OverscrollControllerAndroid::OnFrameMetadataUpdated(
236 const cc::CompositorFrameMetadata& frame_metadata) { 236 const cc::CompositorFrameMetadata& frame_metadata) {
237 if (!refresh_effect_ && !glow_effect_) 237 if (!refresh_effect_ && !glow_effect_)
238 return; 238 return;
239 239
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 285
286 scoped_ptr<EdgeEffectBase> OverscrollControllerAndroid::CreateEdgeEffect() { 286 scoped_ptr<EdgeEffectBase> OverscrollControllerAndroid::CreateEdgeEffect() {
287 return CreateGlowEdgeEffect(&compositor_->GetResourceManager(), dpi_scale_); 287 return CreateGlowEdgeEffect(&compositor_->GetResourceManager(), dpi_scale_);
288 } 288 }
289 289
290 void OverscrollControllerAndroid::SetNeedsAnimate() { 290 void OverscrollControllerAndroid::SetNeedsAnimate() {
291 compositor_->SetNeedsAnimate(); 291 compositor_->SetNeedsAnimate();
292 } 292 }
293 293
294 } // namespace content 294 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698