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

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

Issue 1033233003: Add the WebHistoryCommitType to didFailProvisionalLoad, part 1. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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') | no next file » | 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 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 2556 matching lines...) Expand 10 before | Expand all | Expand 10 after
2567 navigation_state->common_params(), navigation_state->start_params(), 2567 navigation_state->common_params(), navigation_state->start_params(),
2568 navigation_state->request_params())); 2568 navigation_state->request_params()));
2569 pending_navigation_params_->request_params.request_time = 2569 pending_navigation_params_->request_params.request_time =
2570 document_state->request_time(); 2570 document_state->request_time();
2571 } 2571 }
2572 2572
2573 // Load an error page. 2573 // Load an error page.
2574 LoadNavigationErrorPage(failed_request, error, replace); 2574 LoadNavigationErrorPage(failed_request, error, replace);
2575 } 2575 }
2576 2576
2577 void RenderFrameImpl::didFailProvisionalLoad(
2578 blink::WebLocalFrame* frame,
2579 const blink::WebURLError& error,
2580 blink::WebHistoryCommitType commit_type) {
2581 didFailProvisionalLoad(frame, error);
2582 }
2583
2577 void RenderFrameImpl::didCommitProvisionalLoad( 2584 void RenderFrameImpl::didCommitProvisionalLoad(
2578 blink::WebLocalFrame* frame, 2585 blink::WebLocalFrame* frame,
2579 const blink::WebHistoryItem& item, 2586 const blink::WebHistoryItem& item,
2580 blink::WebHistoryCommitType commit_type) { 2587 blink::WebHistoryCommitType commit_type) {
2581 TRACE_EVENT2("navigation", "RenderFrameImpl::didCommitProvisionalLoad", 2588 TRACE_EVENT2("navigation", "RenderFrameImpl::didCommitProvisionalLoad",
2582 "id", routing_id_, 2589 "id", routing_id_,
2583 "url", GetLoadingUrl().possibly_invalid_spec()); 2590 "url", GetLoadingUrl().possibly_invalid_spec());
2584 DCHECK(!frame_ || frame_ == frame); 2591 DCHECK(!frame_ || frame_ == frame);
2585 DocumentState* document_state = 2592 DocumentState* document_state =
2586 DocumentState::FromDataSource(frame->dataSource()); 2593 DocumentState::FromDataSource(frame->dataSource());
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
2833 failed_request, 2840 failed_request,
2834 error, 2841 error,
2835 NULL, 2842 NULL,
2836 &error_description); 2843 &error_description);
2837 Send(new FrameHostMsg_DidFailLoadWithError(routing_id_, 2844 Send(new FrameHostMsg_DidFailLoadWithError(routing_id_,
2838 failed_request.url(), 2845 failed_request.url(),
2839 error.reason, 2846 error.reason,
2840 error_description)); 2847 error_description));
2841 } 2848 }
2842 2849
2850 void RenderFrameImpl::didFailLoad(blink::WebLocalFrame* frame,
2851 const blink::WebURLError& error,
2852 blink::WebHistoryCommitType commit_type) {
2853 didFailLoad(frame, error);
2854 }
2855
2843 void RenderFrameImpl::didFinishLoad(blink::WebLocalFrame* frame) { 2856 void RenderFrameImpl::didFinishLoad(blink::WebLocalFrame* frame) {
2844 TRACE_EVENT1("navigation", "RenderFrameImpl::didFinishLoad", 2857 TRACE_EVENT1("navigation", "RenderFrameImpl::didFinishLoad",
2845 "id", routing_id_); 2858 "id", routing_id_);
2846 DCHECK(!frame_ || frame_ == frame); 2859 DCHECK(!frame_ || frame_ == frame);
2847 WebDataSource* ds = frame->dataSource(); 2860 WebDataSource* ds = frame->dataSource();
2848 DocumentState* document_state = DocumentState::FromDataSource(ds); 2861 DocumentState* document_state = DocumentState::FromDataSource(ds);
2849 if (document_state->finish_load_time().is_null()) { 2862 if (document_state->finish_load_time().is_null()) {
2850 if (!frame->parent()) { 2863 if (!frame->parent()) {
2851 TRACE_EVENT_INSTANT0("WebCore", "LoadFinished", 2864 TRACE_EVENT_INSTANT0("WebCore", "LoadFinished",
2852 TRACE_EVENT_SCOPE_PROCESS); 2865 TRACE_EVENT_SCOPE_PROCESS);
(...skipping 1835 matching lines...) Expand 10 before | Expand all | Expand 10 after
4688 4701
4689 #if defined(ENABLE_BROWSER_CDMS) 4702 #if defined(ENABLE_BROWSER_CDMS)
4690 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 4703 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
4691 if (!cdm_manager_) 4704 if (!cdm_manager_)
4692 cdm_manager_ = new RendererCdmManager(this); 4705 cdm_manager_ = new RendererCdmManager(this);
4693 return cdm_manager_; 4706 return cdm_manager_;
4694 } 4707 }
4695 #endif // defined(ENABLE_BROWSER_CDMS) 4708 #endif // defined(ENABLE_BROWSER_CDMS)
4696 4709
4697 } // namespace content 4710 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698