| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) | 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 #include "core/frame/FrameHost.h" | 64 #include "core/frame/FrameHost.h" |
| 65 #include "core/frame/FrameView.h" | 65 #include "core/frame/FrameView.h" |
| 66 #include "core/frame/History.h" | 66 #include "core/frame/History.h" |
| 67 #include "core/frame/LocalFrame.h" | 67 #include "core/frame/LocalFrame.h" |
| 68 #include "core/frame/Location.h" | 68 #include "core/frame/Location.h" |
| 69 #include "core/frame/Navigator.h" | 69 #include "core/frame/Navigator.h" |
| 70 #include "core/frame/Screen.h" | 70 #include "core/frame/Screen.h" |
| 71 #include "core/frame/Settings.h" | 71 #include "core/frame/Settings.h" |
| 72 #include "core/html/HTMLFrameOwnerElement.h" | 72 #include "core/html/HTMLFrameOwnerElement.h" |
| 73 #include "core/inspector/ConsoleMessage.h" | 73 #include "core/inspector/ConsoleMessage.h" |
| 74 #include "core/inspector/ConsoleMessageStorage.h" |
| 74 #include "core/inspector/InspectorInstrumentation.h" | 75 #include "core/inspector/InspectorInstrumentation.h" |
| 75 #include "core/inspector/InspectorTraceEvents.h" | 76 #include "core/inspector/InspectorTraceEvents.h" |
| 76 #include "core/inspector/ScriptCallStack.h" | 77 #include "core/inspector/ScriptCallStack.h" |
| 77 #include "core/loader/DocumentLoader.h" | 78 #include "core/loader/DocumentLoader.h" |
| 78 #include "core/loader/FrameLoadRequest.h" | 79 #include "core/loader/FrameLoadRequest.h" |
| 79 #include "core/loader/FrameLoader.h" | 80 #include "core/loader/FrameLoader.h" |
| 80 #include "core/loader/FrameLoaderClient.h" | 81 #include "core/loader/FrameLoaderClient.h" |
| 81 #include "core/loader/MixedContentChecker.h" | 82 #include "core/loader/MixedContentChecker.h" |
| 82 #include "core/loader/SinkDocument.h" | 83 #include "core/loader/SinkDocument.h" |
| 83 #include "core/loader/appcache/ApplicationCache.h" | 84 #include "core/loader/appcache/ApplicationCache.h" |
| (...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 542 | 543 |
| 543 void LocalDOMWindow::frameDestroyed() | 544 void LocalDOMWindow::frameDestroyed() |
| 544 { | 545 { |
| 545 FrameDestructionObserver::frameDestroyed(); | 546 FrameDestructionObserver::frameDestroyed(); |
| 546 reset(); | 547 reset(); |
| 547 } | 548 } |
| 548 | 549 |
| 549 void LocalDOMWindow::willDetachFrameHost() | 550 void LocalDOMWindow::willDetachFrameHost() |
| 550 { | 551 { |
| 551 m_frame->host()->eventHandlerRegistry().didRemoveAllEventHandlers(*this); | 552 m_frame->host()->eventHandlerRegistry().didRemoveAllEventHandlers(*this); |
| 553 m_frame->console().messageStorage()->frameWindowDiscarded(this); |
| 552 InspectorInstrumentation::frameWindowDiscarded(m_frame, this); | 554 InspectorInstrumentation::frameWindowDiscarded(m_frame, this); |
| 553 } | 555 } |
| 554 | 556 |
| 555 void LocalDOMWindow::willDestroyDocumentInFrame() | 557 void LocalDOMWindow::willDestroyDocumentInFrame() |
| 556 { | 558 { |
| 557 // It is necessary to copy m_properties to a separate vector because the DOM
WindowProperties may | 559 // It is necessary to copy m_properties to a separate vector because the DOM
WindowProperties may |
| 558 // unregister themselves from the LocalDOMWindow as a result of the call to
willDestroyGlobalObjectInFrame. | 560 // unregister themselves from the LocalDOMWindow as a result of the call to
willDestroyGlobalObjectInFrame. |
| 559 Vector<DOMWindowProperty*> properties; | 561 Vector<DOMWindowProperty*> properties; |
| 560 copyToVector(m_properties, properties); | 562 copyToVector(m_properties, properties); |
| 561 for (size_t i = 0; i < properties.size(); ++i) | 563 for (size_t i = 0; i < properties.size(); ++i) |
| (...skipping 1352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1914 visitor->trace(m_applicationCache); | 1916 visitor->trace(m_applicationCache); |
| 1915 visitor->trace(m_performance); | 1917 visitor->trace(m_performance); |
| 1916 visitor->trace(m_css); | 1918 visitor->trace(m_css); |
| 1917 visitor->trace(m_eventQueue); | 1919 visitor->trace(m_eventQueue); |
| 1918 WillBeHeapSupplementable<LocalDOMWindow>::trace(visitor); | 1920 WillBeHeapSupplementable<LocalDOMWindow>::trace(visitor); |
| 1919 EventTargetWithInlineData::trace(visitor); | 1921 EventTargetWithInlineData::trace(visitor); |
| 1920 LifecycleContext<LocalDOMWindow>::trace(visitor); | 1922 LifecycleContext<LocalDOMWindow>::trace(visitor); |
| 1921 } | 1923 } |
| 1922 | 1924 |
| 1923 } // namespace blink | 1925 } // namespace blink |
| OLD | NEW |