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

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

Issue 1862133002: Add whitelist parameter to refEncodedData (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Make test pass regardless of CTX build flag 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
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(SkData* data) {
(...skipping 21 matching lines...) Expand all
32 return SkImageInfo::Make(info.width(), info.height(), info.colorType(), alph aType, profileType); 32 return SkImageInfo::Make(info.width(), info.height(), info.colorType(), alph aType, profileType);
33 } 33 }
34 34
35 SkCodecImageGenerator::SkCodecImageGenerator(SkCodec* codec, SkData* data) 35 SkCodecImageGenerator::SkCodecImageGenerator(SkCodec* codec, SkData* data)
36 : INHERITED(fix_info(*codec)) 36 : INHERITED(fix_info(*codec))
37 , fCodec(codec) 37 , fCodec(codec)
38 , fData(SkRef(data)) 38 , fData(SkRef(data))
39 {} 39 {}
40 40
41 SkData* SkCodecImageGenerator::onRefEncodedData(SK_REFENCODEDDATA_CTXPARAM) { 41 SkData* SkCodecImageGenerator::onRefEncodedData(SK_REFENCODEDDATA_CTXPARAM) {
42 #ifndef SK_SUPPORT_LEGACY_REFENCODEDDATA_NOCTX
43 if (query) {
44 if (!query->supportedFormat(fCodec->getEncodedFormat()) ||
45 !query->supportedFormatFromData(fData->data(), fData->size()))
46 {
47 return nullptr;
48 }
49 }
50 #endif
42 return SkRef(fData.get()); 51 return SkRef(fData.get());
43 } 52 }
44 53
45 bool SkCodecImageGenerator::onGetPixels(const SkImageInfo& info, void* pixels, s ize_t rowBytes, 54 bool SkCodecImageGenerator::onGetPixels(const SkImageInfo& info, void* pixels, s ize_t rowBytes,
46 SkPMColor ctable[], int* ctableCount) { 55 SkPMColor ctable[], int* ctableCount) {
47 56
48 SkCodec::Result result = fCodec->getPixels(info, pixels, rowBytes, nullptr, ctable, 57 SkCodec::Result result = fCodec->getPixels(info, pixels, rowBytes, nullptr, ctable,
49 ctableCount); 58 ctableCount);
50 switch (result) { 59 switch (result) {
51 case SkCodec::kSuccess: 60 case SkCodec::kSuccess:
(...skipping 13 matching lines...) Expand all
65 SkCodec::Result result = fCodec->getYUV8Planes(sizeInfo, planes); 74 SkCodec::Result result = fCodec->getYUV8Planes(sizeInfo, planes);
66 75
67 switch (result) { 76 switch (result) {
68 case SkCodec::kSuccess: 77 case SkCodec::kSuccess:
69 case SkCodec::kIncompleteInput: 78 case SkCodec::kIncompleteInput:
70 return true; 79 return true;
71 default: 80 default:
72 return false; 81 return false;
73 } 82 }
74 } 83 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698