From d4a338f4d0a0cdc08d7d3668931c60997f0fa971 Mon Sep 17 00:00:00 2001
From: Matt Sarett <msarett@google.com>
Date: Thu, 27 Apr 2017 12:45:45 -0400
Subject: 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 <msarett@google.com>
Reviewed-by: Mike Reed <reed@google.com>
---
 gm/animatedGif.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'gm/animatedGif.cpp')

diff --git a/gm/animatedGif.cpp b/gm/animatedGif.cpp
index c7871e0d12..dd08abfd36 100644
--- a/gm/animatedGif.cpp
+++ b/gm/animatedGif.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "gm.h"
+#include "sk_tool_utils.h"
 #include "SkAnimTimer.h"
 #include "SkCanvas.h"
 #include "SkCodec.h"
@@ -59,7 +60,8 @@ private:
                          && static_cast<size_t>(requiredFrame) < fFrames.size());
                 SkBitmap& requiredBitmap = fFrames[requiredFrame];
                 // For simplicity, do not try to cache old frames
-                if (requiredBitmap.getPixels() && requiredBitmap.copyTo(&bm)) {
+                if (requiredBitmap.getPixels() &&
+                        sk_tool_utils::copy_to(&bm, requiredBitmap.colorType(), requiredBitmap)) {
                     opts.fHasPriorFrame = true;
                 }
             }
-- 
cgit v1.2.3