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

Side by Side Diff: src/android/SkBitmapRegionDecoder.cpp

Issue 1446413002: Revert of skstd -> std for unique_ptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 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 | « include/private/SkUniquePtr.h ('k') | src/core/SkSharedMutex.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2015 Google Inc. 2 * Copyright 2015 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkBitmapRegionCanvas.h" 8 #include "SkBitmapRegionCanvas.h"
9 #include "SkBitmapRegionCodec.h" 9 #include "SkBitmapRegionCodec.h"
10 #include "SkBitmapRegionDecoder.h" 10 #include "SkBitmapRegionDecoder.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 break; 42 break;
43 default: 43 default:
44 SkCodecPrintf("Error: Scanline ordering not supported.\n"); 44 SkCodecPrintf("Error: Scanline ordering not supported.\n");
45 return nullptr; 45 return nullptr;
46 } 46 }
47 return new SkBitmapRegionCanvas(codec.detach()); 47 return new SkBitmapRegionCanvas(codec.detach());
48 } 48 }
49 case kAndroidCodec_Strategy: { 49 case kAndroidCodec_Strategy: {
50 SkAutoTDelete<SkAndroidCodec> codec = 50 SkAutoTDelete<SkAndroidCodec> codec =
51 SkAndroidCodec::NewFromStream(streamDeleter.detach()); 51 SkAndroidCodec::NewFromStream(streamDeleter.detach());
52 if (!codec) { 52 if (NULL == codec) {
53 SkCodecPrintf("Error: Failed to create codec.\n"); 53 SkCodecPrintf("Error: Failed to create codec.\n");
54 return nullptr; 54 return NULL;
55 } 55 }
56 return new SkBitmapRegionCodec(codec.detach()); 56 return new SkBitmapRegionCodec(codec.detach());
57 } 57 }
58 default: 58 default:
59 SkASSERT(false); 59 SkASSERT(false);
60 return nullptr; 60 return nullptr;
61 } 61 }
62 } 62 }
OLDNEW
« no previous file with comments | « include/private/SkUniquePtr.h ('k') | src/core/SkSharedMutex.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698