Merge pull request #52 from rakuco/revert-faulty-revert

Raphael Kubo da Costa · Raphael Kubo da Costa · commit 6e19c2e88e3d · 2015-04-15T17:24:04.000+03:00
Revert "Revert "Merge 192508 "Focus a page only if the page is different from cu..."
diff --git a/Source/core/loader/FrameLoader.cpp b/Source/core/loader/FrameLoader.cpp
@@ -778,9 +778,12 @@ void FrameLoader::load(const FrameLoadRequest& passedRequest)
 
     RefPtrWillBeRawPtr<LocalFrame> targetFrame = toLocalFrame(request.formState() ? nullptr : m_frame->findFrameForNavigation(AtomicString(request.frameName()), *m_frame));
     if (targetFrame && targetFrame.get() != m_frame) {
+        bool wasInSamePage = targetFrame->page() == m_frame->page();
+
         request.setFrameName("_self");
         targetFrame->loader().load(request);
-        if (Page* page = targetFrame->page())
+        Page* page = targetFrame->page();
+        if (!wasInSamePage && page)
             page->chrome().focus();
         return;
     }
diff --git a/Source/web/tests/WebViewTest.cpp b/Source/web/tests/WebViewTest.cpp
@@ -1602,6 +1602,27 @@ class ViewCreatingWebViewClient : public FrameTestHelpers::TestWebViewClient {
     bool m_didFocusCalled;
 };
 
+TEST_F(WebViewTest, DoNotFocusCurrentFrameOnNavigateFromLocalFrame)
+{
+    ViewCreatingWebViewClient client;
+    FrameTestHelpers::WebViewHelper m_webViewHelper;
+    WebViewImpl* webViewImpl = m_webViewHelper.initialize(true, 0, &client);
+    webViewImpl->page()->settings().setJavaScriptCanOpenWindowsAutomatically(true);
+
+    WebURL baseURL = URLTestHelpers::toKURL("http://example.com/");
+    FrameTestHelpers::loadHTMLString(webViewImpl->mainFrame(), "<html><body><iframe src=\"about:blank\"></iframe></body></html>", baseURL);
+
+    // Make a request from a local frame.
+    WebURLRequest webURLRequestWithTargetStart;
+    webURLRequestWithTargetStart.initialize();
+    LocalFrame* localFrame = toWebLocalFrameImpl(webViewImpl->mainFrame()->firstChild())->frame();
+    FrameLoadRequest requestWithTargetStart(localFrame->document(), webURLRequestWithTargetStart.toResourceRequest(), "_top");
+    localFrame->loader().load(requestWithTargetStart);
+    EXPECT_FALSE(client.didFocusCalled());
+
+    m_webViewHelper.reset(); // Remove dependency on locally scoped client.
+}
+
 TEST_F(WebViewTest, FocusExistingFrameOnNavigate)
 {
     ViewCreatingWebViewClient client;
