Move Frame to the Oilpan heap.

Source/core/frame/Frame.h

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999-2001 Lars Knoll <knoll@kde.org>
  *                     1999-2001 Antti Koivisto <koivisto@kde.org>
  *                     2000-2001 Simon Hausmann <hausmann@kde.org>
  *                     2000-2001 Dirk Mueller <mueller@kde.org>
  *                     2000 Stefan Schimanski <1Stein@gmx.de>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
@@ skipping 16 matching lines @@
 
 #ifndef Frame_h
 #define Frame_h
 
 #include "core/page/FrameTree.h"
 #include "platform/heap/Handle.h"
 #include "wtf/Forward.h"
 #include "wtf/RefCounted.h"
 
 namespace blink {
-class WebLayer;
-}
-
-namespace blink {
 
 class ChromeClient;
 class FrameClient;
 class FrameHost;
 class FrameOwner;
+class FrameProtector;
 class HTMLFrameOwnerElement;
 class LocalDOMWindow;
 class Page;
 class RenderPart;
 class Settings;
+class WebLayer;
 
-class Frame : public RefCounted<Frame> {
+class Frame : public RefCountedWillBeGarbageCollectedFinalized<Frame> {
 public:
     virtual bool isLocalFrame() const { return false; }
     virtual bool isRemoteFrame() const { return false; }
 
     virtual ~Frame();
+    virtual void trace(Visitor*);
 
+#if ENABLE(OILPAN)
+    void willBeDestroyed();
+#endif
     virtual void detach() = 0;
     void detachChildren();
 
     FrameClient* client() const;
     void clearClient();
 
     // NOTE: Page is moving out of Blink up into the browser process as
     // part of the site-isolation (out of process iframes) work.
     // FrameHost should be used instead where possible.
     Page* page() const;
@@ skipping 11 matching lines @@
     // after RemoteFrame is complete enough to exist without them.
     virtual void setDOMWindow(PassRefPtrWillBeRawPtr<LocalDOMWindow>);
     LocalDOMWindow* domWindow() const;
 
     FrameTree& tree() const;
     ChromeClient& chromeClient() const;
 
     RenderPart* ownerRenderer() const; // Renderer for the element that contains this frame.
 
     // FIXME: These should move to RemoteFrame when that is instantiated.
-    void setRemotePlatformLayer(blink::WebLayer*);
-    blink::WebLayer* remotePlatformLayer() const { return m_remotePlatformLayer; }
+    void setRemotePlatformLayer(WebLayer*);
+    WebLayer* remotePlatformLayer() const { return m_remotePlatformLayer; }
 
     Settings* settings() const; // can be null
 
     // FIXME: This method identifies a LocalFrame that is acting as a RemoteFrame.
     // It is necessary only until we can instantiate a RemoteFrame, at which point
     // it can be removed and its callers can be converted to use the isRemoteFrame()
     // method.
     bool isRemoteFrameTemporary() const { return m_remotePlatformLayer; }
 
+#if ENABLE(OILPAN)
+    bool hasBeenDisposed() const { return m_hasBeenDisposed; }
+
+    int incrementDisposeProtectionCount() { return m_disposeProtectionCount++; }
+    int decrementDisposeProtectionCount() { ASSERT(m_disposeProtectionCount > 0); return --m_disposeProtectionCount; }
+#endif
+
 protected:
     Frame(FrameClient*, FrameHost*, FrameOwner*);
 
+    virtual void dispose();
+
+#if ENABLE(OILPAN)
+    friend class FrameProtector;
+
+    void setHasBeenDisposed() { m_hasBeenDisposed = true; }
+#endif
+
     mutable FrameTree m_treeNode;
 
     FrameHost* m_host;
-    FrameOwner* m_owner;
+    RawPtrWillBeMember<FrameOwner> m_owner;
 
-    RefPtrWillBePersistent<LocalDOMWindow> m_domWindow;
+    RefPtrWillBeMember<LocalDOMWindow> m_domWindow;
 
 private:
     FrameClient* m_client;
-    blink::WebLayer* m_remotePlatformLayer;
+    WebLayer* m_remotePlatformLayer;
+
+#if ENABLE(OILPAN)
+    // If > 0, the LocalFrame has existing stack references and
+    // its disposing should be delayed until the stack has unwound
+    // past all of them. The FrameProtector class handles
+    // the details.
+    int m_disposeProtectionCount;
+
+    // The flag will be set to true when the frame is informed of
+    // pending destruction. All Frame owners must explicitly signal
+    // this (through Frame::willBeDestroyed()) so that timely
+    // finalization actions can be performed then; this cannot be
+    // reliably done when the GCed object is later on swept.
+    bool m_hasBeenDisposed;
+#endif
 };
 
 inline FrameClient* Frame::client() const
 {
     return m_client;
 }
 
 inline void Frame::clearClient()
 {
     m_client = 0;
@@ skipping 13 matching lines @@
 {
     return m_treeNode;
 }
 
 // Allow equality comparisons of Frames by reference or pointer, interchangeably.
 DEFINE_COMPARISON_OPERATORS_WITH_REFERENCES_REFCOUNTED(Frame)
 
 } // namespace blink
 
 #endif // Frame_h