| 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 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 193 | 193 |
| 194 return window; | 194 return window; |
| 195 } | 195 } |
| 196 | 196 |
| 197 LocalDOMWindow::LocalDOMWindow(LocalFrame& frame) | 197 LocalDOMWindow::LocalDOMWindow(LocalFrame& frame) |
| 198 : FrameDestructionObserver(&frame) | 198 : FrameDestructionObserver(&frame) |
| 199 #if ENABLE(ASSERT) | 199 #if ENABLE(ASSERT) |
| 200 , m_hasBeenReset(false) | 200 , m_hasBeenReset(false) |
| 201 #endif | 201 #endif |
| 202 { | 202 { |
| 203 ScriptWrappable::init(this); | |
| 204 } | 203 } |
| 205 | 204 |
| 206 void LocalDOMWindow::clearDocument() | 205 void LocalDOMWindow::clearDocument() |
| 207 { | 206 { |
| 208 if (!m_document) | 207 if (!m_document) |
| 209 return; | 208 return; |
| 210 | 209 |
| 211 // FIXME: This should be part of ActiveDOMObject shutdown | 210 // FIXME: This should be part of ActiveDOMObject shutdown |
| 212 clearEventQueue(); | 211 clearEventQueue(); |
| 213 | 212 |
| (...skipping 584 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 798 { | 797 { |
| 799 return static_cast<DOMWindowLifecycleNotifier&>(LifecycleContext<LocalDOMWin
dow>::lifecycleNotifier()); | 798 return static_cast<DOMWindowLifecycleNotifier&>(LifecycleContext<LocalDOMWin
dow>::lifecycleNotifier()); |
| 800 } | 799 } |
| 801 | 800 |
| 802 PassOwnPtr<LifecycleNotifier<LocalDOMWindow> > LocalDOMWindow::createLifecycleNo
tifier() | 801 PassOwnPtr<LifecycleNotifier<LocalDOMWindow> > LocalDOMWindow::createLifecycleNo
tifier() |
| 803 { | 802 { |
| 804 return DOMWindowLifecycleNotifier::create(this); | 803 return DOMWindowLifecycleNotifier::create(this); |
| 805 } | 804 } |
| 806 | 805 |
| 807 } // namespace blink | 806 } // namespace blink |
| OLD | NEW |