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

Side by Side Diff: src/ports/SkImageGenerator_skia.cpp

Issue 1316123003: Style Change: SkNEW->new; SkDELETE->delete (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-26 (Wednesday) 15:59:00 EDT Created 5 years, 3 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 | « src/ports/SkImageDecoder_empty.cpp ('k') | src/ports/SkOSFile_posix.cpp » ('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 The Android Open Source Project 2 * Copyright 2015 The Android Open Source Project
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 "SkData.h" 8 #include "SkData.h"
9 #include "SkImageDecoder.h" 9 #include "SkImageDecoder.h"
10 #include "SkImageGenerator.h" 10 #include "SkImageGenerator.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 : INHERITED(info), fInfo(info), fDecoder(decoder), fData(SkRef(data)) 42 : INHERITED(info), fInfo(info), fDecoder(decoder), fData(SkRef(data))
43 {} 43 {}
44 44
45 protected: 45 protected:
46 SkData* onRefEncodedData() override { 46 SkData* onRefEncodedData() override {
47 return SkRef(fData.get()); 47 return SkRef(fData.get());
48 } 48 }
49 bool onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, 49 bool onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes,
50 SkPMColor ctableEntries[], int* ctableCount) override { 50 SkPMColor ctableEntries[], int* ctableCount) override {
51 SkMemoryStream stream(fData->data(), fData->size(), false); 51 SkMemoryStream stream(fData->data(), fData->size(), false);
52 SkAutoTUnref<BareMemoryAllocator> allocator(SkNEW_ARGS(BareMemoryAllocat or, 52 SkAutoTUnref<BareMemoryAllocator> allocator(
53 (info, pixels, ro wBytes))); 53 new BareMemoryAllocator(info, pixels, rowBytes));
54 fDecoder->setAllocator(allocator); 54 fDecoder->setAllocator(allocator);
55 fDecoder->setRequireUnpremultipliedColors(kUnpremul_SkAlphaType == info. alphaType()); 55 fDecoder->setRequireUnpremultipliedColors(kUnpremul_SkAlphaType == info. alphaType());
56 56
57 SkBitmap bm; 57 SkBitmap bm;
58 const SkImageDecoder::Result result = fDecoder->decode(&stream, &bm, inf o.colorType(), 58 const SkImageDecoder::Result result = fDecoder->decode(&stream, &bm, inf o.colorType(),
59 SkImageDecoder::k DecodePixels_Mode); 59 SkImageDecoder::k DecodePixels_Mode);
60 if (SkImageDecoder::kFailure == result) { 60 if (SkImageDecoder::kFailure == result) {
61 return false; 61 return false;
62 } 62 }
63 63
(...skipping 26 matching lines...) Expand all
90 SkImageGenerator* SkImageGenerator::NewFromEncodedImpl(SkData* data) { 90 SkImageGenerator* SkImageGenerator::NewFromEncodedImpl(SkData* data) {
91 SkMemoryStream stream(data->data(), data->size(), false); 91 SkMemoryStream stream(data->data(), data->size(), false);
92 SkImageDecoder* decoder = SkImageDecoder::Factory(&stream); 92 SkImageDecoder* decoder = SkImageDecoder::Factory(&stream);
93 if (NULL == decoder) { 93 if (NULL == decoder) {
94 return NULL; 94 return NULL;
95 } 95 }
96 96
97 SkBitmap bm; 97 SkBitmap bm;
98 stream.rewind(); 98 stream.rewind();
99 if (!decoder->decode(&stream, &bm, kUnknown_SkColorType, SkImageDecoder::kDe codeBounds_Mode)) { 99 if (!decoder->decode(&stream, &bm, kUnknown_SkColorType, SkImageDecoder::kDe codeBounds_Mode)) {
100 SkDELETE(decoder); 100 delete decoder;
101 return NULL; 101 return NULL;
102 } 102 }
103 103
104 return SkNEW_ARGS(SkImageDecoderGenerator, (bm.info(), decoder, data)); 104 return new SkImageDecoderGenerator(bm.info(), decoder, data);
105 } 105 }
OLDNEW
« no previous file with comments | « src/ports/SkImageDecoder_empty.cpp ('k') | src/ports/SkOSFile_posix.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698