commit | ce3421e53ec38ec6290f6eb31e7f5a901673e915 | [log] [tgz] |
---|---|---|
author | David Bokan <bokan@chromium.org> | Tue May 21 22:11:51 2019 |
committer | Commit Bot <commit-bot@chromium.org> | Tue May 21 22:11:51 2019 |
tree | 570779c6b2e74cd05f7010bc658cec93eec29797 | |
parent | 089f5bdaf1ff7013d5f009d9bf3af3f5d96bc615 [diff] |
Fix crash in computing main thread regions Bug: 964293 Change-Id: I78171b3876a670c17c5b41112cdea943f109fa07 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1622908 Reviewed-by: Philip Rogers <pdr@chromium.org> Commit-Queue: David Bokan <bokan@chromium.org> Cr-Commit-Position: refs/heads/master@{#661932}
diff --git a/third_party/blink/renderer/core/page/scrolling/scrolling_coordinator.cc b/third_party/blink/renderer/core/page/scrolling/scrolling_coordinator.cc index aefc9e1..4f00762 100644 --- a/third_party/blink/renderer/core/page/scrolling/scrolling_coordinator.cc +++ b/third_party/blink/renderer/core/page/scrolling/scrolling_coordinator.cc
@@ -825,6 +825,10 @@ DCHECK(object); DCHECK(object->GetFrame()); + // TODO(bokan): Speculative fix for https://crbug.com/964293. + if (!object || !object->GetNode()) + return true; + const LocalFrame& frame = *object->GetFrame(); // If we're in an iframe document, we need to determine if the containing