OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2012 Google Inc. | 2 * Copyright 2012 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 "SkBitmap.h" | 8 #include "SkBitmap.h" |
9 #include "SkBitmapCache.h" | 9 #include "SkBitmapCache.h" |
10 #include "SkCanvas.h" | 10 #include "SkCanvas.h" |
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
195 SkBitmap bm; | 195 SkBitmap bm; |
196 SkAutoPixmapUnlock apu; | 196 SkAutoPixmapUnlock apu; |
197 if (as_IB(this)->getROPixels(&bm) && bm.requestLock(&apu)) { | 197 if (as_IB(this)->getROPixels(&bm) && bm.requestLock(&apu)) { |
198 return effectiveSerializer->encode(apu.pixmap()); | 198 return effectiveSerializer->encode(apu.pixmap()); |
199 } | 199 } |
200 | 200 |
201 return nullptr; | 201 return nullptr; |
202 } | 202 } |
203 | 203 |
204 SkData* SkImage::refEncoded() const { | 204 SkData* SkImage::refEncoded() const { |
205 return as_IB(this)->onRefEncoded(); | 205 GrContext* ctx = nullptr; // should we allow the caller to pass in a ctx? |
| 206 return as_IB(this)->onRefEncoded(ctx); |
206 } | 207 } |
207 | 208 |
208 SkImage* SkImage::NewFromEncoded(SkData* encoded, const SkIRect* subset) { | 209 SkImage* SkImage::NewFromEncoded(SkData* encoded, const SkIRect* subset) { |
209 if (nullptr == encoded || 0 == encoded->size()) { | 210 if (nullptr == encoded || 0 == encoded->size()) { |
210 return nullptr; | 211 return nullptr; |
211 } | 212 } |
212 SkImageGenerator* generator = SkImageGenerator::NewFromEncoded(encoded); | 213 SkImageGenerator* generator = SkImageGenerator::NewFromEncoded(encoded); |
213 return generator ? SkImage::NewFromGenerator(generator, subset) : nullptr; | 214 return generator ? SkImage::NewFromGenerator(generator, subset) : nullptr; |
214 } | 215 } |
215 | 216 |
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
406 | 407 |
407 SkImage* SkImage::NewFromAdoptedTexture(GrContext*, const GrBackendTextureDesc&,
SkAlphaType) { | 408 SkImage* SkImage::NewFromAdoptedTexture(GrContext*, const GrBackendTextureDesc&,
SkAlphaType) { |
408 return nullptr; | 409 return nullptr; |
409 } | 410 } |
410 | 411 |
411 SkImage* SkImage::NewFromTextureCopy(GrContext*, const GrBackendTextureDesc&, Sk
AlphaType) { | 412 SkImage* SkImage::NewFromTextureCopy(GrContext*, const GrBackendTextureDesc&, Sk
AlphaType) { |
412 return nullptr; | 413 return nullptr; |
413 } | 414 } |
414 | 415 |
415 #endif | 416 #endif |
OLD | NEW |