Index: Source/core/loader/FrameLoader.h |
diff --git a/Source/core/loader/FrameLoader.h b/Source/core/loader/FrameLoader.h |
index adda330194beb068ecf5870702206aa6c5f9956b..39b727e8afaa626c5ca14e64c52d3c7a96c545d7 100644 |
--- a/Source/core/loader/FrameLoader.h |
+++ b/Source/core/loader/FrameLoader.h |
@@ -40,6 +40,7 @@ |
#include "core/loader/FrameLoaderTypes.h" |
#include "core/loader/HistoryItem.h" |
#include "platform/Timer.h" |
+#include "platform/heap/Handle.h" |
#include "platform/network/ResourceRequest.h" |
#include "wtf/Forward.h" |
#include "wtf/HashSet.h" |
@@ -62,8 +63,9 @@ struct FrameLoadRequest; |
bool isBackForwardLoadType(FrameLoadType); |
-class FrameLoader { |
+class FrameLoader FINAL { |
WTF_MAKE_NONCOPYABLE(FrameLoader); |
+ ALLOW_ONLY_INLINE_ALLOCATION(); |
haraken
2014/09/22 05:35:23
DISALLOW_ALLOCATION() ?
sof
2014/09/22 07:25:49
That would be more precise.
Possible to come up
haraken
2014/09/22 08:19:03
Or COMPOUND_OR_STACK_ALLOCATED() ? Then we can ren
|
public: |
static ResourceRequest requestFromHistoryItem(HistoryItem*, ResourceRequestCachePolicy); |
@@ -89,8 +91,10 @@ 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(); |
+ |
void replaceDocumentWhileExecutingJavaScriptURL(const String& source, Document* ownerDocument); |
// Sets a timer to notify the client that the initial empty document has |
@@ -176,6 +180,8 @@ public: |
void restoreScrollPositionAndViewState(); |
+ void trace(Visitor*); |
+ |
private: |
bool allChildrenAreComplete() const; // immediate children, not all descendants |
@@ -210,7 +216,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. |
@@ -229,7 +235,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; |