| Index: Source/core/loader/FrameLoader.h
|
| diff --git a/Source/core/loader/FrameLoader.h b/Source/core/loader/FrameLoader.h
|
| index 4105569918b64d59cdffd3ef0f2c559dba4e988d..a4532f4602a1e912fe1b31e073ce36c7f1b6a3e0 100644
|
| --- a/Source/core/loader/FrameLoader.h
|
| +++ b/Source/core/loader/FrameLoader.h
|
| @@ -41,6 +41,7 @@
|
| #include "core/loader/HistoryItem.h"
|
| #include "core/loader/MixedContentChecker.h"
|
| #include "platform/Timer.h"
|
| +#include "platform/heap/Handle.h"
|
| #include "platform/network/ResourceRequest.h"
|
| #include "wtf/Forward.h"
|
| #include "wtf/HashSet.h"
|
| @@ -72,8 +73,9 @@ struct WindowFeatures;
|
|
|
| bool isBackForwardLoadType(FrameLoadType);
|
|
|
| -class FrameLoader {
|
| +class FrameLoader FINAL {
|
| WTF_MAKE_NONCOPYABLE(FrameLoader);
|
| + ALLOW_ONLY_INLINE_ALLOCATION();
|
| public:
|
| static ResourceRequest requestFromHistoryItem(HistoryItem*, ResourceRequestCachePolicy);
|
|
|
| @@ -189,6 +191,8 @@ public:
|
|
|
| void restoreScrollPositionAndViewState();
|
|
|
| + void trace(Visitor*);
|
| +
|
| private:
|
| bool allChildrenAreComplete() const; // immediate children, not all descendants
|
|
|
| @@ -223,7 +227,7 @@ private:
|
|
|
| void scheduleCheckCompleted();
|
|
|
| - LocalFrame* m_frame;
|
| + RawPtrWillBeMember<LocalFrame> m_frame;
|
|
|
| // FIXME: These should be OwnPtr<T> to reduce build times and simplify
|
| // header dependencies unless performance testing proves otherwise.
|
| @@ -243,7 +247,7 @@ private:
|
| RefPtr<DocumentLoader> m_documentLoader;
|
| RefPtr<DocumentLoader> m_provisionalDocumentLoader;
|
| RefPtr<DocumentLoader> m_policyDocumentLoader;
|
| - OwnPtr<FetchContext> m_fetchContext;
|
| + OwnPtrWillBeMember<FetchContext> m_fetchContext;
|
|
|
| RefPtr<HistoryItem> m_currentItem;
|
| RefPtr<HistoryItem> m_provisionalItem;
|
|
|