Index: Source/core/frame/FrameView.cpp |
diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp |
index 61cf629873ec39cc949226d3c4c7849c92ed4ddc..9b2004d7a60edb737ed362c6e1c7745ee5eda06f 100644 |
--- a/Source/core/frame/FrameView.cpp |
+++ b/Source/core/frame/FrameView.cpp |
@@ -1969,17 +1969,18 @@ void FrameView::scrollToAnchor() |
if (anchorNode != m_frame->document()) |
rect = anchorNode->boundingBox(); |
- RefPtrWillBeRawPtr<LocalFrame> boundaryFrame = m_frame->document()->findUnsafeParentScrollPropagationBoundary(); |
+ RefPtrWillBeRawPtr<Frame> boundaryFrame = m_frame->findUnsafeParentScrollPropagationBoundary(); |
- if (boundaryFrame) |
- boundaryFrame->view()->setSafeToPropagateScrollToParent(false); |
+ // FIXME: Handle RemoteFrames |
+ if (boundaryFrame && boundaryFrame->isLocalFrame()) |
+ toLocalFrame(boundaryFrame.get())->view()->setSafeToPropagateScrollToParent(false); |
// Scroll nested layers and frames to reveal the anchor. |
// Align to the top and to the closest side (this matches other browsers). |
anchorNode->renderer()->scrollRectToVisible(rect, ScrollAlignment::alignToEdgeIfNeeded, ScrollAlignment::alignTopAlways); |
- if (boundaryFrame) |
- boundaryFrame->view()->setSafeToPropagateScrollToParent(true); |
+ if (boundaryFrame && boundaryFrame->isLocalFrame()) |
+ toLocalFrame(boundaryFrame.get())->view()->setSafeToPropagateScrollToParent(true); |
if (AXObjectCache* cache = m_frame->document()->existingAXObjectCache()) |
cache->handleScrolledToAnchor(anchorNode.get()); |