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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 1086613003: Revert of Set frame liveness before calling RenderFrameCreated/RenderFrameDeleted. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@b444955
Patch Set: Created 5 years, 8 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 | « content/browser/frame_host/frame_tree_unittest.cc ('k') | 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/browser/frame_host/render_frame_host_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/containers/hash_tables.h" 9 #include "base/containers/hash_tables.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 605 matching lines...) Expand 10 before | Expand all | Expand 10 after
616 render_view_host_->IsRenderViewLive() : 616 render_view_host_->IsRenderViewLive() :
617 GetProcess()->HasConnection() && render_frame_created_; 617 GetProcess()->HasConnection() && render_frame_created_;
618 618
619 // Sanity check: the RenderView should always be live if the RenderFrame is. 619 // Sanity check: the RenderView should always be live if the RenderFrame is.
620 DCHECK(!is_live || render_view_host_->IsRenderViewLive()); 620 DCHECK(!is_live || render_view_host_->IsRenderViewLive());
621 621
622 return is_live; 622 return is_live;
623 } 623 }
624 624
625 void RenderFrameHostImpl::SetRenderFrameCreated(bool created) { 625 void RenderFrameHostImpl::SetRenderFrameCreated(bool created) {
626 bool was_created = render_frame_created_;
627 render_frame_created_ = created;
628
629 // If the current status is different than the new status, the delegate 626 // If the current status is different than the new status, the delegate
630 // needs to be notified. 627 // needs to be notified.
631 if (delegate_ && (created != was_created)) { 628 if (delegate_ && (created != render_frame_created_)) {
632 if (created) 629 if (created)
633 delegate_->RenderFrameCreated(this); 630 delegate_->RenderFrameCreated(this);
634 else 631 else
635 delegate_->RenderFrameDeleted(this); 632 delegate_->RenderFrameDeleted(this);
636 } 633 }
637 634
635 render_frame_created_ = created;
638 if (created && render_widget_host_) 636 if (created && render_widget_host_)
639 render_widget_host_->InitForFrame(); 637 render_widget_host_->InitForFrame();
640 } 638 }
641 639
642 void RenderFrameHostImpl::Init() { 640 void RenderFrameHostImpl::Init() {
643 GetProcess()->ResumeRequestsForView(routing_id_); 641 GetProcess()->ResumeRequestsForView(routing_id_);
644 } 642 }
645 643
646 void RenderFrameHostImpl::OnAddMessageToConsole( 644 void RenderFrameHostImpl::OnAddMessageToConsole(
647 int32 level, 645 int32 level,
(...skipping 1342 matching lines...) Expand 10 before | Expand all | Expand 10 after
1990 return; 1988 return;
1991 1989
1992 permission_manager->RegisterPermissionUsage( 1990 permission_manager->RegisterPermissionUsage(
1993 PermissionType::GEOLOCATION, 1991 PermissionType::GEOLOCATION,
1994 GetLastCommittedURL().GetOrigin(), 1992 GetLastCommittedURL().GetOrigin(),
1995 frame_tree_node()->frame_tree()->GetMainFrame() 1993 frame_tree_node()->frame_tree()->GetMainFrame()
1996 ->GetLastCommittedURL().GetOrigin()); 1994 ->GetLastCommittedURL().GetOrigin());
1997 } 1995 }
1998 1996
1999 } // namespace content 1997 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/frame_tree_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698