diff options
| author | creis <creis@chromium.org> | 2014-09-29 15:45:22 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-29 22:47:39 +0000 |
| commit | cce56cd951f6685a0120db63418aa7e6d3df28f2 (patch) | |
| tree | 09297d59edb634141e9d62c03f9cce2f2079c561 /content/browser/site_instance_impl.cc | |
| parent | 5f71564cd586274f373696c18930f72cab800b50 (diff) | |
| download | chromium_src-cce56cd951f6685a0120db63418aa7e6d3df28f2.zip chromium_src-cce56cd951f6685a0120db63418aa7e6d3df28f2.tar.gz chromium_src-cce56cd951f6685a0120db63418aa7e6d3df28f2.tar.bz2 | |
Move RenderViewHost swap out state to RenderFrameHost.
Also tracks the number of active frames in a SiteInstance, rather than
the number of views. These changes are necessary for tracking the
pending swap-out state of frames.
This involves a lot of test cleanup as well.
BUG=418264
TEST=Subframes can swap out. (No visible behavior change.)
Review URL: https://codereview.chromium.org/606113005
Cr-Commit-Position: refs/heads/master@{#297293}
Diffstat (limited to 'content/browser/site_instance_impl.cc')
| -rw-r--r-- | content/browser/site_instance_impl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/browser/site_instance_impl.cc b/content/browser/site_instance_impl.cc index 987dd5c..f1555dc 100644 --- a/content/browser/site_instance_impl.cc +++ b/content/browser/site_instance_impl.cc @@ -25,7 +25,7 @@ int32 SiteInstanceImpl::next_site_instance_id_ = 1; SiteInstanceImpl::SiteInstanceImpl(BrowsingInstance* browsing_instance) : id_(next_site_instance_id_++), - active_view_count_(0), + active_frame_count_(0), browsing_instance_(browsing_instance), process_(NULL), has_site_(false) { |