| Index: Source/core/loader/FrameLoader.h
|
| diff --git a/Source/core/loader/FrameLoader.h b/Source/core/loader/FrameLoader.h
|
| index b62372db8fbb43d1d8fb809abe62f59c1b143e91..82b5b1d0fa8418561dc01d8e46e09650b1bee5db 100644
|
| --- a/Source/core/loader/FrameLoader.h
|
| +++ b/Source/core/loader/FrameLoader.h
|
| @@ -228,9 +228,14 @@ private:
|
| RefPtrWillBeMember<HistoryItem> m_currentItem;
|
| RefPtrWillBeMember<HistoryItem> m_provisionalItem;
|
|
|
| - struct DeferredHistoryLoad {
|
| + class DeferredHistoryLoad : public NoBaseWillBeGarbageCollectedFinalized<DeferredHistoryLoad> {
|
| DISALLOW_COPY(DeferredHistoryLoad);
|
| public:
|
| + static PassOwnPtrWillBeRawPtr<DeferredHistoryLoad> create(ResourceRequest request, HistoryItem* item, FrameLoadType loadType, HistoryLoadType historyLoadType)
|
| + {
|
| + return adoptPtrWillBeNoop(new DeferredHistoryLoad(request, item, loadType, historyLoadType));
|
| + }
|
| +
|
| DeferredHistoryLoad(ResourceRequest request, HistoryItem* item, FrameLoadType loadType,
|
| HistoryLoadType historyLoadType)
|
| : m_request(request)
|
| @@ -240,8 +245,6 @@ private:
|
| {
|
| }
|
|
|
| - DeferredHistoryLoad() { }
|
| -
|
| DEFINE_INLINE_TRACE()
|
| {
|
| visitor->trace(m_item);
|
| @@ -253,7 +256,7 @@ private:
|
| HistoryLoadType m_historyLoadType;
|
| };
|
|
|
| - OwnPtr<DeferredHistoryLoad> m_deferredHistoryLoad;
|
| + OwnPtrWillBeMember<DeferredHistoryLoad> m_deferredHistoryLoad;
|
|
|
| bool m_inStopAllLoaders;
|
|
|
|
|