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

Side by Side Diff: src/codec/SkCodecImageGenerator.cpp

Issue 2333713002: change SkStreams to work with sk_sp<SkData> instead of SkData* (Closed)
Patch Set: fix xpsdevice Created 4 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/codec/SkCodecImageGenerator.h ('k') | src/core/SkStream.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 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 "SkCodecImageGenerator.h" 8 #include "SkCodecImageGenerator.h"
9 9
10 SkImageGenerator* SkCodecImageGenerator::NewFromEncodedCodec(SkData* data) { 10 SkImageGenerator* SkCodecImageGenerator::NewFromEncodedCodec(sk_sp<SkData> data) {
11 SkCodec* codec = SkCodec::NewFromData(data); 11 SkCodec* codec = SkCodec::NewFromData(data);
12 if (nullptr == codec) { 12 if (nullptr == codec) {
13 return nullptr; 13 return nullptr;
14 } 14 }
15 15
16 return new SkCodecImageGenerator(codec, data); 16 return new SkCodecImageGenerator(codec, data);
17 } 17 }
18 18
19 static SkImageInfo make_premul(const SkImageInfo& info) { 19 static SkImageInfo make_premul(const SkImageInfo& info) {
20 if (kUnpremul_SkAlphaType == info.alphaType()) { 20 if (kUnpremul_SkAlphaType == info.alphaType()) {
21 return info.makeAlphaType(kPremul_SkAlphaType); 21 return info.makeAlphaType(kPremul_SkAlphaType);
22 } 22 }
23 23
24 return info; 24 return info;
25 } 25 }
26 26
27 SkCodecImageGenerator::SkCodecImageGenerator(SkCodec* codec, SkData* data) 27 SkCodecImageGenerator::SkCodecImageGenerator(SkCodec* codec, sk_sp<SkData> data)
28 : INHERITED(make_premul(codec->getInfo())) 28 : INHERITED(make_premul(codec->getInfo()))
29 , fCodec(codec) 29 , fCodec(codec)
30 , fData(SkRef(data)) 30 , fData(std::move(data))
31 {} 31 {}
32 32
33 SkData* SkCodecImageGenerator::onRefEncodedData(SK_REFENCODEDDATA_CTXPARAM) { 33 SkData* SkCodecImageGenerator::onRefEncodedData(SK_REFENCODEDDATA_CTXPARAM) {
34 return SkRef(fData.get()); 34 return SkRef(fData.get());
35 } 35 }
36 36
37 bool SkCodecImageGenerator::onGetPixels(const SkImageInfo& info, void* pixels, s ize_t rowBytes, 37 bool SkCodecImageGenerator::onGetPixels(const SkImageInfo& info, void* pixels, s ize_t rowBytes,
38 SkPMColor ctable[], int* ctableCount) { 38 SkPMColor ctable[], int* ctableCount) {
39 39
40 // FIXME (msarett): 40 // FIXME (msarett):
(...skipping 21 matching lines...) Expand all
62 SkCodec::Result result = fCodec->getYUV8Planes(sizeInfo, planes); 62 SkCodec::Result result = fCodec->getYUV8Planes(sizeInfo, planes);
63 63
64 switch (result) { 64 switch (result) {
65 case SkCodec::kSuccess: 65 case SkCodec::kSuccess:
66 case SkCodec::kIncompleteInput: 66 case SkCodec::kIncompleteInput:
67 return true; 67 return true;
68 default: 68 default:
69 return false; 69 return false;
70 } 70 }
71 } 71 }
OLDNEW
« no previous file with comments | « src/codec/SkCodecImageGenerator.h ('k') | src/core/SkStream.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698