| 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 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 279 } | 279 } |
| 280 | 280 |
| 281 LocalDOMWindow::LocalDOMWindow(LocalFrame& frame) | 281 LocalDOMWindow::LocalDOMWindow(LocalFrame& frame) |
| 282 : m_frameObserver(WindowFrameObserver::create(this, frame)) | 282 : m_frameObserver(WindowFrameObserver::create(this, frame)) |
| 283 , m_shouldPrintWhenFinishedLoading(false) | 283 , m_shouldPrintWhenFinishedLoading(false) |
| 284 #if ENABLE(ASSERT) | 284 #if ENABLE(ASSERT) |
| 285 , m_hasBeenReset(false) | 285 , m_hasBeenReset(false) |
| 286 #endif | 286 #endif |
| 287 { | 287 { |
| 288 #if ENABLE(OILPAN) | 288 #if ENABLE(OILPAN) |
| 289 ThreadState::current()->registerPreFinalizer(*this); | 289 ThreadState::current()->registerPreFinalizer(this); |
| 290 #endif | 290 #endif |
| 291 } | 291 } |
| 292 | 292 |
| 293 void LocalDOMWindow::clearDocument() | 293 void LocalDOMWindow::clearDocument() |
| 294 { | 294 { |
| 295 if (!m_document) | 295 if (!m_document) |
| 296 return; | 296 return; |
| 297 | 297 |
| 298 ASSERT(!m_document->isActive()); | 298 ASSERT(!m_document->isActive()); |
| 299 | 299 |
| (...skipping 1223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1523 DOMWindow::trace(visitor); | 1523 DOMWindow::trace(visitor); |
| 1524 DOMWindowLifecycleNotifier::trace(visitor); | 1524 DOMWindowLifecycleNotifier::trace(visitor); |
| 1525 } | 1525 } |
| 1526 | 1526 |
| 1527 LocalFrame* LocalDOMWindow::frame() const | 1527 LocalFrame* LocalDOMWindow::frame() const |
| 1528 { | 1528 { |
| 1529 return m_frameObserver->frame(); | 1529 return m_frameObserver->frame(); |
| 1530 } | 1530 } |
| 1531 | 1531 |
| 1532 } // namespace blink | 1532 } // namespace blink |
| OLD | NEW |