| 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 482 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 493 SkImage* SkImage::NewFromDeferredTextureImageData(GrContext* ctx, const void* da
ta, | 493 SkImage* SkImage::NewFromDeferredTextureImageData(GrContext* ctx, const void* da
ta, |
| 494 SkBudgeted budgeted) { | 494 SkBudgeted budgeted) { |
| 495 return MakeFromDeferredTextureImageData(ctx, data, budgeted).release(); | 495 return MakeFromDeferredTextureImageData(ctx, data, budgeted).release(); |
| 496 } | 496 } |
| 497 #endif | 497 #endif |
| 498 | 498 |
| 499 sk_sp<SkImage> MakeTextureFromMipMap(GrContext*, const SkImageInfo&, const GrMip
Level* texels, | 499 sk_sp<SkImage> MakeTextureFromMipMap(GrContext*, const SkImageInfo&, const GrMip
Level* texels, |
| 500 int mipLevelCount, SkBudgeted) { | 500 int mipLevelCount, SkBudgeted) { |
| 501 return nullptr; | 501 return nullptr; |
| 502 } | 502 } |
| 503 |
| 504 ////////////////////////////////////////////////////////////////////////////////
/////////////////// |
| 505 #include "SkImageDeserializer.h" |
| 506 |
| 507 sk_sp<SkImage> SkImageDeserializer::deserialize(sk_sp<SkData> data, const SkIRec
t* subset) { |
| 508 return SkImage::MakeFromEncoded(data, subset); |
| 509 } |
| OLD | NEW |