Index: third_party/WebKit/Source/core/page/scrolling/RootScrollerController.cpp |
diff --git a/third_party/WebKit/Source/core/page/scrolling/RootScrollerController.cpp b/third_party/WebKit/Source/core/page/scrolling/RootScrollerController.cpp |
index 8fc0647065efa0b7900508e884af631613518610..3bc682f83477506947c25c7eb340f8caa45b92d5 100644 |
--- a/third_party/WebKit/Source/core/page/scrolling/RootScrollerController.cpp |
+++ b/third_party/WebKit/Source/core/page/scrolling/RootScrollerController.cpp |
@@ -26,7 +26,7 @@ bool fillsViewport(const Element& element) |
LayoutObject* layoutObject = element.layoutObject(); |
- // TODO(bokan): Broken for OOPIF. |
+ // TODO(bokan): Broken for OOPIF. crbug.com/642378. |
Document& topDocument = element.document().topDocument(); |
Vector<FloatQuad> quads; |
@@ -159,6 +159,13 @@ bool RootScrollerController::isViewportScrollCallback( |
// do the comparison. |
DCHECK(!m_document->isInMainFrame()); |
+ // If we don't have a local owner we must be in a remote iframe. |
+ // RootScrollerController doesn't yet work in OOPIF and in any case we have |
+ // no way to get at the ViewportScrollCallback so just return false. |
+ // TODO(bokan): Make document.rootScroller work in OOPIF. crbug.com/642378. |
+ if (!m_document->localOwner()) |
+ return false; |
+ |
RootScrollerController* topDocumentController = |
m_document->topDocument().rootScrollerController(); |
return topDocumentController->isViewportScrollCallback(callback); |