| Index: Source/web/WebLocalFrameImpl.cpp
|
| diff --git a/Source/web/WebLocalFrameImpl.cpp b/Source/web/WebLocalFrameImpl.cpp
|
| index a4b6bf98c91f95aff7373f6899df13992026a770..bc1b68bf71b9c5a36a9474f91f4468c598ea88a7 100644
|
| --- a/Source/web/WebLocalFrameImpl.cpp
|
| +++ b/Source/web/WebLocalFrameImpl.cpp
|
| @@ -849,7 +849,7 @@ void WebLocalFrameImpl::loadRequest(const WebURLRequest& request)
|
| void WebLocalFrameImpl::loadHistoryItem(const WebHistoryItem& item, WebHistoryLoadType loadType, WebURLRequest::CachePolicy cachePolicy)
|
| {
|
| ASSERT(frame());
|
| - RefPtr<HistoryItem> historyItem = PassRefPtr<HistoryItem>(item);
|
| + RefPtrWillBeRawPtr<HistoryItem> historyItem = PassRefPtrWillBeRawPtr<HistoryItem>(item);
|
| ASSERT(historyItem);
|
| frame()->loader().loadHistoryItem(historyItem.get(), FrameLoadTypeBackForward,
|
| static_cast<HistoryLoadType>(loadType), static_cast<ResourceRequestCachePolicy>(cachePolicy));
|
| @@ -1589,9 +1589,9 @@ PassRefPtrWillBeRawPtr<LocalFrame> WebLocalFrameImpl::createChildFrame(const Fra
|
|
|
| // If we're moving in the back/forward list, we might want to replace the content
|
| // of this child frame with whatever was there at that point.
|
| - RefPtr<HistoryItem> childItem;
|
| + RefPtrWillBeRawPtr<HistoryItem> childItem = nullptr;
|
| if (isBackForwardLoadType(frame()->loader().loadType()) && !frame()->document()->loadEventFinished())
|
| - childItem = PassRefPtr<HistoryItem>(webframeChild->client()->historyItemForNewChildFrame(webframeChild));
|
| + childItem = PassRefPtrWillBeRawPtr<HistoryItem>(webframeChild->client()->historyItemForNewChildFrame(webframeChild));
|
|
|
| if (childItem)
|
| child->loader().loadHistoryItem(childItem.get(), FrameLoadTypeInitialHistoryLoad);
|
|
|