From 0122af08f6af0dee490e1a4f35b552377d0d4753 Mon Sep 17 00:00:00 2001 From: Matt Sarett Date: Thu, 27 Apr 2017 20:08:39 +0000 Subject: Revert "Delete copyTo(Allocator), hide copyTo() behind flag" This reverts commit d4a338f4d0a0cdc08d7d3668931c60997f0fa971. Reason for revert: Looks like I missed something I was supposed to delete in Android. Original change's description: > Delete copyTo(Allocator), hide copyTo() behind flag > > Replace uses of copyTo() in Skia. > > Bug: skia:6464 > Change-Id: I921dc53a1c29a5176d18f05741f7c0b5a008e548 > Reviewed-on: https://skia-review.googlesource.com/14502 > Commit-Queue: Matt Sarett > Reviewed-by: Mike Reed > TBR=msarett@google.com,reed@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: I4d252940cc6a2462b030007055ea6c229471fc6e Reviewed-on: https://skia-review.googlesource.com/14602 Reviewed-by: Matt Sarett Commit-Queue: Matt Sarett --- gm/showmiplevels.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'gm/showmiplevels.cpp') diff --git a/gm/showmiplevels.cpp b/gm/showmiplevels.cpp index 3e2091fd6b..e5374e4044 100644 --- a/gm/showmiplevels.cpp +++ b/gm/showmiplevels.cpp @@ -120,7 +120,7 @@ protected: static void DrawAndFrame(SkCanvas* canvas, const SkBitmap& orig, SkScalar x, SkScalar y) { SkBitmap bm; - sk_tool_utils::copy_to(&bm, orig.colorType(), orig); + orig.copyTo(&bm); apply_gamma(bm); canvas->drawBitmap(bm, x, y, nullptr); @@ -218,14 +218,7 @@ void copy_to(SkBitmap* dst, SkColorType dstColorType, const SkBitmap& src) { return sk_tool_utils::copy_to_g8(dst, src); } - const SkBitmap* srcPtr = &src; - SkBitmap tmp(src); - if (kRGB_565_SkColorType == dstColorType) { - tmp.setAlphaType(kOpaque_SkAlphaType); - srcPtr = &tmp; - } - - sk_tool_utils::copy_to(dst, dstColorType, *srcPtr); + src.copyTo(dst, dstColorType); } /** -- cgit v1.2.3