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

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

Issue 1148953014: Fix the commit type for out-of-process iframes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix failing tests Created 5 years, 7 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
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 4387 matching lines...) Expand 10 before | Expand all | Expand 10 after
4398 WebURLRequest::UseProtocolCachePolicy; 4398 WebURLRequest::UseProtocolCachePolicy;
4399 if (!RenderFrameImpl::PrepareRenderViewForNavigation( 4399 if (!RenderFrameImpl::PrepareRenderViewForNavigation(
4400 common_params.url, is_history_navigation, request_params, &is_reload, 4400 common_params.url, is_history_navigation, request_params, &is_reload,
4401 &cache_policy)) { 4401 &cache_policy)) {
4402 Send(new FrameHostMsg_DidDropNavigation(routing_id_)); 4402 Send(new FrameHostMsg_DidDropNavigation(routing_id_));
4403 return; 4403 return;
4404 } 4404 }
4405 4405
4406 GetContentClient()->SetActiveURL(common_params.url); 4406 GetContentClient()->SetActiveURL(common_params.url);
4407 4407
4408 // If this frame isn't in the same process as the main frame, it may naively
4409 // assume that this is the first navigation in the iframe, but this may not
4410 // actually be the case. Inform the frame's state machine if this frame has
4411 // already committed other loads.
4412 if (request_params.has_committed_real_load && frame_->parent())
4413 frame_->setCommittedFirstRealLoad();
Charlie Reis 2015/05/27 17:26:24 japhet: Can you sanity check this part? I'm basic
4414
4408 if (is_reload && !render_view_->history_controller()->GetCurrentEntry()) { 4415 if (is_reload && !render_view_->history_controller()->GetCurrentEntry()) {
4409 // We cannot reload if we do not have any history state. This happens, for 4416 // We cannot reload if we do not have any history state. This happens, for
4410 // example, when recovering from a crash. 4417 // example, when recovering from a crash.
4411 is_reload = false; 4418 is_reload = false;
4412 cache_policy = WebURLRequest::ReloadIgnoringCacheData; 4419 cache_policy = WebURLRequest::ReloadIgnoringCacheData;
4413 } 4420 }
4414 4421
4415 pending_navigation_params_.reset( 4422 pending_navigation_params_.reset(
4416 new NavigationParams(common_params, start_params, request_params)); 4423 new NavigationParams(common_params, start_params, request_params));
4417 4424
(...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after
4916 #elif defined(ENABLE_BROWSER_CDMS) 4923 #elif defined(ENABLE_BROWSER_CDMS)
4917 cdm_manager_, 4924 cdm_manager_,
4918 #endif 4925 #endif
4919 this); 4926 this);
4920 } 4927 }
4921 4928
4922 return cdm_factory_; 4929 return cdm_factory_;
4923 } 4930 }
4924 4931
4925 } // namespace content 4932 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698