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

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

Issue 2779893006: Remove WebLocalFrame* from didReceiveServerRedirectForProvisionalLoad (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/shell/test_runner/web_frame_test_client.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 3529 matching lines...) Expand 10 before | Expand all | Expand 10 after
3540 observer.DidStartProvisionalLoad(data_source); 3540 observer.DidStartProvisionalLoad(data_source);
3541 3541
3542 std::vector<GURL> redirect_chain; 3542 std::vector<GURL> redirect_chain;
3543 GetRedirectChain(data_source, &redirect_chain); 3543 GetRedirectChain(data_source, &redirect_chain);
3544 3544
3545 Send(new FrameHostMsg_DidStartProvisionalLoad( 3545 Send(new FrameHostMsg_DidStartProvisionalLoad(
3546 routing_id_, data_source->getRequest().url(), redirect_chain, 3546 routing_id_, data_source->getRequest().url(), redirect_chain,
3547 navigation_start)); 3547 navigation_start));
3548 } 3548 }
3549 3549
3550 void RenderFrameImpl::didReceiveServerRedirectForProvisionalLoad( 3550 void RenderFrameImpl::didReceiveServerRedirectForProvisionalLoad() {
3551 blink::WebLocalFrame* frame) {
3552 DCHECK_EQ(frame_, frame);
3553
3554 // TODO(creis): Determine if this can be removed or if we need to clear any 3551 // TODO(creis): Determine if this can be removed or if we need to clear any
3555 // local state here to fix https://crbug.com/671276. 3552 // local state here to fix https://crbug.com/671276.
3556 } 3553 }
3557 3554
3558 void RenderFrameImpl::didFailProvisionalLoad( 3555 void RenderFrameImpl::didFailProvisionalLoad(
3559 blink::WebLocalFrame* frame, 3556 blink::WebLocalFrame* frame,
3560 const blink::WebURLError& error, 3557 const blink::WebURLError& error,
3561 blink::WebHistoryCommitType commit_type) { 3558 blink::WebHistoryCommitType commit_type) {
3562 TRACE_EVENT1("navigation,benchmark,rail", 3559 TRACE_EVENT1("navigation,benchmark,rail",
3563 "RenderFrameImpl::didFailProvisionalLoad", "id", routing_id_); 3560 "RenderFrameImpl::didFailProvisionalLoad", "id", routing_id_);
(...skipping 3405 matching lines...) Expand 10 before | Expand all | Expand 10 after
6969 policy(info.defaultPolicy), 6966 policy(info.defaultPolicy),
6970 replaces_current_history_item(info.replacesCurrentHistoryItem), 6967 replaces_current_history_item(info.replacesCurrentHistoryItem),
6971 history_navigation_in_new_child_frame( 6968 history_navigation_in_new_child_frame(
6972 info.isHistoryNavigationInNewChildFrame), 6969 info.isHistoryNavigationInNewChildFrame),
6973 client_redirect(info.isClientRedirect), 6970 client_redirect(info.isClientRedirect),
6974 cache_disabled(info.isCacheDisabled), 6971 cache_disabled(info.isCacheDisabled),
6975 form(info.form), 6972 form(info.form),
6976 source_location(info.sourceLocation) {} 6973 source_location(info.sourceLocation) {}
6977 6974
6978 } // namespace content 6975 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/shell/test_runner/web_frame_test_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698