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

Side by Side Diff: src/image/SkImage.cpp

Issue 2187613002: Deserialize pictures with custom image-deserializer (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: move nullptr_t alias behind guard Created 4 years, 4 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 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
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::makeFromData(SkData* data, const SkIRect* su bset) {
508 return SkImage::MakeFromEncoded(sk_ref_sp(data), subset);
509 }
510 sk_sp<SkImage> SkImageDeserializer::makeFromMemory(const void* data, size_t leng th,
511 const SkIRect* subset) {
512 return SkImage::MakeFromEncoded(SkData::MakeWithCopy(data, length), subset);
513 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698