| 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 24 matching lines...) Expand all Loading... |
| 35 #include "core/editing/Editor.h" | 35 #include "core/editing/Editor.h" |
| 36 #include "core/editing/FrameSelection.h" | 36 #include "core/editing/FrameSelection.h" |
| 37 #include "core/editing/InputMethodController.h" | 37 #include "core/editing/InputMethodController.h" |
| 38 #include "core/editing/SpellChecker.h" | 38 #include "core/editing/SpellChecker.h" |
| 39 #include "core/editing/htmlediting.h" | 39 #include "core/editing/htmlediting.h" |
| 40 #include "core/editing/markup.h" | 40 #include "core/editing/markup.h" |
| 41 #include "core/events/Event.h" | 41 #include "core/events/Event.h" |
| 42 #include "core/fetch/ResourceFetcher.h" | 42 #include "core/fetch/ResourceFetcher.h" |
| 43 #include "core/frame/EventHandlerRegistry.h" | 43 #include "core/frame/EventHandlerRegistry.h" |
| 44 #include "core/frame/FrameConsole.h" | 44 #include "core/frame/FrameConsole.h" |
| 45 #include "core/frame/FrameDestructionObserver.h" | |
| 46 #include "core/frame/FrameHost.h" | 45 #include "core/frame/FrameHost.h" |
| 47 #include "core/frame/FrameView.h" | 46 #include "core/frame/FrameView.h" |
| 48 #include "core/frame/LocalDOMWindow.h" | 47 #include "core/frame/LocalDOMWindow.h" |
| 49 #include "core/frame/Settings.h" | 48 #include "core/frame/Settings.h" |
| 50 #include "core/html/HTMLFrameElementBase.h" | 49 #include "core/html/HTMLFrameElementBase.h" |
| 51 #include "core/html/HTMLPlugInElement.h" | 50 #include "core/html/HTMLPlugInElement.h" |
| 52 #include "core/inspector/ConsoleMessageStorage.h" | 51 #include "core/inspector/ConsoleMessageStorage.h" |
| 53 #include "core/inspector/InspectorInstrumentation.h" | 52 #include "core/inspector/InspectorInstrumentation.h" |
| 54 #include "core/inspector/InstrumentingAgents.h" | 53 #include "core/inspector/InstrumentingAgents.h" |
| 55 #include "core/layout/HitTestResult.h" | 54 #include "core/layout/HitTestResult.h" |
| (...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 347 if (page() && page()->scrollingCoordinator() && m_view) | 346 if (page() && page()->scrollingCoordinator() && m_view) |
| 348 page()->scrollingCoordinator()->willDestroyScrollableArea(m_view.get()); | 347 page()->scrollingCoordinator()->willDestroyScrollableArea(m_view.get()); |
| 349 } | 348 } |
| 350 | 349 |
| 351 void LocalFrame::setDOMWindow(PassRefPtrWillBeRawPtr<LocalDOMWindow> domWindow) | 350 void LocalFrame::setDOMWindow(PassRefPtrWillBeRawPtr<LocalDOMWindow> domWindow) |
| 352 { | 351 { |
| 353 // Oilpan: setDOMWindow() cannot be used when finalizing. Which | 352 // Oilpan: setDOMWindow() cannot be used when finalizing. Which |
| 354 // is acceptable as its actions are either not needed or handled | 353 // is acceptable as its actions are either not needed or handled |
| 355 // by other means -- | 354 // by other means -- |
| 356 // | 355 // |
| 357 // - FrameDestructionObserver::willDetachFrameHost() will have | 356 // - LocalFrameLifecycleObserver::willDetachFrameHost() will have |
| 358 // signalled the Inspector frameWindowDiscarded() notifications. | 357 // signalled the Inspector frameWindowDiscarded() notifications. |
| 359 // We assume that all LocalFrames are detached, where that notification | 358 // We assume that all LocalFrames are detached, where that notification |
| 360 // will have been done. | 359 // will have been done. |
| 361 // | 360 // |
| 362 // - Calling LocalDOMWindow::reset() is not needed (called from | 361 // - Calling LocalDOMWindow::reset() is not needed (called from |
| 363 // Frame::setDOMWindow().) The Member references it clears will now | 362 // Frame::setDOMWindow().) The Member references it clears will now |
| 364 // die with the window. And the registered DOMWindowProperty instances th
at don't, | 363 // die with the window. And the registered DOMWindowProperty instances th
at don't, |
| 365 // only keep a weak reference to this frame, so there's no need to be | 364 // only keep a weak reference to this frame, so there's no need to be |
| 366 // explicitly notified that this frame is going away. | 365 // explicitly notified that this frame is going away. |
| 367 if (m_domWindow && host()) | 366 if (m_domWindow && host()) |
| (...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 798 // We detach the FrameView's custom scroll bars as early as | 797 // We detach the FrameView's custom scroll bars as early as |
| 799 // possible to prevent m_doc->detach() from messing with the view | 798 // possible to prevent m_doc->detach() from messing with the view |
| 800 // such that its scroll bars won't be torn down. | 799 // such that its scroll bars won't be torn down. |
| 801 // | 800 // |
| 802 // FIXME: We should revisit this. | 801 // FIXME: We should revisit this. |
| 803 if (m_view) | 802 if (m_view) |
| 804 m_view->prepareForDetach(); | 803 m_view->prepareForDetach(); |
| 805 } | 804 } |
| 806 | 805 |
| 807 } // namespace blink | 806 } // namespace blink |
| OLD | NEW |