commit d4a338f4d0a0cdc08d7d3668931c60997f0fa971
author Matt Sarett <msarett@google.com> Thu Apr 27 12:45:45 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Apr 27 17:18:03 2017 +0000
tree 676fe5dcd3d19c14c5bf091243cadea35ebef205
parent 9fa99614ec4e695f6e7e9fe19508758757543b8c

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>

tools/skdiff/skdiff_utils.cpp

diff --git a/tools/skdiff/skdiff_utils.cpp b/tools/skdiff/skdiff_utils.cpp
index 05e1c50..7a1b7e8 100644
--- a/tools/skdiff/skdiff_utils.cpp
+++ b/tools/skdiff/skdiff_utils.cpp
@@ -80,7 +80,7 @@
 
 bool write_bitmap(const SkString& path, const SkBitmap& bitmap) {
     SkBitmap copy;
-    bitmap.copyTo(&copy, kN32_SkColorType);
+    sk_tool_utils::copy_to(&copy, kN32_SkColorType, bitmap);
     force_all_opaque(copy);
     return sk_tool_utils::EncodeImageToFile(path.c_str(), copy,
                                       SkEncodedImageFormat::kPNG, 100);