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

Side by Side Diff: cc/raster/texture_compressor.cc

Issue 1866203004: Convert //cc from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptrcc: rebase Created 4 years, 8 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
« no previous file with comments | « cc/raster/texture_compressor.h ('k') | cc/raster/texture_compressor_etc1_unittest.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "cc/raster/texture_compressor.h" 5 #include "cc/raster/texture_compressor.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/ptr_util.h"
8 #include "cc/raster/texture_compressor_etc1.h" 9 #include "cc/raster/texture_compressor_etc1.h"
9 10
10 #if defined(ARCH_CPU_X86_FAMILY) 11 #if defined(ARCH_CPU_X86_FAMILY)
11 #include "base/cpu.h" 12 #include "base/cpu.h"
12 #include "cc/raster/texture_compressor_etc1_sse.h" 13 #include "cc/raster/texture_compressor_etc1_sse.h"
13 #endif 14 #endif
14 15
15 namespace cc { 16 namespace cc {
16 17
17 scoped_ptr<TextureCompressor> TextureCompressor::Create(Format format) { 18 std::unique_ptr<TextureCompressor> TextureCompressor::Create(Format format) {
18 switch (format) { 19 switch (format) {
19 case kFormatETC1: { 20 case kFormatETC1: {
20 #if defined(ARCH_CPU_X86_FAMILY) 21 #if defined(ARCH_CPU_X86_FAMILY)
21 base::CPU cpu; 22 base::CPU cpu;
22 if (cpu.has_sse2()) { 23 if (cpu.has_sse2()) {
23 return make_scoped_ptr(new TextureCompressorETC1SSE()); 24 return base::WrapUnique(new TextureCompressorETC1SSE());
24 } 25 }
25 #endif 26 #endif
26 return make_scoped_ptr(new TextureCompressorETC1()); 27 return base::WrapUnique(new TextureCompressorETC1());
27 } 28 }
28 } 29 }
29 30
30 NOTREACHED(); 31 NOTREACHED();
31 return nullptr; 32 return nullptr;
32 } 33 }
33 34
34 } // namespace cc 35 } // namespace cc
OLDNEW
« no previous file with comments | « cc/raster/texture_compressor.h ('k') | cc/raster/texture_compressor_etc1_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698