summaryrefslogtreecommitdiffstats
path: root/chromium/third_party/blink/renderer/core/page/scrolling/scrolling_coordinator.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-06-27 11:18:24 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-07-03 09:38:30 +0000
commitd94af01c90575348c4e81a418257f254b6f8d225 (patch)
tree77a26669b33eaa4d46b88b07e17dacc61eba6001 /chromium/third_party/blink/renderer/core/page/scrolling/scrolling_coordinator.cc
parent5d87695f37678f96492b258bbab36486c59866b4 (diff)
BASELINE: Update Chromium to 75.0.3770.116
Change-Id: Ifcd5227841577e8ce81a1b7a54c56caba4d85e02 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/core/page/scrolling/scrolling_coordinator.cc')
-rw-r--r--chromium/third_party/blink/renderer/core/page/scrolling/scrolling_coordinator.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chromium/third_party/blink/renderer/core/page/scrolling/scrolling_coordinator.cc b/chromium/third_party/blink/renderer/core/page/scrolling/scrolling_coordinator.cc
index b443a2d9f4a..b95b34b5118 100644
--- a/chromium/third_party/blink/renderer/core/page/scrolling/scrolling_coordinator.cc
+++ b/chromium/third_party/blink/renderer/core/page/scrolling/scrolling_coordinator.cc
@@ -827,6 +827,10 @@ bool ScrollsWithRootFrame(LayoutObject* object) {
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