| 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 |
| 11 * notice, this list of conditions and the following disclaimer in the | 11 * notice, this list of conditions and the following disclaimer in the |
| 12 * documentation and/or other materials provided with the distribution. | 12 * documentation and/or other materials provided with the distribution. |
| 13 * | 13 * |
| 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY |
| 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR |
| 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 25 */ | 25 */ |
| 26 | 26 |
| 27 #include "core/frame/LocalDOMWindow.h" | 27 #include "core/frame/LocalDOMWindow.h" |
| 28 | 28 |
| 29 #include "base/debug/crash_logging.h" |
| 29 #include "bindings/core/v8/ScriptController.h" | 30 #include "bindings/core/v8/ScriptController.h" |
| 30 #include "bindings/core/v8/SourceLocation.h" | 31 #include "bindings/core/v8/SourceLocation.h" |
| 31 #include "core/css/CSSComputedStyleDeclaration.h" | 32 #include "core/css/CSSComputedStyleDeclaration.h" |
| 32 #include "core/css/CSSRuleList.h" | 33 #include "core/css/CSSRuleList.h" |
| 33 #include "core/css/DOMWindowCSS.h" | 34 #include "core/css/DOMWindowCSS.h" |
| 34 #include "core/css/MediaQueryList.h" | 35 #include "core/css/MediaQueryList.h" |
| 35 #include "core/css/MediaQueryMatcher.h" | 36 #include "core/css/MediaQueryMatcher.h" |
| 36 #include "core/css/StyleMedia.h" | 37 #include "core/css/StyleMedia.h" |
| 37 #include "core/css/resolver/StyleResolver.h" | 38 #include "core/css/resolver/StyleResolver.h" |
| 38 #include "core/dom/DOMImplementation.h" | 39 #include "core/dom/DOMImplementation.h" |
| (...skipping 641 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 680 void LocalDOMWindow::postMessageTimerFired(PostMessageTimer* timer) | 681 void LocalDOMWindow::postMessageTimerFired(PostMessageTimer* timer) |
| 681 { | 682 { |
| 682 if (!isCurrentlyDisplayedInFrame()) | 683 if (!isCurrentlyDisplayedInFrame()) |
| 683 return; | 684 return; |
| 684 | 685 |
| 685 MessageEvent* event = timer->event(); | 686 MessageEvent* event = timer->event(); |
| 686 | 687 |
| 687 UserGestureIndicator gestureIndicator(timer->userGestureToken()); | 688 UserGestureIndicator gestureIndicator(timer->userGestureToken()); |
| 688 | 689 |
| 689 event->entangleMessagePorts(document()); | 690 event->entangleMessagePorts(document()); |
| 691 |
| 692 // Temporary instrumentation for http://crbug.com/621730. |
| 693 base::debug::ScopedCrashKey("postmessage_src_origin", event->origin().utf8()
.data()); |
| 694 base::debug::ScopedCrashKey("postmessage_dst_origin", document()->getSecurit
yOrigin()->toRawString().utf8().data()); |
| 695 base::debug::ScopedCrashKey("postmessage_dst_url", document()->url().getStri
ng().utf8().data()); |
| 690 dispatchMessageEventWithOriginCheck(timer->targetOrigin(), event, timer->tak
eLocation()); | 696 dispatchMessageEventWithOriginCheck(timer->targetOrigin(), event, timer->tak
eLocation()); |
| 691 } | 697 } |
| 692 | 698 |
| 693 void LocalDOMWindow::removePostMessageTimer(PostMessageTimer* timer) | 699 void LocalDOMWindow::removePostMessageTimer(PostMessageTimer* timer) |
| 694 { | 700 { |
| 695 m_postMessageTimers.remove(timer); | 701 m_postMessageTimers.remove(timer); |
| 696 } | 702 } |
| 697 | 703 |
| 698 void LocalDOMWindow::dispatchMessageEventWithOriginCheck(SecurityOrigin* intende
dTargetOrigin, Event* event, PassOwnPtr<SourceLocation> location) | 704 void LocalDOMWindow::dispatchMessageEventWithOriginCheck(SecurityOrigin* intende
dTargetOrigin, Event* event, PassOwnPtr<SourceLocation> location) |
| 699 { | 705 { |
| (...skipping 850 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1550 { | 1556 { |
| 1551 // If the LocalDOMWindow still has a frame reference, that frame must point | 1557 // If the LocalDOMWindow still has a frame reference, that frame must point |
| 1552 // back to this LocalDOMWindow: otherwise, it's easy to get into a situation | 1558 // back to this LocalDOMWindow: otherwise, it's easy to get into a situation |
| 1553 // where script execution leaks between different LocalDOMWindows. | 1559 // where script execution leaks between different LocalDOMWindows. |
| 1554 if (m_frameObserver->frame()) | 1560 if (m_frameObserver->frame()) |
| 1555 ASSERT_WITH_SECURITY_IMPLICATION(m_frameObserver->frame()->domWindow() =
= this); | 1561 ASSERT_WITH_SECURITY_IMPLICATION(m_frameObserver->frame()->domWindow() =
= this); |
| 1556 return m_frameObserver->frame(); | 1562 return m_frameObserver->frame(); |
| 1557 } | 1563 } |
| 1558 | 1564 |
| 1559 } // namespace blink | 1565 } // namespace blink |
| OLD | NEW |