| 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 626 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 637 UserGestureIndicator gestureIndicator( | 637 UserGestureIndicator gestureIndicator( |
| 638 DocumentUserGestureToken::adopt(document(), timer->userGestureToken())); | 638 DocumentUserGestureToken::adopt(document(), timer->userGestureToken())); |
| 639 | 639 |
| 640 event->entangleMessagePorts(document()); | 640 event->entangleMessagePorts(document()); |
| 641 | 641 |
| 642 dispatchMessageEventWithOriginCheck(timer->targetOrigin(), event, | 642 dispatchMessageEventWithOriginCheck(timer->targetOrigin(), event, |
| 643 timer->takeLocation()); | 643 timer->takeLocation()); |
| 644 } | 644 } |
| 645 | 645 |
| 646 void LocalDOMWindow::removePostMessageTimer(PostMessageTimer* timer) { | 646 void LocalDOMWindow::removePostMessageTimer(PostMessageTimer* timer) { |
| 647 m_postMessageTimers.remove(timer); | 647 m_postMessageTimers.erase(timer); |
| 648 } | 648 } |
| 649 | 649 |
| 650 void LocalDOMWindow::dispatchMessageEventWithOriginCheck( | 650 void LocalDOMWindow::dispatchMessageEventWithOriginCheck( |
| 651 SecurityOrigin* intendedTargetOrigin, | 651 SecurityOrigin* intendedTargetOrigin, |
| 652 Event* event, | 652 Event* event, |
| 653 std::unique_ptr<SourceLocation> location) { | 653 std::unique_ptr<SourceLocation> location) { |
| 654 if (intendedTargetOrigin) { | 654 if (intendedTargetOrigin) { |
| 655 // Check target origin now since the target document may have changed since | 655 // Check target origin now since the target document may have changed since |
| 656 // the timer was scheduled. | 656 // the timer was scheduled. |
| 657 SecurityOrigin* securityOrigin = document()->getSecurityOrigin(); | 657 SecurityOrigin* securityOrigin = document()->getSecurityOrigin(); |
| (...skipping 974 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1632 DOMWindow::trace(visitor); | 1632 DOMWindow::trace(visitor); |
| 1633 Supplementable<LocalDOMWindow>::trace(visitor); | 1633 Supplementable<LocalDOMWindow>::trace(visitor); |
| 1634 } | 1634 } |
| 1635 | 1635 |
| 1636 DEFINE_TRACE_WRAPPERS(LocalDOMWindow) { | 1636 DEFINE_TRACE_WRAPPERS(LocalDOMWindow) { |
| 1637 visitor->traceWrappers(m_customElements); | 1637 visitor->traceWrappers(m_customElements); |
| 1638 DOMWindow::traceWrappers(visitor); | 1638 DOMWindow::traceWrappers(visitor); |
| 1639 } | 1639 } |
| 1640 | 1640 |
| 1641 } // namespace blink | 1641 } // namespace blink |
| OLD | NEW |