Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(216)

Side by Side Diff: Source/core/frame/RemoteFrame.cpp

Issue 1156473002: Refactor FrameLoader loading interface (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/core/frame/RemoteFrame.h ('k') | Source/core/frame/RemoteFrameClient.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 request.setHasUserGesture(userGestureStatus == UserGestureStatus::Active); 70 request.setHasUserGesture(userGestureStatus == UserGestureStatus::Active);
71 remoteFrameClient()->navigate(request, lockBackForwardList); 71 remoteFrameClient()->navigate(request, lockBackForwardList);
72 } 72 }
73 73
74 void RemoteFrame::navigate(const FrameLoadRequest& passedRequest) 74 void RemoteFrame::navigate(const FrameLoadRequest& passedRequest)
75 { 75 {
76 UserGestureStatus gesture = UserGestureIndicator::processingUserGesture() ? UserGestureStatus::Active : UserGestureStatus::None; 76 UserGestureStatus gesture = UserGestureIndicator::processingUserGesture() ? UserGestureStatus::Active : UserGestureStatus::None;
77 navigate(*passedRequest.originDocument(), passedRequest.resourceRequest().ur l(), passedRequest.lockBackForwardList(), gesture); 77 navigate(*passedRequest.originDocument(), passedRequest.resourceRequest().ur l(), passedRequest.lockBackForwardList(), gesture);
78 } 78 }
79 79
80 void RemoteFrame::reload(ReloadPolicy reloadPolicy, ClientRedirectPolicy clientR edirectPolicy) 80 void RemoteFrame::reload(FrameLoadType frameLoadType, ClientRedirectPolicy clien tRedirectPolicy)
81 { 81 {
82 remoteFrameClient()->reload(reloadPolicy, clientRedirectPolicy); 82 remoteFrameClient()->reload(frameLoadType, clientRedirectPolicy);
83 } 83 }
84 84
85 void RemoteFrame::detach() 85 void RemoteFrame::detach()
86 { 86 {
87 // Frame::detach() requires the caller to keep a reference to this, since 87 // Frame::detach() requires the caller to keep a reference to this, since
88 // otherwise it may clear the last reference to this, causing it to be 88 // otherwise it may clear the last reference to this, causing it to be
89 // deleted, which can cause a use-after-free. 89 // deleted, which can cause a use-after-free.
90 RefPtrWillBeRawPtr<RemoteFrame> protect(this); 90 RefPtrWillBeRawPtr<RemoteFrame> protect(this);
91 detachChildren(); 91 detachChildren();
92 if (!client()) 92 if (!client())
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 if (m_remotePlatformLayer) 163 if (m_remotePlatformLayer)
164 GraphicsLayer::registerContentsLayer(layer); 164 GraphicsLayer::registerContentsLayer(layer);
165 165
166 ASSERT(owner()); 166 ASSERT(owner());
167 toHTMLFrameOwnerElement(owner())->setNeedsCompositingUpdate(); 167 toHTMLFrameOwnerElement(owner())->setNeedsCompositingUpdate();
168 if (LayoutPart* layoutObject = ownerLayoutObject()) 168 if (LayoutPart* layoutObject = ownerLayoutObject())
169 layoutObject->layer()->updateSelfPaintingLayer(); 169 layoutObject->layer()->updateSelfPaintingLayer();
170 } 170 }
171 171
172 } // namespace blink 172 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/frame/RemoteFrame.h ('k') | Source/core/frame/RemoteFrameClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698