Move Frame to the Oilpan heap.

Source/core/loader/FrameLoader.h

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) Research In Motion Limited 2009. All rights reserved.
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
@@ skipping 22 matching lines @@
 #define FrameLoader_h
 
 #include "core/dom/IconURL.h"
 #include "core/dom/SandboxFlags.h"
 #include "core/dom/SecurityContext.h"
 #include "core/fetch/ResourceLoaderOptions.h"
 #include "core/loader/FrameLoaderStateMachine.h"
 #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"
 #include "wtf/OwnPtr.h"
 
 namespace blink {
 
 class DocumentLoader;
 class FetchContext;
 class FormState;
 class Frame;
 class FrameLoaderClient;
 class NavigationAction;
 class ProgressTracker;
 class ResourceError;
 class SerializedScriptValue;
 class SubstituteData;
 
 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 with a better name for this macro? PART_OR_STACK_ALLOCATED()
?

[haraken, 2014/09/22 08:19:03]

Or COMPOUND_OR_STACK_ALLOCATED() ? Then we can rename
ALLOW_ONLY_INLINE_ALLOCATION to COLLECTION_OR_COMPUND_OR_STACK_ALLOCATED.

However, I'm not sure if it's a great improvement... I'd prefer keeping the
current name until we come up with a more consistent name for the three macros.

 public:
     static ResourceRequest requestFromHistoryItem(HistoryItem*, ResourceRequestCachePolicy);
 
     FrameLoader(LocalFrame*);
     ~FrameLoader();
 
     void init();
 
     LocalFrame* frame() const { return m_frame; }
 
     ProgressTracker& progress() const { return *m_progressTracker; }
 
     // These functions start a load. All eventually call into loadWithNavigationAction() or loadInSameDocument().
     void load(const FrameLoadRequest&); // The entry point for non-reload, non-history loads.
     void reload(ReloadPolicy = NormalReload, const KURL& overrideURL = KURL(), const AtomicString& overrideEncoding = nullAtom, ClientRedirectPolicy = NotClientRedirect);
     void loadHistoryItem(HistoryItem*, HistoryLoadType = HistoryDifferentDocumentLoad, ResourceRequestCachePolicy = UseProtocolCachePolicy); // The entry point for all back/forward loads
 
     static void reportLocalLoadFailed(LocalFrame*, const String& url);
 
     // FIXME: These are all functions which stop loads. We have too many.
     // Warning: stopAllLoaders can and will detach the LocalFrame out from under you. All callers need to either protect the LocalFrame
     // or guarantee they won't in any way access the LocalFrame after stopAllLoaders returns.
     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
     // been accessed, and thus it is no longer safe to show a provisional URL
     // above the document without risking a URL spoof.
     void didAccessInitialDocument();
 
     // If the initial empty document is showing and has been accessed, this
     // cancels the timer and immediately notifies the client in cases that
     // waiting to notify would allow a URL spoof.
@@ skipping 65 matching lines @@
     bool allowPlugins(ReasonForCallingAllowPlugins);
 
     void updateForSameDocumentNavigation(const KURL&, SameDocumentNavigationSource, PassRefPtr<SerializedScriptValue>, FrameLoadType);
 
     HistoryItem* currentItem() const { return m_currentItem.get(); }
     void saveScrollState();
     void clearScrollPositionAndViewState();
 
     void restoreScrollPositionAndViewState();
 
+    void trace(Visitor*);
+
 private:
     bool allChildrenAreComplete() const; // immediate children, not all descendants
 
     void completed();
 
     void checkTimerFired(Timer<FrameLoader>*);
     void didAccessInitialDocumentTimerFired(Timer<FrameLoader>*);
 
     bool prepareRequestForThisFrame(FrameLoadRequest&);
     void setReferrerForFrameRequest(ResourceRequest&, ShouldSendReferrer, Document*);
@@ skipping 14 matching lines @@
     bool validateTransitionNavigationMode();
     bool dispatchNavigationTransitionData();
     void detachClient();
 
     void setHistoryItemStateForCommit(HistoryCommitType, bool isPushOrReplaceState = false, PassRefPtr<SerializedScriptValue> = nullptr);
 
     void loadInSameDocument(const KURL&, PassRefPtr<SerializedScriptValue> stateObject, FrameLoadType, ClientRedirectPolicy);
 
     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.
     // Some of these could be lazily created for memory savings on devices.
     mutable FrameLoaderStateMachine m_stateMachine;
 
     OwnPtr<ProgressTracker> m_progressTracker;
 
     FrameState m_state;
     FrameLoadType m_loadType;
 
     // Document loaders for the three phases of frame loading. Note that while
     // a new request is being loaded, the old document loader may still be referenced.
     // E.g. while a new request is in the "policy" state, the old document loader may
     // be consulted in particular as it makes sense to imply certain settings on the new loader.
     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;
     struct DeferredHistoryLoad {
         DeferredHistoryLoad(HistoryItem* item, HistoryLoadType type, ResourceRequestCachePolicy cachePolicy)
             : m_item(item)
             , m_type(type)
             , m_cachePolicy(cachePolicy)
         {
         }
@@ skipping 14 matching lines @@
 
     bool m_didAccessInitialDocument;
     Timer<FrameLoader> m_didAccessInitialDocumentTimer;
 
     SandboxFlags m_forcedSandboxFlags;
 };
 
 } // namespace blink
 
 #endif // FrameLoader_h