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

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

Issue 648463004: Ensure that the page id assignment IPC is sent. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 | « no previous file | 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 2269 matching lines...) Expand 10 before | Expand all | Expand 10 after
2280 // If the history list is valid, our list of page IDs should be correct. 2280 // If the history list is valid, our list of page IDs should be correct.
2281 DCHECK(render_view_->history_list_length_ <= 0 || 2281 DCHECK(render_view_->history_list_length_ <= 0 ||
2282 render_view_->history_list_offset_ < 0 || 2282 render_view_->history_list_offset_ < 0 ||
2283 render_view_->history_list_offset_ >= 2283 render_view_->history_list_offset_ >=
2284 render_view_->history_list_length_ || 2284 render_view_->history_list_length_ ||
2285 render_view_->history_page_ids_[render_view_->history_list_offset_] 2285 render_view_->history_page_ids_[render_view_->history_list_offset_]
2286 == render_view_->page_id_); 2286 == render_view_->page_id_);
2287 } 2287 }
2288 } 2288 }
2289 2289
2290 Send(new FrameHostMsg_DidAssignPageId(routing_id_, render_view_->page_id_)); 2290 bool sent = Send(
2291 new FrameHostMsg_DidAssignPageId(routing_id_, render_view_->page_id_));
2292 CHECK(sent); // http://crbug.com/407376
2291 2293
2292 FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers_, 2294 FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers_,
2293 DidCommitProvisionalLoad(frame, is_new_navigation)); 2295 DidCommitProvisionalLoad(frame, is_new_navigation));
2294 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, 2296 FOR_EACH_OBSERVER(RenderFrameObserver, observers_,
2295 DidCommitProvisionalLoad(is_new_navigation)); 2297 DidCommitProvisionalLoad(is_new_navigation));
2296 2298
2297 if (!frame->parent()) { // Only for top frames. 2299 if (!frame->parent()) { // Only for top frames.
2298 RenderThreadImpl* render_thread_impl = RenderThreadImpl::current(); 2300 RenderThreadImpl* render_thread_impl = RenderThreadImpl::current();
2299 if (render_thread_impl) { // Can be NULL in tests. 2301 if (render_thread_impl) { // Can be NULL in tests.
2300 render_thread_impl->histogram_customizer()-> 2302 render_thread_impl->histogram_customizer()->
(...skipping 1767 matching lines...) Expand 10 before | Expand all | Expand 10 after
4068 4070
4069 #if defined(ENABLE_BROWSER_CDMS) 4071 #if defined(ENABLE_BROWSER_CDMS)
4070 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 4072 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
4071 if (!cdm_manager_) 4073 if (!cdm_manager_)
4072 cdm_manager_ = new RendererCdmManager(this); 4074 cdm_manager_ = new RendererCdmManager(this);
4073 return cdm_manager_; 4075 return cdm_manager_;
4074 } 4076 }
4075 #endif // defined(ENABLE_BROWSER_CDMS) 4077 #endif // defined(ENABLE_BROWSER_CDMS)
4076 4078
4077 } // namespace content 4079 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698