| 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 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 } | 127 } |
| 128 | 128 |
| 129 SkData* SkImage::encode(SkPixelSerializer* serializer) const { | 129 SkData* SkImage::encode(SkPixelSerializer* serializer) const { |
| 130 SkAutoTUnref<SkPixelSerializer> defaultSerializer; | 130 SkAutoTUnref<SkPixelSerializer> defaultSerializer; |
| 131 SkPixelSerializer* effectiveSerializer = serializer; | 131 SkPixelSerializer* effectiveSerializer = serializer; |
| 132 if (!effectiveSerializer) { | 132 if (!effectiveSerializer) { |
| 133 defaultSerializer.reset(SkImageEncoder::CreatePixelSerializer()); | 133 defaultSerializer.reset(SkImageEncoder::CreatePixelSerializer()); |
| 134 SkASSERT(defaultSerializer.get()); | 134 SkASSERT(defaultSerializer.get()); |
| 135 effectiveSerializer = defaultSerializer.get(); | 135 effectiveSerializer = defaultSerializer.get(); |
| 136 } | 136 } |
| 137 SkAutoTUnref<SkData> encoded(this->refEncoded()); | 137 sk_sp<SkData> encoded(this->refEncoded()); |
| 138 if (encoded && effectiveSerializer->useEncodedData(encoded->data(), encoded-
>size())) { | 138 if (encoded && effectiveSerializer->useEncodedData(encoded->data(), encoded-
>size())) { |
| 139 return encoded.release(); | 139 return encoded.release(); |
| 140 } | 140 } |
| 141 | 141 |
| 142 SkBitmap bm; | 142 SkBitmap bm; |
| 143 SkAutoPixmapUnlock apu; | 143 SkAutoPixmapUnlock apu; |
| 144 if (as_IB(this)->getROPixels(&bm) && bm.requestLock(&apu)) { | 144 if (as_IB(this)->getROPixels(&bm) && bm.requestLock(&apu)) { |
| 145 return effectiveSerializer->encode(apu.pixmap()); | 145 return effectiveSerializer->encode(apu.pixmap()); |
| 146 } | 146 } |
| 147 | 147 |
| (...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 494 SkImage* SkImage::NewFromDeferredTextureImageData(GrContext* ctx, const void* da
ta, | 494 SkImage* SkImage::NewFromDeferredTextureImageData(GrContext* ctx, const void* da
ta, |
| 495 SkBudgeted budgeted) { | 495 SkBudgeted budgeted) { |
| 496 return MakeFromDeferredTextureImageData(ctx, data, budgeted).release(); | 496 return MakeFromDeferredTextureImageData(ctx, data, budgeted).release(); |
| 497 } | 497 } |
| 498 #endif | 498 #endif |
| 499 | 499 |
| 500 sk_sp<SkImage> MakeTextureFromMipMap(GrContext*, const SkImageInfo&, const GrMip
Level* texels, | 500 sk_sp<SkImage> MakeTextureFromMipMap(GrContext*, const SkImageInfo&, const GrMip
Level* texels, |
| 501 int mipLevelCount, SkBudgeted) { | 501 int mipLevelCount, SkBudgeted) { |
| 502 return nullptr; | 502 return nullptr; |
| 503 } | 503 } |
| OLD | NEW |