| Index: Source/core/loader/NavigationScheduler.cpp
|
| diff --git a/Source/core/loader/NavigationScheduler.cpp b/Source/core/loader/NavigationScheduler.cpp
|
| index 0b0afb0d1f32a8aed5e08bdc1d1ce0f809af4a89..eb5ce053ad5a245a60f0595859529d3baa09fafe 100644
|
| --- a/Source/core/loader/NavigationScheduler.cpp
|
| +++ b/Source/core/loader/NavigationScheduler.cpp
|
| @@ -108,6 +108,8 @@ protected:
|
| {
|
| OwnPtr<UserGestureIndicator> gestureIndicator = createUserGestureIndicator();
|
| FrameLoadRequest request(m_originDocument.get(), ResourceRequest(KURL(ParsedURLString, m_url), m_referrer), "_self");
|
| + if (frame)
|
| + request.resourceRequest().initializeForMainResource(frame->isMainFrame());
|
| request.setLockBackForwardList(lockBackForwardList());
|
| request.setClientRedirect(ClientRedirect);
|
| frame->loader().load(request);
|
| @@ -140,6 +142,8 @@ public:
|
| request.setLockBackForwardList(lockBackForwardList());
|
| if (equalIgnoringFragmentIdentifier(frame->document()->url(), request.resourceRequest().url()))
|
| request.resourceRequest().setCachePolicy(ReloadIgnoringCacheData);
|
| + if (frame)
|
| + request.resourceRequest().initializeForMainResource(frame->isMainFrame());
|
| request.setClientRedirect(ClientRedirect);
|
| frame->loader().load(request);
|
| }
|
| @@ -162,6 +166,8 @@ public:
|
| {
|
| OwnPtr<UserGestureIndicator> gestureIndicator = createUserGestureIndicator();
|
| FrameLoadRequest request(originDocument(), ResourceRequest(KURL(ParsedURLString, url()), referrer(), ReloadIgnoringCacheData), "_self");
|
| + if (frame)
|
| + request.resourceRequest().initializeForMainResource(frame->isMainFrame());
|
| request.setLockBackForwardList(lockBackForwardList());
|
| request.setClientRedirect(ClientRedirect);
|
| frame->loader().load(request);
|
| @@ -182,6 +188,8 @@ public:
|
|
|
| if (!m_historySteps) {
|
| FrameLoadRequest frameRequest(frame->document(), ResourceRequest(frame->document()->url()));
|
| + if (frame)
|
| + frameRequest.resourceRequest().initializeForMainResource(frame->isMainFrame());
|
| frameRequest.setLockBackForwardList(lockBackForwardList());
|
| // Special case for go(0) from a frame -> reload only the frame
|
| // To follow Firefox and IE's behavior, history reload can only navigate the self frame.
|
|
|