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

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

Issue 1615713003: Allow std::unordered_*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: leak_detector fixes and git cl format Created 4 years, 11 months 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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm>
9 #include <cmath> 10 #include <cmath>
10 11
11 #include "build/build_config.h" 12 #include "build/build_config.h"
12 #include "components/favicon_base/favicon_types.h" 13 #include "components/favicon_base/favicon_types.h"
13 #include "components/favicon_base/select_favicon_frames.h" 14 #include "components/favicon_base/select_favicon_frames.h"
14 #include "skia/ext/image_operations.h" 15 #include "skia/ext/image_operations.h"
15 #include "third_party/skia/include/core/SkBitmap.h" 16 #include "third_party/skia/include/core/SkBitmap.h"
16 #include "third_party/skia/include/core/SkCanvas.h" 17 #include "third_party/skia/include/core/SkCanvas.h"
17 #include "ui/base/layout.h" 18 #include "ui/base/layout.h"
18 #include "ui/gfx/codec/png_codec.h" 19 #include "ui/gfx/codec/png_codec.h"
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 &png_bytes->data())) { 239 &png_bytes->data())) {
239 png_reps.push_back( 240 png_reps.push_back(
240 gfx::ImagePNGRep(png_bytes, resized_image_skia_reps[i].scale())); 241 gfx::ImagePNGRep(png_bytes, resized_image_skia_reps[i].scale()));
241 } 242 }
242 } 243 }
243 244
244 return gfx::Image(png_reps); 245 return gfx::Image(png_reps);
245 } 246 }
246 247
247 } // namespace favicon_base 248 } // namespace favicon_base
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698