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

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

Issue 790843002: If the renderer drops a navigation, make sure the spinner doesn't spin endlessly. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: test Created 6 years 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/common/frame_messages.h ('k') | content/renderer/render_view_browsertest.cc » ('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 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 938 matching lines...) Expand 10 before | Expand all | Expand 10 after
949 "id", routing_id_, 949 "id", routing_id_,
950 "url", params.common_params.url.possibly_invalid_spec()); 950 "url", params.common_params.url.possibly_invalid_spec());
951 bool is_reload = 951 bool is_reload =
952 RenderViewImpl::IsReload(params.common_params.navigation_type); 952 RenderViewImpl::IsReload(params.common_params.navigation_type);
953 WebURLRequest::CachePolicy cache_policy = 953 WebURLRequest::CachePolicy cache_policy =
954 WebURLRequest::UseProtocolCachePolicy; 954 WebURLRequest::UseProtocolCachePolicy;
955 if (!RenderFrameImpl::PrepareRenderViewForNavigation( 955 if (!RenderFrameImpl::PrepareRenderViewForNavigation(
956 params.common_params.url, params.common_params.navigation_type, 956 params.common_params.url, params.common_params.navigation_type,
957 params.commit_params.page_state, true, params.pending_history_list_offset, 957 params.commit_params.page_state, true, params.pending_history_list_offset,
958 params.page_id, &is_reload, &cache_policy)) { 958 params.page_id, &is_reload, &cache_policy)) {
959 Send(new FrameHostMsg_DidDropNavigation(routing_id_));
959 return; 960 return;
960 } 961 }
961 962
962 int pending_history_list_offset = params.pending_history_list_offset; 963 int pending_history_list_offset = params.pending_history_list_offset;
963 int current_history_list_offset = params.current_history_list_offset; 964 int current_history_list_offset = params.current_history_list_offset;
964 int current_history_list_length = params.current_history_list_length; 965 int current_history_list_length = params.current_history_list_length;
965 if (params.should_clear_history_list) { 966 if (params.should_clear_history_list) {
966 CHECK_EQ(pending_history_list_offset, -1); 967 CHECK_EQ(pending_history_list_offset, -1);
967 CHECK_EQ(current_history_list_offset, -1); 968 CHECK_EQ(current_history_list_offset, -1);
968 CHECK_EQ(current_history_list_length, 0); 969 CHECK_EQ(current_history_list_length, 0);
(...skipping 3297 matching lines...) Expand 10 before | Expand all | Expand 10 after
4266 4267
4267 #if defined(ENABLE_BROWSER_CDMS) 4268 #if defined(ENABLE_BROWSER_CDMS)
4268 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 4269 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
4269 if (!cdm_manager_) 4270 if (!cdm_manager_)
4270 cdm_manager_ = new RendererCdmManager(this); 4271 cdm_manager_ = new RendererCdmManager(this);
4271 return cdm_manager_; 4272 return cdm_manager_;
4272 } 4273 }
4273 #endif // defined(ENABLE_BROWSER_CDMS) 4274 #endif // defined(ENABLE_BROWSER_CDMS)
4274 4275
4275 } // namespace content 4276 } // namespace content
OLDNEW
« no previous file with comments | « content/common/frame_messages.h ('k') | content/renderer/render_view_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698