| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> | 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> |
| 3 * 1999 Lars Knoll <knoll@kde.org> | 3 * 1999 Lars Knoll <knoll@kde.org> |
| 4 * 1999 Antti Koivisto <koivisto@kde.org> | 4 * 1999 Antti Koivisto <koivisto@kde.org> |
| 5 * 2000 Simon Hausmann <hausmann@kde.org> | 5 * 2000 Simon Hausmann <hausmann@kde.org> |
| 6 * 2000 Stefan Schimanski <1Stein@gmx.de> | 6 * 2000 Stefan Schimanski <1Stein@gmx.de> |
| 7 * 2001 George Staikos <staikos@kde.org> | 7 * 2001 George Staikos <staikos@kde.org> |
| 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r
ights reserved. | 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r
ights reserved. |
| 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> | 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> |
| 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 PassRefPtrWillBeRawPtr<LocalFrame> LocalFrame::create(FrameLoaderClient* client,
FrameHost* host, FrameOwner* owner) | 109 PassRefPtrWillBeRawPtr<LocalFrame> LocalFrame::create(FrameLoaderClient* client,
FrameHost* host, FrameOwner* owner) |
| 110 { | 110 { |
| 111 RefPtrWillBeRawPtr<LocalFrame> frame = adoptRefWillBeNoop(new LocalFrame(cli
ent, host, owner)); | 111 RefPtrWillBeRawPtr<LocalFrame> frame = adoptRefWillBeNoop(new LocalFrame(cli
ent, host, owner)); |
| 112 InspectorInstrumentation::frameAttachedToParent(frame.get()); | 112 InspectorInstrumentation::frameAttachedToParent(frame.get()); |
| 113 return frame.release(); | 113 return frame.release(); |
| 114 } | 114 } |
| 115 | 115 |
| 116 LocalFrame::~LocalFrame() | 116 LocalFrame::~LocalFrame() |
| 117 { | 117 { |
| 118 #if ENABLE(OILPAN) | 118 #if ENABLE(OILPAN) |
| 119 // Verify that the FrameView and FrameLoader have instead been | 119 // Verify that the FrameView has been cleared as part of detaching |
| 120 // cleared as part of detaching the frame owner. | 120 // the frame owner. |
| 121 ASSERT(!m_owner); | |
| 122 ASSERT(!m_view); | 121 ASSERT(!m_view); |
| 123 // Oilpan: see setDOMWindow() comment why it is acceptable not to | 122 // Oilpan: see setDOMWindow() comment why it is acceptable not to |
| 124 // mirror the non-Oilpan call below. | 123 // mirror the non-Oilpan call below. |
| 125 // | 124 // |
| 126 // Also, FrameDestructionObservers that live longer than this | 125 // Also, FrameDestructionObservers that live longer than this |
| 127 // frame object keep weak references to the frame; those will be | 126 // frame object keep weak references to the frame; those will be |
| 128 // automatically cleared by the garbage collector. Hence, explicit | 127 // automatically cleared by the garbage collector. Hence, explicit |
| 129 // frameDestroyed() notifications aren't needed. | 128 // frameDestroyed() notifications aren't needed. |
| 130 #else | 129 #else |
| 131 // FIXME: follow Oilpan and clear the FrameView and FrameLoader | 130 // FIXME: follow Oilpan and clear the FrameView and FrameLoader |
| (...skipping 601 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 733 | 732 |
| 734 return curFrame; | 733 return curFrame; |
| 735 } | 734 } |
| 736 | 735 |
| 737 void LocalFrame::setPagePopupOwner(Element& owner) | 736 void LocalFrame::setPagePopupOwner(Element& owner) |
| 738 { | 737 { |
| 739 m_pagePopupOwner = &owner; | 738 m_pagePopupOwner = &owner; |
| 740 } | 739 } |
| 741 | 740 |
| 742 } // namespace blink | 741 } // namespace blink |
| OLD | NEW |