components/favicon_base/favicon_util.cc - Issue 1610023003: Revert of Allow std::unordered_*.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1610023003: Revert of Allow std::unordered_*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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

OLD	NEW
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>

10 #include <cmath>	9 #include <cmath>

11	10

12 #include "build/build_config.h"	11 #include "build/build_config.h"

13 #include "components/favicon_base/favicon_types.h"	12 #include "components/favicon_base/favicon_types.h"

14 #include "components/favicon_base/select_favicon_frames.h"	13 #include "components/favicon_base/select_favicon_frames.h"

15 #include "skia/ext/image_operations.h"	14 #include "skia/ext/image_operations.h"

16 #include "third_party/skia/include/core/SkBitmap.h"	15 #include "third_party/skia/include/core/SkBitmap.h"

17 #include "third_party/skia/include/core/SkCanvas.h"	16 #include "third_party/skia/include/core/SkCanvas.h"

18 #include "ui/base/layout.h"	17 #include "ui/base/layout.h"

19 #include "ui/gfx/codec/png_codec.h"	18 #include "ui/gfx/codec/png_codec.h"

(...skipping 219 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
239 &png_bytes->data())) {	238 &png_bytes->data())) {

240 png_reps.push_back(	239 png_reps.push_back(

241 gfx::ImagePNGRep(png_bytes, resized_image_skia_reps[i].scale()));	240 gfx::ImagePNGRep(png_bytes, resized_image_skia_reps[i].scale()));

242 }	241 }

243 }	242 }

244	243

245 return gfx::Image(png_reps);	244 return gfx::Image(png_reps);

246 }	245 }

247	246

248 } // namespace favicon_base	247 } // namespace favicon_base

OLD	NEW