| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "core/frame/RemoteFrame.h" | 5 #include "core/frame/RemoteFrame.h" |
| 6 | 6 |
| 7 #include "bindings/core/v8/WindowProxy.h" | 7 #include "bindings/core/v8/WindowProxy.h" |
| 8 #include "bindings/core/v8/WindowProxyManager.h" | 8 #include "bindings/core/v8/WindowProxyManager.h" |
| 9 #include "core/dom/RemoteSecurityContext.h" | 9 #include "core/dom/RemoteSecurityContext.h" |
| 10 #include "core/frame/LocalFrame.h" | 10 #include "core/frame/LocalFrame.h" |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 ASSERT(!m_view); | 44 ASSERT(!m_view); |
| 45 } | 45 } |
| 46 | 46 |
| 47 DEFINE_TRACE(RemoteFrame) { | 47 DEFINE_TRACE(RemoteFrame) { |
| 48 visitor->trace(m_view); | 48 visitor->trace(m_view); |
| 49 visitor->trace(m_securityContext); | 49 visitor->trace(m_securityContext); |
| 50 visitor->trace(m_windowProxyManager); | 50 visitor->trace(m_windowProxyManager); |
| 51 Frame::trace(visitor); | 51 Frame::trace(visitor); |
| 52 } | 52 } |
| 53 | 53 |
| 54 WindowProxy* RemoteFrame::windowProxy(DOMWrapperWorld& world) { | |
| 55 WindowProxy* windowProxy = m_windowProxyManager->windowProxy(world); | |
| 56 ASSERT(windowProxy); | |
| 57 windowProxy->initializeIfNeeded(); | |
| 58 return windowProxy; | |
| 59 } | |
| 60 | |
| 61 void RemoteFrame::navigate(Document& originDocument, | 54 void RemoteFrame::navigate(Document& originDocument, |
| 62 const KURL& url, | 55 const KURL& url, |
| 63 bool replaceCurrentItem, | 56 bool replaceCurrentItem, |
| 64 UserGestureStatus userGestureStatus) { | 57 UserGestureStatus userGestureStatus) { |
| 65 FrameLoadRequest frameRequest(&originDocument, url); | 58 FrameLoadRequest frameRequest(&originDocument, url); |
| 66 frameRequest.setReplacesCurrentItem(replaceCurrentItem); | 59 frameRequest.setReplacesCurrentItem(replaceCurrentItem); |
| 67 frameRequest.resourceRequest().setHasUserGesture(userGestureStatus == | 60 frameRequest.resourceRequest().setHasUserGesture(userGestureStatus == |
| 68 UserGestureStatus::Active); | 61 UserGestureStatus::Active); |
| 69 navigate(frameRequest); | 62 navigate(frameRequest); |
| 70 } | 63 } |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 185 FrameVector childrenToDetach; | 178 FrameVector childrenToDetach; |
| 186 childrenToDetach.reserveCapacity(tree().childCount()); | 179 childrenToDetach.reserveCapacity(tree().childCount()); |
| 187 for (Frame* child = tree().firstChild(); child; | 180 for (Frame* child = tree().firstChild(); child; |
| 188 child = child->tree().nextSibling()) | 181 child = child->tree().nextSibling()) |
| 189 childrenToDetach.push_back(child); | 182 childrenToDetach.push_back(child); |
| 190 for (const auto& child : childrenToDetach) | 183 for (const auto& child : childrenToDetach) |
| 191 child->detach(FrameDetachType::Remove); | 184 child->detach(FrameDetachType::Remove); |
| 192 } | 185 } |
| 193 | 186 |
| 194 } // namespace blink | 187 } // namespace blink |
| OLD | NEW |