OLD | NEW |
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 Loading... |
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 |
626 // If the current status is different than the new status, the delegate | 629 // If the current status is different than the new status, the delegate |
627 // needs to be notified. | 630 // needs to be notified. |
628 if (delegate_ && (created != render_frame_created_)) { | 631 if (delegate_ && (created != was_created)) { |
629 if (created) | 632 if (created) |
630 delegate_->RenderFrameCreated(this); | 633 delegate_->RenderFrameCreated(this); |
631 else | 634 else |
632 delegate_->RenderFrameDeleted(this); | 635 delegate_->RenderFrameDeleted(this); |
633 } | 636 } |
634 | 637 |
635 render_frame_created_ = created; | |
636 if (created && render_widget_host_) | 638 if (created && render_widget_host_) |
637 render_widget_host_->InitForFrame(); | 639 render_widget_host_->InitForFrame(); |
638 } | 640 } |
639 | 641 |
640 void RenderFrameHostImpl::Init() { | 642 void RenderFrameHostImpl::Init() { |
641 GetProcess()->ResumeRequestsForView(routing_id_); | 643 GetProcess()->ResumeRequestsForView(routing_id_); |
642 } | 644 } |
643 | 645 |
644 void RenderFrameHostImpl::OnAddMessageToConsole( | 646 void RenderFrameHostImpl::OnAddMessageToConsole( |
645 int32 level, | 647 int32 level, |
(...skipping 1342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1988 return; | 1990 return; |
1989 | 1991 |
1990 permission_manager->RegisterPermissionUsage( | 1992 permission_manager->RegisterPermissionUsage( |
1991 PermissionType::GEOLOCATION, | 1993 PermissionType::GEOLOCATION, |
1992 GetLastCommittedURL().GetOrigin(), | 1994 GetLastCommittedURL().GetOrigin(), |
1993 frame_tree_node()->frame_tree()->GetMainFrame() | 1995 frame_tree_node()->frame_tree()->GetMainFrame() |
1994 ->GetLastCommittedURL().GetOrigin()); | 1996 ->GetLastCommittedURL().GetOrigin()); |
1995 } | 1997 } |
1996 | 1998 |
1997 } // namespace content | 1999 } // namespace content |
OLD | NEW |