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/frame_tree.h" | 5 #include "content/browser/frame_host/frame_tree.h" |
6 | 6 |
7 #include <queue> | 7 #include <queue> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
224 // Create the swapped out RVH for the new SiteInstance. This will create | 224 // Create the swapped out RVH for the new SiteInstance. This will create |
225 // a top-level swapped out RFH as well, which will then be wrapped by a | 225 // a top-level swapped out RFH as well, which will then be wrapped by a |
226 // RenderFrameProxyHost. | 226 // RenderFrameProxyHost. |
227 if (!source || !source->IsMainFrame()) { | 227 if (!source || !source->IsMainFrame()) { |
228 RenderViewHostImpl* render_view_host = GetRenderViewHost(site_instance); | 228 RenderViewHostImpl* render_view_host = GetRenderViewHost(site_instance); |
229 if (!render_view_host) { | 229 if (!render_view_host) { |
230 if (SiteIsolationPolicy::IsSwappedOutStateForbidden()) { | 230 if (SiteIsolationPolicy::IsSwappedOutStateForbidden()) { |
231 root()->render_manager()->CreateRenderFrameProxy(site_instance); | 231 root()->render_manager()->CreateRenderFrameProxy(site_instance); |
232 } else { | 232 } else { |
233 root()->render_manager()->CreateRenderFrame( | 233 root()->render_manager()->CreateRenderFrame( |
234 site_instance, nullptr, CREATE_RF_SWAPPED_OUT | CREATE_RF_HIDDEN, | 234 site_instance, CREATE_RF_SWAPPED_OUT | CREATE_RF_HIDDEN, nullptr); |
235 nullptr); | |
236 } | 235 } |
237 } else { | 236 } else { |
238 root()->render_manager()->EnsureRenderViewInitialized(render_view_host, | 237 root()->render_manager()->EnsureRenderViewInitialized(render_view_host, |
239 site_instance); | 238 site_instance); |
240 } | 239 } |
241 } | 240 } |
242 | 241 |
243 scoped_refptr<SiteInstance> instance(site_instance); | 242 scoped_refptr<SiteInstance> instance(site_instance); |
244 | 243 |
245 // Proxies are created in the FrameTree in response to a node navigating to a | 244 // Proxies are created in the FrameTree in response to a node navigating to a |
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
393 load_progress_ = 0.0; | 392 load_progress_ = 0.0; |
394 } | 393 } |
395 | 394 |
396 bool FrameTree::IsLoading() { | 395 bool FrameTree::IsLoading() { |
397 bool is_loading = false; | 396 bool is_loading = false; |
398 ForEach(base::Bind(&IsNodeLoading, &is_loading)); | 397 ForEach(base::Bind(&IsNodeLoading, &is_loading)); |
399 return is_loading; | 398 return is_loading; |
400 } | 399 } |
401 | 400 |
402 } // namespace content | 401 } // namespace content |
OLD | NEW |