diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-23 19:12:23 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-23 19:12:23 +0000 |
| commit | 99aee3f542640e6543ae51f4bab569c9f8668413 (patch) | |
| tree | c7f74a88d54e6232927b8820503bd1e6605c2729 /components/favicon_base | |
| parent | 56cc35c9d1f8279b9062a83193f9748ac4ac3414 (diff) | |
| download | chromium_src-99aee3f542640e6543ae51f4bab569c9f8668413.zip chromium_src-99aee3f542640e6543ae51f4bab569c9f8668413.tar.gz chromium_src-99aee3f542640e6543ae51f4bab569c9f8668413.tar.bz2 | |
Use std::find instead of loop
This depends on https://codereview.chromium.org/335233003/.
BUG=None
R=pkotwicz@chromium.org
Review URL: https://codereview.chromium.org/335243003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@279158 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/favicon_base')
| -rw-r--r-- | components/favicon_base/favicon_util.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/components/favicon_base/favicon_util.cc b/components/favicon_base/favicon_util.cc index bf3d31a..84ead61 100644 --- a/components/favicon_base/favicon_util.cc +++ b/components/favicon_base/favicon_util.cc @@ -187,14 +187,12 @@ gfx::Image SelectFaviconFramesFromPNGs( std::vector<float> favicon_scales_to_generate = favicon_scales; for (size_t i = 0; i < png_reps.size(); ++i) { - for (int j = static_cast<int>(favicon_scales_to_generate.size()) - 1; - j >= 0; - --j) { - if (png_reps[i].scale == favicon_scales_to_generate[j]) { - favicon_scales_to_generate.erase(favicon_scales_to_generate.begin() + - j); - } - } + std::vector<float>::iterator iter = std::find( + favicon_scales_to_generate.begin(), + favicon_scales_to_generate.end(), + png_reps[i].scale); + if (iter != favicon_scales_to_generate.end()) + favicon_scales_to_generate.erase(iter); } if (favicon_scales_to_generate.empty()) |