| Index: Source/core/loader/FrameLoader.h
|
| diff --git a/Source/core/loader/FrameLoader.h b/Source/core/loader/FrameLoader.h
|
| index cd59b852947c6df7ad1f5833790a1878161746eb..83a01a6ebe7bc085852f62302d5899686ba15dfc 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);
|
|
|
| @@ -100,8 +102,15 @@ public:
|
| void stopAllLoaders();
|
| void stopLoading();
|
| bool closeURL();
|
| - // FIXME: clear() is trying to do too many things. We should break it down into smaller functions.
|
| - void clear();
|
| +
|
| + // FIXME: dispose() is trying to do too many things. We should break it down into smaller functions.
|
| + enum DisposeFrameContents {
|
| + DoNotDisposeFrameContents,
|
| + DoDisposeFrameContents
|
| + };
|
| +
|
| + void dispose(DisposeFrameContents);
|
| +
|
| void replaceDocumentWhileExecutingJavaScriptURL(const String& source, Document* ownerDocument);
|
|
|
| // Sets a timer to notify the client that the initial empty document has
|
| @@ -187,6 +196,8 @@ public:
|
|
|
| void restoreScrollPositionAndViewState();
|
|
|
| + void trace(Visitor*);
|
| +
|
| private:
|
| bool allChildrenAreComplete() const; // immediate children, not all descendants
|
|
|
| @@ -221,7 +232,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.
|
| @@ -241,7 +252,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;
|
|
|