Chromium Code Reviews| Index: Source/core/loader/FrameLoader.cpp |
| diff --git a/Source/core/loader/FrameLoader.cpp b/Source/core/loader/FrameLoader.cpp |
| index f37d7a4ab0bbf399a4e53e16cd53daaa59b91427..6bf62e2b835f87b07e39d731184add7c13f06128 100644 |
| --- a/Source/core/loader/FrameLoader.cpp |
| +++ b/Source/core/loader/FrameLoader.cpp |
| @@ -55,6 +55,7 @@ |
| #include "core/frame/FrameView.h" |
| #include "core/frame/LocalFrame.h" |
| #include "core/frame/PinchViewport.h" |
| +#include "core/frame/RemoteFrame.h" |
|
Nate Chapin
2015/06/08 16:56:22
Remove this?
nasko
2015/06/08 17:27:04
Done.
|
| #include "core/frame/Settings.h" |
| #include "core/frame/csp/ContentSecurityPolicy.h" |
| #include "core/html/HTMLFormElement.h" |
| @@ -693,7 +694,7 @@ bool FrameLoader::prepareRequestForThisFrame(FrameLoadRequest& request) |
| return true; |
| } |
| -static bool shouldOpenInNewWindow(LocalFrame* targetFrame, const FrameLoadRequest& request, NavigationPolicy policy) |
| +static bool shouldOpenInNewWindow(Frame* targetFrame, const FrameLoadRequest& request, NavigationPolicy policy) |
| { |
| if (!targetFrame && !request.frameName().isEmpty()) |
| return true; |
| @@ -778,12 +779,12 @@ void FrameLoader::load(const FrameLoadRequest& passedRequest) |
| if (!prepareRequestForThisFrame(request)) |
| return; |
| - RefPtrWillBeRawPtr<LocalFrame> targetFrame = toLocalFrame(request.form() ? nullptr : m_frame->findFrameForNavigation(AtomicString(request.frameName()), *m_frame)); |
| + RefPtrWillBeRawPtr<Frame> targetFrame = request.form() ? 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); |
| + targetFrame->navigate(request); |
| Page* page = targetFrame->page(); |
| if (!wasInSamePage && page) |
| page->chromeClient().focus(); |