| 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 14 matching lines...) Expand all Loading... |
| 25 * along with this library; see the file COPYING.LIB. If not, write to | 25 * along with this library; see the file COPYING.LIB. If not, write to |
| 26 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 26 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 27 * Boston, MA 02110-1301, USA. | 27 * Boston, MA 02110-1301, USA. |
| 28 */ | 28 */ |
| 29 | 29 |
| 30 #include "config.h" | 30 #include "config.h" |
| 31 #include "core/frame/LocalFrame.h" | 31 #include "core/frame/LocalFrame.h" |
| 32 | 32 |
| 33 #include "bindings/core/v8/ScriptController.h" | 33 #include "bindings/core/v8/ScriptController.h" |
| 34 #include "core/dom/DocumentType.h" | 34 #include "core/dom/DocumentType.h" |
| 35 #include "core/dom/WeakIdentifierMap.h" |
| 35 #include "core/editing/Editor.h" | 36 #include "core/editing/Editor.h" |
| 36 #include "core/editing/FrameSelection.h" | 37 #include "core/editing/FrameSelection.h" |
| 37 #include "core/editing/InputMethodController.h" | 38 #include "core/editing/InputMethodController.h" |
| 38 #include "core/editing/SpellChecker.h" | 39 #include "core/editing/SpellChecker.h" |
| 39 #include "core/editing/htmlediting.h" | 40 #include "core/editing/htmlediting.h" |
| 40 #include "core/editing/markup.h" | 41 #include "core/editing/markup.h" |
| 41 #include "core/events/Event.h" | 42 #include "core/events/Event.h" |
| 42 #include "core/fetch/ResourceFetcher.h" | 43 #include "core/fetch/ResourceFetcher.h" |
| 43 #include "core/frame/EventHandlerRegistry.h" | 44 #include "core/frame/EventHandlerRegistry.h" |
| 44 #include "core/frame/FrameConsole.h" | 45 #include "core/frame/FrameConsole.h" |
| (...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 271 ScriptForbiddenScope forbidScript; | 272 ScriptForbiddenScope forbidScript; |
| 272 setView(nullptr); | 273 setView(nullptr); |
| 273 willDetachFrameHost(); | 274 willDetachFrameHost(); |
| 274 InspectorInstrumentation::frameDetachedFromParent(this); | 275 InspectorInstrumentation::frameDetachedFromParent(this); |
| 275 Frame::detach(); | 276 Frame::detach(); |
| 276 | 277 |
| 277 // Signal frame destruction here rather than in the destructor. | 278 // Signal frame destruction here rather than in the destructor. |
| 278 // Main motivation is to avoid being dependent on its exact timing (Oilpan.) | 279 // Main motivation is to avoid being dependent on its exact timing (Oilpan.) |
| 279 LocalFrameLifecycleNotifier::notifyContextDestroyed(); | 280 LocalFrameLifecycleNotifier::notifyContextDestroyed(); |
| 280 m_supplements.clear(); | 281 m_supplements.clear(); |
| 282 WeakIdentifierMap<LocalFrame>::notifyObjectDestroyed(this); |
| 281 } | 283 } |
| 282 | 284 |
| 283 SecurityContext* LocalFrame::securityContext() const | 285 SecurityContext* LocalFrame::securityContext() const |
| 284 { | 286 { |
| 285 return document(); | 287 return document(); |
| 286 } | 288 } |
| 287 | 289 |
| 288 void LocalFrame::printNavigationErrorMessage(const Frame& targetFrame, const cha
r* reason) | 290 void LocalFrame::printNavigationErrorMessage(const Frame& targetFrame, const cha
r* reason) |
| 289 { | 291 { |
| 290 // URLs aren't available for RemoteFrames, so the error message uses their | 292 // URLs aren't available for RemoteFrames, so the error message uses their |
| (...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 822 , m_textZoomFactor(parentTextZoomFactor(this)) | 824 , m_textZoomFactor(parentTextZoomFactor(this)) |
| 823 , m_inViewSourceMode(false) | 825 , m_inViewSourceMode(false) |
| 824 { | 826 { |
| 825 if (isLocalRoot()) | 827 if (isLocalRoot()) |
| 826 m_instrumentingAgents = InstrumentingAgents::create(); | 828 m_instrumentingAgents = InstrumentingAgents::create(); |
| 827 else | 829 else |
| 828 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents; | 830 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents; |
| 829 } | 831 } |
| 830 | 832 |
| 831 } // namespace blink | 833 } // namespace blink |
| OLD | NEW |