Skip to content

Commit

Permalink
Fix for nullptr crash in SpatNav
Browse files Browse the repository at this point in the history
No test since I don't know how to setup this situation. However, it's
safe to just avoid scrolling in this case.

(cherry picked from commit 3438927)

Bug: 970164
Change-Id: Icbae6b631e2f80e9e6493825fefb0f10fab974f6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1645792
Reviewed-by: Dave Tapuska <dtapuska@chromium.org>
Commit-Queue: David Bokan <bokan@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#667579}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1662817
Reviewed-by: David Bokan <bokan@chromium.org>
Cr-Commit-Position: refs/branch-heads/3770@{#1031}
Cr-Branched-From: a9eee1c-refs/heads/master@{#652427}
  • Loading branch information
bokand committed Jun 17, 2019
1 parent ef9eb65 commit 44d76dd
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion third_party/blink/renderer/core/page/spatial_navigation.cc
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,9 @@ bool ScrollInDirection(Node* container, SpatialNavigationDirection direction) {
// CanScrollInDirection(). Regular arrow-key scrolling (without
// --enable-spatial-navigation) already uses smooth scrolling by default.
ScrollableArea* scroller = ScrollableAreaFor(container);
DCHECK(scroller);
if (!scroller)
return false;

scroller->ScrollBy(ScrollOffset(dx, dy), kUserScroll);
return true;
}
Expand Down

0 comments on commit 44d76dd

Please sign in to comment.