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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 2781723007: Plumb initiator out of Blink. (Closed)
Patch Set: 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
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/render_frame_proxy.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 3465 matching lines...) Expand 10 before | Expand all | Expand 10 after
3476 // exists). 3476 // exists).
3477 if (datasource->getServiceWorkerNetworkProvider()) 3477 if (datasource->getServiceWorkerNetworkProvider())
3478 return; 3478 return;
3479 3479
3480 datasource->setServiceWorkerNetworkProvider( 3480 datasource->setServiceWorkerNetworkProvider(
3481 ServiceWorkerNetworkProvider::CreateForNavigation( 3481 ServiceWorkerNetworkProvider::CreateForNavigation(
3482 routing_id_, navigation_state->request_params(), frame, 3482 routing_id_, navigation_state->request_params(), frame,
3483 content_initiated)); 3483 content_initiated));
3484 } 3484 }
3485 3485
3486 void RenderFrameImpl::didStartProvisionalLoad(blink::WebDataSource* data_source, 3486 void RenderFrameImpl::didStartProvisionalLoad(
3487 blink::WebURLRequest& request) { 3487 blink::WebLocalFrame* initiator_frame,
3488 blink::WebDataSource* data_source,
3489 blink::WebURLRequest& request) {
3488 // In fast/loader/stop-provisional-loads.html, we abort the load before this 3490 // In fast/loader/stop-provisional-loads.html, we abort the load before this
3489 // callback is invoked. 3491 // callback is invoked.
3490 if (!data_source) 3492 if (!data_source)
3491 return; 3493 return;
3492 3494
3493 TRACE_EVENT2("navigation,benchmark,rail", 3495 TRACE_EVENT2("navigation,benchmark,rail",
3494 "RenderFrameImpl::didStartProvisionalLoad", "id", routing_id_, 3496 "RenderFrameImpl::didStartProvisionalLoad", "id", routing_id_,
3495 "url", data_source->getRequest().url().string().utf8()); 3497 "url", data_source->getRequest().url().string().utf8());
3496 3498
3497 // PlzNavigate: 3499 // PlzNavigate:
(...skipping 3471 matching lines...) Expand 10 before | Expand all | Expand 10 after
6969 policy(info.defaultPolicy), 6971 policy(info.defaultPolicy),
6970 replaces_current_history_item(info.replacesCurrentHistoryItem), 6972 replaces_current_history_item(info.replacesCurrentHistoryItem),
6971 history_navigation_in_new_child_frame( 6973 history_navigation_in_new_child_frame(
6972 info.isHistoryNavigationInNewChildFrame), 6974 info.isHistoryNavigationInNewChildFrame),
6973 client_redirect(info.isClientRedirect), 6975 client_redirect(info.isClientRedirect),
6974 cache_disabled(info.isCacheDisabled), 6976 cache_disabled(info.isCacheDisabled),
6975 form(info.form), 6977 form(info.form),
6976 source_location(info.sourceLocation) {} 6978 source_location(info.sourceLocation) {}
6977 6979
6978 } // namespace content 6980 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/render_frame_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698