Move Frame to the Oilpan heap.

Source/core/page/FrameTree.cpp

 /*
  * Copyright (C) Research In Motion Limited 2010. All rights reserved.
  * Copyright (C) 2006 Apple Computer, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 32 matching lines @@
 } // namespace
 
 FrameTree::FrameTree(Frame* thisFrame)
     : m_thisFrame(thisFrame)
     , m_scopedChildCount(invalidChildCount)
 {
 }
 
 FrameTree::~FrameTree()
 {
+#if !ENABLE(OILPAN)

[Mads Ager (chromium), 2014/09/18 12:00:59]

Does this imply that we can avoid doing this non-oilpan as well (as the FIXME
comment below indicates)?

[sof, 2014/09/18 13:31:15]

Maybe, I haven't investigated if the clearing needs to happen right here _if_
the frame still has a FrameClient attached.

     // FIXME: Why is this here? Doesn't this parallel what we already do in ~LocalFrame?
     for (Frame* child = firstChild(); child; child = child->tree().nextSibling()) {
         if (child->isLocalFrame())
             toLocalFrame(child)->setView(nullptr);
         else if (child->isRemoteFrame())
             toRemoteFrame(child)->setView(nullptr);
     }
+#endif
 }
 
 void FrameTree::setName(const AtomicString& name, const AtomicString& fallbackName)
 {
     m_name = name;
     if (!parent()) {
         m_uniqueName = name;
         return;
     }
     m_uniqueName = AtomicString(); // Remove our old frame name so it's not considered in uniqueChildName.
     m_uniqueName = parent()->tree().uniqueChildName(name.isEmpty() ? fallbackName : name);
 }
 
 Frame* FrameTree::parent() const
 {
     if (!m_thisFrame->client())
         return 0;
     return m_thisFrame->client()->parent();
 }
 
 Frame* FrameTree::top() const
 {
     // FIXME: top() should never return null, so here are some hacks to deal
     // with EmptyFrameLoaderClient and cases where the frame is detached
     // already...
     if (!m_thisFrame->client())
         return m_thisFrame;
     Frame* candidate = m_thisFrame->client()->top();
-    return candidate ? candidate : m_thisFrame;
+    return candidate ? candidate : m_thisFrame.get();
 }
 
 Frame* FrameTree::previousSibling() const
 {
     if (!m_thisFrame->client())
         return 0;
     return m_thisFrame->client()->previousSibling();
 }
 
 Frame* FrameTree::nextSibling() const
@@ skipping 148 matching lines @@
 
 Frame* FrameTree::find(const AtomicString& name) const
 {
     if (name == "_self" || name == "_current" || name.isEmpty())
         return m_thisFrame;
 
     if (name == "_top")
         return top();
 
     if (name == "_parent")
-        return parent() ? parent() : m_thisFrame;
+        return parent() ? parent() : m_thisFrame.get();
 
     // Since "_blank" should never be any frame's name, the following just amounts to an optimization.
     if (name == "_blank")
         return 0;
 
     // Search subtree starting with this frame first.
     for (Frame* frame = m_thisFrame; frame; frame = frame->tree().traverseNext(m_thisFrame))
         if (frame->tree().name() == name)
             return frame;
 
@@ skipping 102 matching lines @@
 
 Frame* FrameTree::deepLastChild() const
 {
     Frame* result = m_thisFrame;
     for (Frame* last = lastChild(); last; last = last->tree().lastChild())
         result = last;
 
     return result;
 }
 
+void FrameTree::trace(Visitor* visitor)
+{
+    visitor->trace(m_thisFrame);
+}
+
 } // namespace blink
 
 #ifndef NDEBUG
 
 static void printIndent(int indent)
 {
     for (int i = 0; i < indent; ++i)
         printf("    ");
 }
 
@@ skipping 24 matching lines @@
 {
     if (!frame) {
         printf("Null input frame\n");
         return;
     }
 
     printFrames(frame->tree().top(), frame, 0);
 }
 
 #endif