| 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 "config.h" | 5 #include "config.h" |
| 6 #include "core/frame/RemoteFrame.h" | 6 #include "core/frame/RemoteFrame.h" |
| 7 | 7 |
| 8 #include "bindings/core/v8/WindowProxy.h" | 8 #include "bindings/core/v8/WindowProxy.h" |
| 9 #include "bindings/core/v8/WindowProxyManager.h" | 9 #include "bindings/core/v8/WindowProxyManager.h" |
| 10 #include "core/dom/RemoteSecurityContext.h" | 10 #include "core/dom/RemoteSecurityContext.h" |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 } | 55 } |
| 56 | 56 |
| 57 WindowProxy* RemoteFrame::windowProxy(DOMWrapperWorld& world) | 57 WindowProxy* RemoteFrame::windowProxy(DOMWrapperWorld& world) |
| 58 { | 58 { |
| 59 WindowProxy* windowProxy = m_windowProxyManager->windowProxy(world); | 59 WindowProxy* windowProxy = m_windowProxyManager->windowProxy(world); |
| 60 ASSERT(windowProxy); | 60 ASSERT(windowProxy); |
| 61 windowProxy->initializeIfNeeded(); | 61 windowProxy->initializeIfNeeded(); |
| 62 return windowProxy; | 62 return windowProxy; |
| 63 } | 63 } |
| 64 | 64 |
| 65 void RemoteFrame::navigate(Document& originDocument, const KURL& url, bool lockB
ackForwardList, UserGestureStatus userGestureStatus) | 65 void RemoteFrame::navigate(Document& originDocument, const KURL& url, bool repla
ceCurrentItem, UserGestureStatus userGestureStatus) |
| 66 { | 66 { |
| 67 // The process where this frame actually lives won't have sufficient informa
tion to determine | 67 // The process where this frame actually lives won't have sufficient informa
tion to determine |
| 68 // correct referrer, since it won't have access to the originDocument. Set i
t now. | 68 // correct referrer, since it won't have access to the originDocument. Set i
t now. |
| 69 ResourceRequest request(url); | 69 ResourceRequest request(url); |
| 70 request.setHTTPReferrer(SecurityPolicy::generateReferrer(originDocument.refe
rrerPolicy(), url, originDocument.outgoingReferrer())); | 70 request.setHTTPReferrer(SecurityPolicy::generateReferrer(originDocument.refe
rrerPolicy(), url, originDocument.outgoingReferrer())); |
| 71 request.setHasUserGesture(userGestureStatus == UserGestureStatus::Active); | 71 request.setHasUserGesture(userGestureStatus == UserGestureStatus::Active); |
| 72 remoteFrameClient()->navigate(request, lockBackForwardList); | 72 remoteFrameClient()->navigate(request, replaceCurrentItem); |
| 73 } | 73 } |
| 74 | 74 |
| 75 void RemoteFrame::navigate(const FrameLoadRequest& passedRequest) | 75 void RemoteFrame::navigate(const FrameLoadRequest& passedRequest) |
| 76 { | 76 { |
| 77 UserGestureStatus gesture = UserGestureIndicator::processingUserGesture() ?
UserGestureStatus::Active : UserGestureStatus::None; | 77 UserGestureStatus gesture = UserGestureIndicator::processingUserGesture() ?
UserGestureStatus::Active : UserGestureStatus::None; |
| 78 navigate(*passedRequest.originDocument(), passedRequest.resourceRequest().ur
l(), passedRequest.lockBackForwardList(), gesture); | 78 navigate(*passedRequest.originDocument(), passedRequest.resourceRequest().ur
l(), passedRequest.replacesCurrentItem(), gesture); |
| 79 } | 79 } |
| 80 | 80 |
| 81 void RemoteFrame::reload(FrameLoadType frameLoadType, ClientRedirectPolicy clien
tRedirectPolicy) | 81 void RemoteFrame::reload(FrameLoadType frameLoadType, ClientRedirectPolicy clien
tRedirectPolicy) |
| 82 { | 82 { |
| 83 remoteFrameClient()->reload(frameLoadType, clientRedirectPolicy); | 83 remoteFrameClient()->reload(frameLoadType, clientRedirectPolicy); |
| 84 } | 84 } |
| 85 | 85 |
| 86 void RemoteFrame::detach(FrameDetachType type) | 86 void RemoteFrame::detach(FrameDetachType type) |
| 87 { | 87 { |
| 88 PluginScriptForbiddenScope forbidPluginDestructorScripting; | 88 PluginScriptForbiddenScope forbidPluginDestructorScripting; |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 if (m_remotePlatformLayer) | 178 if (m_remotePlatformLayer) |
| 179 GraphicsLayer::registerContentsLayer(layer); | 179 GraphicsLayer::registerContentsLayer(layer); |
| 180 | 180 |
| 181 ASSERT(owner()); | 181 ASSERT(owner()); |
| 182 toHTMLFrameOwnerElement(owner())->setNeedsCompositingUpdate(); | 182 toHTMLFrameOwnerElement(owner())->setNeedsCompositingUpdate(); |
| 183 if (LayoutPart* layoutObject = ownerLayoutObject()) | 183 if (LayoutPart* layoutObject = ownerLayoutObject()) |
| 184 layoutObject->layer()->updateSelfPaintingLayer(); | 184 layoutObject->layer()->updateSelfPaintingLayer(); |
| 185 } | 185 } |
| 186 | 186 |
| 187 } // namespace blink | 187 } // namespace blink |
| OLD | NEW |