| 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 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 282 } | 282 } |
| 283 | 283 |
| 284 LocalDOMWindow::LocalDOMWindow(LocalFrame& frame) | 284 LocalDOMWindow::LocalDOMWindow(LocalFrame& frame) |
| 285 : m_frameObserver(WindowFrameObserver::create(this, frame)) | 285 : m_frameObserver(WindowFrameObserver::create(this, frame)) |
| 286 , m_shouldPrintWhenFinishedLoading(false) | 286 , m_shouldPrintWhenFinishedLoading(false) |
| 287 #if ENABLE(ASSERT) | 287 #if ENABLE(ASSERT) |
| 288 , m_hasBeenReset(false) | 288 , m_hasBeenReset(false) |
| 289 #endif | 289 #endif |
| 290 { | 290 { |
| 291 #if ENABLE(OILPAN) | 291 #if ENABLE(OILPAN) |
| 292 ThreadState::current()->registerPreFinalizer(*this); | 292 ThreadState::current()->registerPreFinalizer(this); |
| 293 #endif | 293 #endif |
| 294 } | 294 } |
| 295 | 295 |
| 296 void LocalDOMWindow::clearDocument() | 296 void LocalDOMWindow::clearDocument() |
| 297 { | 297 { |
| 298 if (!m_document) | 298 if (!m_document) |
| 299 return; | 299 return; |
| 300 | 300 |
| 301 ASSERT(!m_document->isActive()); | 301 ASSERT(!m_document->isActive()); |
| 302 | 302 |
| (...skipping 1183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1486 DOMWindow::trace(visitor); | 1486 DOMWindow::trace(visitor); |
| 1487 DOMWindowLifecycleNotifier::trace(visitor); | 1487 DOMWindowLifecycleNotifier::trace(visitor); |
| 1488 } | 1488 } |
| 1489 | 1489 |
| 1490 LocalFrame* LocalDOMWindow::frame() const | 1490 LocalFrame* LocalDOMWindow::frame() const |
| 1491 { | 1491 { |
| 1492 return m_frameObserver->frame(); | 1492 return m_frameObserver->frame(); |
| 1493 } | 1493 } |
| 1494 | 1494 |
| 1495 } // namespace blink | 1495 } // namespace blink |
| OLD | NEW |