From 99aee3f542640e6543ae51f4bab569c9f8668413 Mon Sep 17 00:00:00 2001 From: "oshima@chromium.org" Date: Mon, 23 Jun 2014 19:12:23 +0000 Subject: 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 --- components/favicon_base/favicon_util.cc | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'components/favicon_base') 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 favicon_scales_to_generate = favicon_scales; for (size_t i = 0; i < png_reps.size(); ++i) { - for (int j = static_cast(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::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()) -- cgit v1.1