Merge 182954 "Don't bubble scrolls across boundary when scrollin..."

vollick@chromium.org · vollick@chromium.org · commit 9585844963eb · 2014-10-03T19:09:29.000Z
> Don't bubble scrolls across boundary when scrolling to anchor > > Takes the same approach as FrameLoader to ensure that we don't > bubble scrolls incorrectly. > > BUG=415141 > > Review URL: https://codereview.chromium.org/606023003 TBR=vollick@chromium.org Review URL: https://codereview.chromium.org/627663003 git-svn-id: svn://svn.chromium.org/blink/branches/chromium/2171@183208 bbb929c8-8fbe-4397-9dbb-9b2b20218538
diff --git a/LayoutTests/http/tests/navigation/anchor-frames-shifting-focus-expected.html b/LayoutTests/http/tests/navigation/anchor-frames-shifting-focus-expected.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<style>
+iframe {
+  position: absolute;
+  top: 50px;
+  width: 100px;
+  height: 100px;
+  border: 1px solid black;
+}
+::-webkit-scrollbar {
+  width: 0px;
+}
+</style>
+<iframe src='http://127.0.0.1:8000/navigation/resources/focus-shifting-frame-with-anchor.html'></iframe>
+<script>
+if (window.testRunner) {
+  testRunner.waitUntilDone();
+}
+onload = function() {
+  requestAnimationFrame(function() {
+    if (window.testRunner) {
+      testRunner.notifyDone();
+    }
+  });
+};
+</script>
diff --git a/LayoutTests/http/tests/navigation/anchor-frames-shifting-focus.html b/LayoutTests/http/tests/navigation/anchor-frames-shifting-focus.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<style>
+iframe {
+  position: absolute;
+  top: 50px;
+  width: 100px;
+  height: 100px;
+  border: 1px solid black;
+}
+::-webkit-scrollbar {
+  width: 0px;
+}
+</style>
+<div style='width:10px;height:2000px;background:white;position:absolute'></div>
+<iframe src='http://127.0.0.1:8000/navigation/resources/focus-shifting-frame-with-anchor.html' sandbox='allow-scripts'></iframe>
+<script>
+if (window.testRunner) {
+  testRunner.waitUntilDone();
+}
+onload = function() {
+  requestAnimationFrame(function() {
+    if (window.testRunner) {
+      testRunner.notifyDone();
+    }
+  });
+};
+</script>
diff --git a/LayoutTests/http/tests/navigation/resources/focus-shifting-frame-with-anchor.html b/LayoutTests/http/tests/navigation/resources/focus-shifting-frame-with-anchor.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<a href='#'>anchor</a>
+<a id='dummy' href='dummy'>dummy</a>
+<div style='width:10px;height:2000px;background:white'></div>
+<script>
+onload = function() {
+  location.href = '#';
+  requestAnimationFrame(function() {
+    document.getElementById('dummy').focus();
+  });
+}
+</script>
diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp
@@ -1815,10 +1815,18 @@ void FrameView::scrollToAnchor()
     if (anchorNode != m_frame->document())
         rect = anchorNode->boundingBox();
 
+    RefPtrWillBeRawPtr<LocalFrame> boundaryFrame = m_frame->document()->findUnsafeParentScrollPropagationBoundary();
+
+    if (boundaryFrame)
+        boundaryFrame->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 (AXObjectCache* cache = m_frame->document()->existingAXObjectCache())
         cache->handleScrolledToAnchor(anchorNode.get());
 
