| 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 634 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 645 // are created with their RenderView, and same-site iframes are created at the | 645 // are created with their RenderView, and same-site iframes are created at the |
| 646 // time of OnCreateChildFrame. | 646 // time of OnCreateChildFrame. |
| 647 SetRenderFrameCreated(true); | 647 SetRenderFrameCreated(true); |
| 648 | 648 |
| 649 return true; | 649 return true; |
| 650 } | 650 } |
| 651 | 651 |
| 652 bool RenderFrameHostImpl::IsRenderFrameLive() { | 652 bool RenderFrameHostImpl::IsRenderFrameLive() { |
| 653 bool is_live = GetProcess()->HasConnection() && render_frame_created_; | 653 bool is_live = GetProcess()->HasConnection() && render_frame_created_; |
| 654 | 654 |
| 655 // If the process is for an isolated guest (e.g. <webview>), rely on the | |
| 656 // RenderViewHost liveness check. Once https://crbug.com/492830 is fixed, | |
| 657 // this can be removed. | |
| 658 if (GetProcess()->IsIsolatedGuest()) | |
| 659 is_live = render_view_host_->IsRenderViewLive(); | |
| 660 | |
| 661 // Sanity check: the RenderView should always be live if the RenderFrame is. | 655 // Sanity check: the RenderView should always be live if the RenderFrame is. |
| 662 DCHECK_IMPLIES(is_live, render_view_host_->IsRenderViewLive()); | 656 DCHECK_IMPLIES(is_live, render_view_host_->IsRenderViewLive()); |
| 663 | 657 |
| 664 return is_live; | 658 return is_live; |
| 665 } | 659 } |
| 666 | 660 |
| 667 void RenderFrameHostImpl::SetRenderFrameCreated(bool created) { | 661 void RenderFrameHostImpl::SetRenderFrameCreated(bool created) { |
| 668 bool was_created = render_frame_created_; | 662 bool was_created = render_frame_created_; |
| 669 render_frame_created_ = created; | 663 render_frame_created_ = created; |
| 670 | 664 |
| (...skipping 1396 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2067 // We may be returning to an existing NavigationEntry that had been granted | 2061 // We may be returning to an existing NavigationEntry that had been granted |
| 2068 // file access. If this is a different process, we will need to grant the | 2062 // file access. If this is a different process, we will need to grant the |
| 2069 // access again. The files listed in the page state are validated when they | 2063 // access again. The files listed in the page state are validated when they |
| 2070 // are received from the renderer to prevent abuse. | 2064 // are received from the renderer to prevent abuse. |
| 2071 if (request_params.page_state.IsValid()) { | 2065 if (request_params.page_state.IsValid()) { |
| 2072 render_view_host_->GrantFileAccessFromPageState(request_params.page_state); | 2066 render_view_host_->GrantFileAccessFromPageState(request_params.page_state); |
| 2073 } | 2067 } |
| 2074 } | 2068 } |
| 2075 | 2069 |
| 2076 } // namespace content | 2070 } // namespace content |
| OLD | NEW |