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 290 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
301 | 301 |
302 for (size_t i = 0; i < childFrames.size(); ++i) | 302 for (size_t i = 0; i < childFrames.size(); ++i) |
303 childFrames[i]->didChangeVisibilityState(); | 303 childFrames[i]->didChangeVisibilityState(); |
304 } | 304 } |
305 | 305 |
306 void LocalFrame::addDestructionObserver(FrameDestructionObserver* observer) | 306 void LocalFrame::addDestructionObserver(FrameDestructionObserver* observer) |
307 { | 307 { |
308 m_destructionObservers.add(observer); | 308 m_destructionObservers.add(observer); |
309 } | 309 } |
310 | 310 |
| 311 #if !ENABLE(OILPAN) |
311 void LocalFrame::removeDestructionObserver(FrameDestructionObserver* observer) | 312 void LocalFrame::removeDestructionObserver(FrameDestructionObserver* observer) |
312 { | 313 { |
313 m_destructionObservers.remove(observer); | 314 m_destructionObservers.remove(observer); |
314 } | 315 } |
| 316 #endif |
315 | 317 |
316 void LocalFrame::willDetachFrameHost() | 318 void LocalFrame::willDetachFrameHost() |
317 { | 319 { |
318 // We should never be detatching the page during a Layout. | 320 // We should never be detatching the page during a Layout. |
319 RELEASE_ASSERT(!m_view || !m_view->isInPerformLayout()); | 321 RELEASE_ASSERT(!m_view || !m_view->isInPerformLayout()); |
320 | 322 |
321 Frame* parent = tree().parent(); | 323 Frame* parent = tree().parent(); |
322 if (parent && parent->isLocalFrame()) | 324 if (parent && parent->isLocalFrame()) |
323 toLocalFrame(parent)->loader().checkLoadComplete(); | 325 toLocalFrame(parent)->loader().checkLoadComplete(); |
324 | 326 |
(...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
731 | 733 |
732 return curFrame; | 734 return curFrame; |
733 } | 735 } |
734 | 736 |
735 void LocalFrame::setPagePopupOwner(Element& owner) | 737 void LocalFrame::setPagePopupOwner(Element& owner) |
736 { | 738 { |
737 m_pagePopupOwner = &owner; | 739 m_pagePopupOwner = &owner; |
738 } | 740 } |
739 | 741 |
740 } // namespace blink | 742 } // namespace blink |
OLD | NEW |