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 SkData* SkImage::encode(SkPixelSerializer* serializer) const { | 127 SkData* SkImage::encode(SkPixelSerializer* serializer) const { |
128 SkAutoTUnref<SkPixelSerializer> defaultSerializer; | 128 SkAutoTUnref<SkPixelSerializer> defaultSerializer; |
129 SkPixelSerializer* effectiveSerializer = serializer; | 129 SkPixelSerializer* effectiveSerializer = serializer; |
130 if (!effectiveSerializer) { | 130 if (!effectiveSerializer) { |
131 defaultSerializer.reset(SkImageEncoder::CreatePixelSerializer()); | 131 defaultSerializer.reset(SkImageEncoder::CreatePixelSerializer()); |
132 SkASSERT(defaultSerializer.get()); | 132 SkASSERT(defaultSerializer.get()); |
133 effectiveSerializer = defaultSerializer.get(); | 133 effectiveSerializer = defaultSerializer.get(); |
134 } | 134 } |
135 SkAutoTUnref<SkData> encoded(this->refEncoded()); | 135 SkAutoTUnref<SkData> encoded(this->refEncoded()); |
136 if (encoded && effectiveSerializer->useEncodedData(encoded->data(), encoded-
>size())) { | 136 if (encoded && effectiveSerializer->useEncodedData(encoded->data(), encoded-
>size())) { |
137 return encoded.detach(); | 137 return encoded.release(); |
138 } | 138 } |
139 | 139 |
140 SkBitmap bm; | 140 SkBitmap bm; |
141 SkAutoPixmapUnlock apu; | 141 SkAutoPixmapUnlock apu; |
142 if (as_IB(this)->getROPixels(&bm) && bm.requestLock(&apu)) { | 142 if (as_IB(this)->getROPixels(&bm) && bm.requestLock(&apu)) { |
143 return effectiveSerializer->encode(apu.pixmap()); | 143 return effectiveSerializer->encode(apu.pixmap()); |
144 } | 144 } |
145 | 145 |
146 return nullptr; | 146 return nullptr; |
147 } | 147 } |
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
451 | 451 |
452 SkImage* SkImage::NewTextureFromPixmap(GrContext* ctx, const SkPixmap& pmap, SkB
udgeted budgeted) { | 452 SkImage* SkImage::NewTextureFromPixmap(GrContext* ctx, const SkPixmap& pmap, SkB
udgeted budgeted) { |
453 return MakeTextureFromPixmap(ctx, pmap, budgeted).release(); | 453 return MakeTextureFromPixmap(ctx, pmap, budgeted).release(); |
454 } | 454 } |
455 | 455 |
456 SkImage* SkImage::NewFromDeferredTextureImageData(GrContext* ctx, const void* da
ta, | 456 SkImage* SkImage::NewFromDeferredTextureImageData(GrContext* ctx, const void* da
ta, |
457 SkBudgeted budgeted) { | 457 SkBudgeted budgeted) { |
458 return MakeFromDeferredTextureImageData(ctx, data, budgeted).release(); | 458 return MakeFromDeferredTextureImageData(ctx, data, budgeted).release(); |
459 } | 459 } |
460 #endif | 460 #endif |
OLD | NEW |