diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-16 10:16:45 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-16 10:16:45 +0000 |
| commit | 6ae73ea5e679a176482fe649336e1b79cbda3eff (patch) | |
| tree | 377e5d3567527cf137ddcf75c1ecd334662195fd /base/id_map.h | |
| parent | 881ac4bde2e5acc19a81b623f2b8b32ba60f1a70 (diff) | |
| download | chromium_src-6ae73ea5e679a176482fe649336e1b79cbda3eff.zip chromium_src-6ae73ea5e679a176482fe649336e1b79cbda3eff.tar.gz chromium_src-6ae73ea5e679a176482fe649336e1b79cbda3eff.tar.bz2 | |
Merge 39084 - Correctly recognize emptiness of IDMap.
This prevents a leak of RenderProcessHost, and possibly other
bad bugs.
TEST=Added to base_unittests; also existing browser and unit tests.
BUG=35571
Review URL: http://codereview.chromium.org/604048
TBR=brettw@chromium.org
Review URL: http://codereview.chromium.org/601078
git-svn-id: svn://svn.chromium.org/chrome/branches/307/src@39086 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/id_map.h')
| -rw-r--r-- | base/id_map.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/base/id_map.h b/base/id_map.h index b108dbd..acfba42 100644 --- a/base/id_map.h +++ b/base/id_map.h @@ -82,7 +82,7 @@ class IDMap { } bool IsEmpty() const { - return data_.empty(); + return size() == 0u; } T* Lookup(KeyType id) const { @@ -93,7 +93,7 @@ class IDMap { } size_t size() const { - return data_.size(); + return data_.size() - removed_ids_.size(); } // It is safe to remove elements from the map during iteration. All iterators |