From 236640872fa8cad105273055fdcf6829d5c025a1 Mon Sep 17 00:00:00 2001 From: bsalomon Date: Wed, 9 Mar 2016 14:50:15 -0800 Subject: TBR=robertphillips@google.com Revert "Add SkImage::NewTextureFromPixmap" This reverts commit 045afea97902936869d71389e656a9c6917fa32f. Revert "Fix Mac bots because of failing readback of 565" This reverts commit e344b26a7d3c0efaab21bb17fa5b2d96dfc92edf. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1777863003 Review URL: https://codereview.chromium.org/1777863003 --- src/image/SkImage.cpp | 4 ---- src/image/SkImage_Gpu.cpp | 13 ------------- 2 files changed, 17 deletions(-) (limited to 'src/image') diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp index a41ac83d19..1c1c5f965c 100644 --- a/src/image/SkImage.cpp +++ b/src/image/SkImage.cpp @@ -348,10 +348,6 @@ bool SkImage::isLazyGenerated() const { #if !SK_SUPPORT_GPU -SkImage* SkImage::NewTextureFromPixmap(GrContext*, const SkPixmap&, SkBudgeted budgeted) { - return nullptr; -} - SkImage* SkImage::NewFromTexture(GrContext*, const GrBackendTextureDesc&, SkAlphaType, TextureReleaseProc, ReleaseContext) { return nullptr; diff --git a/src/image/SkImage_Gpu.cpp b/src/image/SkImage_Gpu.cpp index b87e50ba0a..57ee33957b 100644 --- a/src/image/SkImage_Gpu.cpp +++ b/src/image/SkImage_Gpu.cpp @@ -310,19 +310,6 @@ SkImage* SkImage::newTextureImage(GrContext *context) const { return create_image_from_maker(&maker, at, this->uniqueID()); } -SkImage* SkImage::NewTextureFromPixmap(GrContext* ctx, const SkPixmap& pixmap, - SkBudgeted budgeted) { - if (!ctx) { - return nullptr; - } - SkAutoTUnref texture(GrUploadPixmapToTexture(ctx, pixmap)); - if (!texture) { - return nullptr; - } - return new SkImage_Gpu(texture->width(), texture->height(), kNeedNewImageUniqueID, - pixmap.alphaType(), texture, budgeted); -} - /////////////////////////////////////////////////////////////////////////////////////////////////// GrTexture* GrDeepCopyTexture(GrTexture* src, SkBudgeted budgeted) { -- cgit v1.2.3