| 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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 110 } | 110 } |
| 111 | 111 |
| 112 MessageEvent* event() const { return m_event; } | 112 MessageEvent* event() const { return m_event; } |
| 113 SecurityOrigin* targetOrigin() const { return m_targetOrigin.get(); } | 113 SecurityOrigin* targetOrigin() const { return m_targetOrigin.get(); } |
| 114 std::unique_ptr<SourceLocation> takeLocation() { | 114 std::unique_ptr<SourceLocation> takeLocation() { |
| 115 return std::move(m_location); | 115 return std::move(m_location); |
| 116 } | 116 } |
| 117 UserGestureToken* userGestureToken() const { | 117 UserGestureToken* userGestureToken() const { |
| 118 return m_userGestureToken.get(); | 118 return m_userGestureToken.get(); |
| 119 } | 119 } |
| 120 void stop() override { | 120 void contextDestroyed() override { |
| 121 SuspendableTimer::stop(); | 121 SuspendableTimer::contextDestroyed(); |
| 122 | 122 |
| 123 if (m_disposalAllowed) | 123 if (m_disposalAllowed) |
| 124 dispose(); | 124 dispose(); |
| 125 } | 125 } |
| 126 | 126 |
| 127 // Eager finalization is needed to promptly stop this timer object. | 127 // Eager finalization is needed to promptly stop this timer object. |
| 128 // (see DOMTimer comment for more.) | 128 // (see DOMTimer comment for more.) |
| 129 EAGERLY_FINALIZE(); | 129 EAGERLY_FINALIZE(); |
| 130 DEFINE_INLINE_VIRTUAL_TRACE() { | 130 DEFINE_INLINE_VIRTUAL_TRACE() { |
| 131 visitor->trace(m_event); | 131 visitor->trace(m_event); |
| (...skipping 1412 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1544 | 1544 |
| 1545 LocalFrame* LocalDOMWindow::frame() const { | 1545 LocalFrame* LocalDOMWindow::frame() const { |
| 1546 // If the LocalDOMWindow still has a frame reference, that frame must point | 1546 // If the LocalDOMWindow still has a frame reference, that frame must point |
| 1547 // back to this LocalDOMWindow: otherwise, it's easy to get into a situation | 1547 // back to this LocalDOMWindow: otherwise, it's easy to get into a situation |
| 1548 // where script execution leaks between different LocalDOMWindows. | 1548 // where script execution leaks between different LocalDOMWindows. |
| 1549 SECURITY_DCHECK(!m_frame || m_frame->domWindow() == this); | 1549 SECURITY_DCHECK(!m_frame || m_frame->domWindow() == this); |
| 1550 return m_frame; | 1550 return m_frame; |
| 1551 } | 1551 } |
| 1552 | 1552 |
| 1553 } // namespace blink | 1553 } // namespace blink |
| OLD | NEW |