Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(473)

Side by Side Diff: components/favicon_base/favicon_util.cc

Issue 1502373009: Allow std::unordered_*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Include. What. You. Use. Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/favicon_base/favicon_util.h" 5 #include "components/favicon_base/favicon_util.h"
6 6
7 #include <algorithm>
7 #include <cmath> 8 #include <cmath>
8 9
9 #include "components/favicon_base/favicon_types.h" 10 #include "components/favicon_base/favicon_types.h"
10 #include "components/favicon_base/select_favicon_frames.h" 11 #include "components/favicon_base/select_favicon_frames.h"
11 #include "skia/ext/image_operations.h" 12 #include "skia/ext/image_operations.h"
12 #include "third_party/skia/include/core/SkBitmap.h" 13 #include "third_party/skia/include/core/SkBitmap.h"
13 #include "third_party/skia/include/core/SkCanvas.h" 14 #include "third_party/skia/include/core/SkCanvas.h"
14 #include "ui/base/layout.h" 15 #include "ui/base/layout.h"
15 #include "ui/gfx/codec/png_codec.h" 16 #include "ui/gfx/codec/png_codec.h"
16 #include "ui/gfx/favicon_size.h" 17 #include "ui/gfx/favicon_size.h"
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 &png_bytes->data())) { 236 &png_bytes->data())) {
236 png_reps.push_back( 237 png_reps.push_back(
237 gfx::ImagePNGRep(png_bytes, resized_image_skia_reps[i].scale())); 238 gfx::ImagePNGRep(png_bytes, resized_image_skia_reps[i].scale()));
238 } 239 }
239 } 240 }
240 241
241 return gfx::Image(png_reps); 242 return gfx::Image(png_reps);
242 } 243 }
243 244
244 } // namespace favicon_base 245 } // namespace favicon_base
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698