| Index: Source/web/WebLocalFrameImpl.cpp
|
| diff --git a/Source/web/WebLocalFrameImpl.cpp b/Source/web/WebLocalFrameImpl.cpp
|
| index f464b41ba01f9a98cd4aaf3d904c86e63d8b911f..f11d2cd8fde970232fadb3e0cba60244afb6a82e 100644
|
| --- a/Source/web/WebLocalFrameImpl.cpp
|
| +++ b/Source/web/WebLocalFrameImpl.cpp
|
| @@ -850,7 +850,8 @@ void WebLocalFrameImpl::loadHistoryItem(const WebHistoryItem& item, WebHistoryLo
|
| ASSERT(frame());
|
| RefPtr<HistoryItem> historyItem = PassRefPtr<HistoryItem>(item);
|
| ASSERT(historyItem);
|
| - frame()->loader().loadHistoryItem(historyItem.get(), static_cast<HistoryLoadType>(loadType), static_cast<ResourceRequestCachePolicy>(cachePolicy));
|
| + frame()->loader().loadHistoryItem(historyItem.get(), FrameLoadTypeBackForward,
|
| + static_cast<HistoryLoadType>(loadType), static_cast<ResourceRequestCachePolicy>(cachePolicy));
|
| }
|
|
|
| void WebLocalFrameImpl::loadData(const WebData& data, const WebString& mimeType, const WebString& textEncoding, const WebURL& baseURL, const WebURL& unreachableURL, bool replace)
|
| @@ -1595,7 +1596,7 @@ PassRefPtrWillBeRawPtr<LocalFrame> WebLocalFrameImpl::createChildFrame(const Fra
|
| childItem = PassRefPtr<HistoryItem>(webframeChild->client()->historyItemForNewChildFrame(webframeChild));
|
|
|
| if (childItem)
|
| - child->loader().loadHistoryItem(childItem.get());
|
| + child->loader().loadHistoryItem(childItem.get(), FrameLoadTypeInitialHistoryLoad);
|
| else
|
| child->loader().load(FrameLoadRequest(request.originDocument(), request.resourceRequest(), "_self"));
|
|
|
|
|