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

Side by Side Diff: ui/gfx/image/image_util.cc

Issue 1445003002: Use std::default_delete as the default deleter for scoped_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: How many trial and errors before this builds on the Windows bots Created 5 years, 1 month 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
« no previous file with comments | « ui/gfx/gdi_util.cc ('k') | ui/gl/gl_surface_osmesa.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ui/gfx/image/image_util.h" 5 #include "ui/gfx/image/image_util.h"
6 6
7 #include <algorithm>
8
7 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
8 #include "third_party/skia/include/core/SkBitmap.h" 10 #include "third_party/skia/include/core/SkBitmap.h"
9 #include "ui/gfx/codec/jpeg_codec.h" 11 #include "ui/gfx/codec/jpeg_codec.h"
10 #include "ui/gfx/image/image.h" 12 #include "ui/gfx/image/image.h"
11 #include "ui/gfx/image/image_skia.h" 13 #include "ui/gfx/image/image_skia.h"
12 14
13 namespace gfx { 15 namespace gfx {
14 16
15 const uint32_t kMinimumVisibleOpacity = 12; 17 const uint32_t kMinimumVisibleOpacity = 12;
16 18
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 *trailing = bitmap.width()/2 + 1; 96 *trailing = bitmap.width()/2 + 1;
95 return true; 97 return true;
96 } 98 }
97 99
98 *leading = inner_min; 100 *leading = inner_min;
99 *trailing = inner_max; 101 *trailing = inner_max;
100 return true; 102 return true;
101 } 103 }
102 104
103 } // namespace gfx 105 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/gdi_util.cc ('k') | ui/gl/gl_surface_osmesa.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698