| 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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 FrameLoadRequest frameRequest(&originDocument, url); | 71 FrameLoadRequest frameRequest(&originDocument, url); |
| 72 frameRequest.setReplacesCurrentItem(replaceCurrentItem); | 72 frameRequest.setReplacesCurrentItem(replaceCurrentItem); |
| 73 frameRequest.resourceRequest().setHasUserGesture(userGestureStatus == | 73 frameRequest.resourceRequest().setHasUserGesture(userGestureStatus == |
| 74 UserGestureStatus::Active); | 74 UserGestureStatus::Active); |
| 75 navigate(frameRequest); | 75 navigate(frameRequest); |
| 76 } | 76 } |
| 77 | 77 |
| 78 void RemoteFrame::navigate(const FrameLoadRequest& passedRequest) { | 78 void RemoteFrame::navigate(const FrameLoadRequest& passedRequest) { |
| 79 FrameLoadRequest frameRequest(passedRequest); | 79 FrameLoadRequest frameRequest(passedRequest); |
| 80 | 80 |
| 81 // The process where this frame actually lives won't have sufficient informati
on to determine | 81 // The process where this frame actually lives won't have sufficient |
| 82 // correct referrer, since it won't have access to the originDocument. Set it
now. | 82 // information to determine correct referrer, since it won't have access to |
| 83 // the originDocument. Set it now. |
| 83 FrameLoader::setReferrerForFrameRequest(frameRequest); | 84 FrameLoader::setReferrerForFrameRequest(frameRequest); |
| 84 | 85 |
| 85 frameRequest.resourceRequest().setHasUserGesture( | 86 frameRequest.resourceRequest().setHasUserGesture( |
| 86 UserGestureIndicator::processingUserGesture()); | 87 UserGestureIndicator::processingUserGesture()); |
| 87 client()->navigate(frameRequest.resourceRequest(), | 88 client()->navigate(frameRequest.resourceRequest(), |
| 88 frameRequest.replacesCurrentItem()); | 89 frameRequest.replacesCurrentItem()); |
| 89 } | 90 } |
| 90 | 91 |
| 91 void RemoteFrame::reload(FrameLoadType frameLoadType, | 92 void RemoteFrame::reload(FrameLoadType frameLoadType, |
| 92 ClientRedirectPolicy clientRedirectPolicy) { | 93 ClientRedirectPolicy clientRedirectPolicy) { |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 191 FrameVector childrenToDetach; | 192 FrameVector childrenToDetach; |
| 192 childrenToDetach.reserveCapacity(tree().childCount()); | 193 childrenToDetach.reserveCapacity(tree().childCount()); |
| 193 for (Frame* child = tree().firstChild(); child; | 194 for (Frame* child = tree().firstChild(); child; |
| 194 child = child->tree().nextSibling()) | 195 child = child->tree().nextSibling()) |
| 195 childrenToDetach.append(child); | 196 childrenToDetach.append(child); |
| 196 for (const auto& child : childrenToDetach) | 197 for (const auto& child : childrenToDetach) |
| 197 child->detach(FrameDetachType::Remove); | 198 child->detach(FrameDetachType::Remove); |
| 198 } | 199 } |
| 199 | 200 |
| 200 } // namespace blink | 201 } // namespace blink |
| OLD | NEW |