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

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

Issue 2814703004: Make blink::ResourceRequest ctors explicit (Closed)
Patch Set: simplify Created 3 years, 8 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
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 "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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 DEFINE_TRACE(RemoteFrame) { 46 DEFINE_TRACE(RemoteFrame) {
47 visitor->Trace(view_); 47 visitor->Trace(view_);
48 visitor->Trace(security_context_); 48 visitor->Trace(security_context_);
49 Frame::Trace(visitor); 49 Frame::Trace(visitor);
50 } 50 }
51 51
52 void RemoteFrame::Navigate(Document& origin_document, 52 void RemoteFrame::Navigate(Document& origin_document,
53 const KURL& url, 53 const KURL& url,
54 bool replace_current_item, 54 bool replace_current_item,
55 UserGestureStatus user_gesture_status) { 55 UserGestureStatus user_gesture_status) {
56 FrameLoadRequest frame_request(&origin_document, url); 56 FrameLoadRequest frame_request(&origin_document, ResourceRequest(url));
57 frame_request.SetReplacesCurrentItem(replace_current_item); 57 frame_request.SetReplacesCurrentItem(replace_current_item);
58 frame_request.GetResourceRequest().SetHasUserGesture( 58 frame_request.GetResourceRequest().SetHasUserGesture(
59 user_gesture_status == UserGestureStatus::kActive); 59 user_gesture_status == UserGestureStatus::kActive);
60 Navigate(frame_request); 60 Navigate(frame_request);
61 } 61 }
62 62
63 void RemoteFrame::Navigate(const FrameLoadRequest& passed_request) { 63 void RemoteFrame::Navigate(const FrameLoadRequest& passed_request) {
64 FrameLoadRequest frame_request(passed_request); 64 FrameLoadRequest frame_request(passed_request);
65 65
66 // The process where this frame actually lives won't have sufficient 66 // The process where this frame actually lives won't have sufficient
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 FrameVector children_to_detach; 165 FrameVector children_to_detach;
166 children_to_detach.ReserveCapacity(Tree().ChildCount()); 166 children_to_detach.ReserveCapacity(Tree().ChildCount());
167 for (Frame* child = Tree().FirstChild(); child; 167 for (Frame* child = Tree().FirstChild(); child;
168 child = child->Tree().NextSibling()) 168 child = child->Tree().NextSibling())
169 children_to_detach.push_back(child); 169 children_to_detach.push_back(child);
170 for (const auto& child : children_to_detach) 170 for (const auto& child : children_to_detach)
171 child->Detach(FrameDetachType::kRemove); 171 child->Detach(FrameDetachType::kRemove);
172 } 172 }
173 173
174 } // namespace blink 174 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698