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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1044923003: Add the WebHistoryCommitType to didFailProvisionalLoad, part 3. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@committype1
Patch Set: fix Created 5 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/render_view_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index e51b906198131619283fd920a3aae16c49eb1ae6..259b4146192822f41624006f67824fd4cecfd186 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -2477,8 +2477,10 @@ void RenderFrameImpl::didReceiveServerRedirectForProvisionalLoad(
render_view_->history_controller()->RemoveChildrenForRedirect(this);
}
-void RenderFrameImpl::didFailProvisionalLoad(blink::WebLocalFrame* frame,
- const blink::WebURLError& error) {
+void RenderFrameImpl::didFailProvisionalLoad(
+ blink::WebLocalFrame* frame,
+ const blink::WebURLError& error,
+ blink::WebHistoryCommitType commit_type) {
TRACE_EVENT1("navigation", "RenderFrameImpl::didFailProvisionalLoad",
"id", routing_id_);
DCHECK(!frame_ || frame_ == frame);
@@ -2574,13 +2576,6 @@ void RenderFrameImpl::didFailProvisionalLoad(blink::WebLocalFrame* frame,
LoadNavigationErrorPage(failed_request, error, replace);
}
-void RenderFrameImpl::didFailProvisionalLoad(
- blink::WebLocalFrame* frame,
- const blink::WebURLError& error,
- blink::WebHistoryCommitType commit_type) {
- didFailProvisionalLoad(frame, error);
-}
-
void RenderFrameImpl::didCommitProvisionalLoad(
blink::WebLocalFrame* frame,
const blink::WebHistoryItem& item,
@@ -2821,7 +2816,8 @@ void RenderFrameImpl::didHandleOnloadEvents(blink::WebLocalFrame* frame) {
}
void RenderFrameImpl::didFailLoad(blink::WebLocalFrame* frame,
- const blink::WebURLError& error) {
+ const blink::WebURLError& error,
+ blink::WebHistoryCommitType commit_type) {
TRACE_EVENT1("navigation", "RenderFrameImpl::didFailLoad",
"id", routing_id_);
DCHECK(!frame_ || frame_ == frame);
@@ -2847,12 +2843,6 @@ void RenderFrameImpl::didFailLoad(blink::WebLocalFrame* frame,
error_description));
}
-void RenderFrameImpl::didFailLoad(blink::WebLocalFrame* frame,
- const blink::WebURLError& error,
- blink::WebHistoryCommitType commit_type) {
- didFailLoad(frame, error);
-}
-
void RenderFrameImpl::didFinishLoad(blink::WebLocalFrame* frame) {
TRACE_EVENT1("navigation", "RenderFrameImpl::didFinishLoad",
"id", routing_id_);
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/render_view_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698