| 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 469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 480 m_properties.remove(property); | 480 m_properties.remove(property); |
| 481 } | 481 } |
| 482 | 482 |
| 483 void LocalDOMWindow::registerEventListenerObserver(EventListenerObserver* eventL
istenerObserver) | 483 void LocalDOMWindow::registerEventListenerObserver(EventListenerObserver* eventL
istenerObserver) |
| 484 { | 484 { |
| 485 m_eventListenerObservers.add(eventListenerObserver); | 485 m_eventListenerObservers.add(eventListenerObserver); |
| 486 } | 486 } |
| 487 | 487 |
| 488 void LocalDOMWindow::reset() | 488 void LocalDOMWindow::reset() |
| 489 { | 489 { |
| 490 DCHECK(document()); |
| 491 document()->notifyContextDestroyed(); |
| 490 frameDestroyed(); | 492 frameDestroyed(); |
| 491 | 493 |
| 492 m_screen = nullptr; | 494 m_screen = nullptr; |
| 493 m_history = nullptr; | 495 m_history = nullptr; |
| 494 m_locationbar = nullptr; | 496 m_locationbar = nullptr; |
| 495 m_menubar = nullptr; | 497 m_menubar = nullptr; |
| 496 m_personalbar = nullptr; | 498 m_personalbar = nullptr; |
| 497 m_scrollbars = nullptr; | 499 m_scrollbars = nullptr; |
| 498 m_statusbar = nullptr; | 500 m_statusbar = nullptr; |
| 499 m_toolbar = nullptr; | 501 m_toolbar = nullptr; |
| (...skipping 1014 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1514 LocalFrame* LocalDOMWindow::frame() const | 1516 LocalFrame* LocalDOMWindow::frame() const |
| 1515 { | 1517 { |
| 1516 // If the LocalDOMWindow still has a frame reference, that frame must point | 1518 // If the LocalDOMWindow still has a frame reference, that frame must point |
| 1517 // back to this LocalDOMWindow: otherwise, it's easy to get into a situation | 1519 // back to this LocalDOMWindow: otherwise, it's easy to get into a situation |
| 1518 // where script execution leaks between different LocalDOMWindows. | 1520 // where script execution leaks between different LocalDOMWindows. |
| 1519 SECURITY_DCHECK(!m_frame || m_frame->domWindow() == this); | 1521 SECURITY_DCHECK(!m_frame || m_frame->domWindow() == this); |
| 1520 return m_frame; | 1522 return m_frame; |
| 1521 } | 1523 } |
| 1522 | 1524 |
| 1523 } // namespace blink | 1525 } // namespace blink |
| OLD | NEW |