| Index: Source/core/frame/Frame.cpp
|
| diff --git a/Source/core/frame/Frame.cpp b/Source/core/frame/Frame.cpp
|
| index f647b3e5988b5ed202236a17a12183a39112612d..19b222052efbcd2a92752cfc5dc4ab4a1bc1c6f0 100644
|
| --- a/Source/core/frame/Frame.cpp
|
| +++ b/Source/core/frame/Frame.cpp
|
| @@ -63,6 +63,7 @@ Frame::Frame(FrameClient* client, FrameHost* host, FrameOwner* owner)
|
| , m_owner(owner)
|
| , m_client(client)
|
| , m_remotePlatformLayer(0)
|
| + , m_hasBeenClosed(false)
|
| {
|
| ASSERT(page());
|
|
|
| @@ -81,19 +82,35 @@ Frame::Frame(FrameClient* client, FrameHost* host, FrameOwner* owner)
|
|
|
| Frame::~Frame()
|
| {
|
| + // FIXME: We should not be doing all this work inside the destructor
|
| + dispose();
|
| +}
|
| +
|
| +void Frame::dispose()
|
| +{
|
| +#if ENABLE(OILPAN)
|
| + ASSERT(!m_owner);
|
| +#else
|
| disconnectOwnerElement();
|
| setDOMWindow(nullptr);
|
| -
|
| - // FIXME: We should not be doing all this work inside the destructor
|
| +#endif
|
|
|
| #ifndef NDEBUG
|
| frameCounter.decrement();
|
| #endif
|
| }
|
|
|
| +void Frame::trace(Visitor* visitor)
|
| +{
|
| + visitor->trace(m_treeNode);
|
| + visitor->trace(m_host);
|
| + visitor->trace(m_owner);
|
| + visitor->trace(m_domWindow);
|
| +}
|
| +
|
| void Frame::detachChildren()
|
| {
|
| - typedef Vector<RefPtr<Frame> > FrameVector;
|
| + typedef WillBeHeapVector<RefPtrWillBeMember<Frame> > FrameVector;
|
| FrameVector childrenToDetach;
|
| childrenToDetach.reserveCapacity(tree().childCount());
|
| for (Frame* child = tree().firstChild(); child; child = child->tree().nextSibling())
|
| @@ -126,6 +143,7 @@ void Frame::setDOMWindow(PassRefPtrWillBeRawPtr<LocalDOMWindow> domWindow)
|
| {
|
| if (m_domWindow)
|
| m_domWindow->reset();
|
| +
|
| m_domWindow = domWindow;
|
| }
|
|
|
| @@ -158,7 +176,7 @@ RenderPart* Frame::ownerRenderer() const
|
| return toRenderPart(object);
|
| }
|
|
|
| -void Frame::setRemotePlatformLayer(blink::WebLayer* layer)
|
| +void Frame::setRemotePlatformLayer(WebLayer* layer)
|
| {
|
| if (m_remotePlatformLayer)
|
| GraphicsLayer::unregisterContentsLayer(m_remotePlatformLayer);
|
| @@ -197,7 +215,7 @@ void Frame::disconnectOwnerElement()
|
| if (page())
|
| page()->decrementSubframeCount();
|
| }
|
| - m_owner = 0;
|
| + m_owner = nullptr;
|
| }
|
|
|
| HTMLFrameOwnerElement* Frame::deprecatedLocalOwner() const
|
|
|