| Index: content/browser/frame_host/render_frame_host_manager.cc
|
| diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
|
| index 37a18ffa7cf2c186f127043d06dfdefdd50801c1..dd1443515fb12eb19aac42e116b26444deac017e 100644
|
| --- a/content/browser/frame_host/render_frame_host_manager.cc
|
| +++ b/content/browser/frame_host/render_frame_host_manager.cc
|
| @@ -494,7 +494,7 @@ void RenderFrameHostManager::CommitPendingIfNecessary(
|
| RenderFrameHostImpl* render_frame_host,
|
| bool was_caused_by_user_gesture) {
|
| if (!pending_render_frame_host_ && !speculative_render_frame_host_) {
|
| - DCHECK_IMPLIES(should_reuse_web_ui_, web_ui_);
|
| + DCHECK(!should_reuse_web_ui_ || web_ui_);
|
|
|
| // We should only hear this from our current renderer.
|
| DCHECK_EQ(render_frame_host_, render_frame_host);
|
| @@ -1521,11 +1521,11 @@ scoped_ptr<RenderFrameHostImpl> RenderFrameHostManager::CreateRenderFrame(
|
| switches::kSitePerProcess);
|
|
|
| CHECK(instance);
|
| - CHECK_IMPLIES(swapped_out_forbidden, !swapped_out);
|
| - CHECK_IMPLIES(!is_site_per_process, frame_tree_node_->IsMainFrame());
|
| + CHECK(!swapped_out_forbidden || !swapped_out);
|
| + CHECK(is_site_per_process || frame_tree_node_->IsMainFrame());
|
|
|
| // Swapped out views should always be hidden.
|
| - DCHECK_IMPLIES(swapped_out, (flags & CREATE_RF_HIDDEN));
|
| + DCHECK(!swapped_out || (flags & CREATE_RF_HIDDEN));
|
|
|
| scoped_ptr<RenderFrameHostImpl> new_render_frame_host;
|
| bool success = true;
|
|
|