| Index: third_party/WebKit/Source/core/loader/FrameLoader.cpp
|
| diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.cpp b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
|
| index 3f62008d853e5726fe1ca61f37795fa197d8e713..563d567c24eb08f179d70838d55d491ef56387cb 100644
|
| --- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
|
| +++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
|
| @@ -1576,9 +1576,10 @@ void FrameLoader::processFragment(const KURL& url,
|
| !(m_currentItem &&
|
| m_currentItem->scrollRestorationType() == ScrollRestorationManual));
|
|
|
| - view->processUrlFragment(url, shouldScrollToFragment
|
| - ? FrameView::UrlFragmentScroll
|
| - : FrameView::UrlFragmentDontScroll);
|
| + view->processUrlFragment(url,
|
| + shouldScrollToFragment
|
| + ? FrameView::UrlFragmentScroll
|
| + : FrameView::UrlFragmentDontScroll);
|
|
|
| if (boundaryFrame && boundaryFrame->isLocalFrame())
|
| toLocalFrame(boundaryFrame)->view()->setSafeToPropagateScrollToParent(true);
|
| @@ -2008,9 +2009,10 @@ DocumentLoader* FrameLoader::createDocumentLoader(
|
| FrameLoadType loadType,
|
| NavigationType navigationType) {
|
| DocumentLoader* loader = client()->createDocumentLoader(
|
| - m_frame, request, frameLoadRequest.substituteData().isValid()
|
| - ? frameLoadRequest.substituteData()
|
| - : defaultSubstituteDataForURL(request.url()),
|
| + m_frame, request,
|
| + frameLoadRequest.substituteData().isValid()
|
| + ? frameLoadRequest.substituteData()
|
| + : defaultSubstituteDataForURL(request.url()),
|
| frameLoadRequest.clientRedirect());
|
|
|
| loader->setLoadType(loadType);
|
|
|