From 68b8e3d50d0954eb5eeb7f625f06026c7fbd38c1 Mon Sep 17 00:00:00 2001 From: Matt Sarett Date: Fri, 28 Apr 2017 11:15:22 -0400 Subject: Revert "Revert "Delete copyTo(Allocator), hide copyTo() behind flag"" This reverts commit 0122af08f6af0dee490e1a4f35b552377d0d4753. Reason for revert: Fixed Android callsite Original change's description: > 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 > TBR=msarett@google.com,reviews@skia.org,reed@google.com Change-Id: I81659a820f79f1958fda23cb62513065b57db99d Reviewed-on: https://skia-review.googlesource.com/14640 Commit-Queue: Matt Sarett Reviewed-by: Matt Sarett --- tests/CodecAnimTest.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tests/CodecAnimTest.cpp') diff --git a/tests/CodecAnimTest.cpp b/tests/CodecAnimTest.cpp index 79e03bdef8..24b9c13ae9 100644 --- a/tests/CodecAnimTest.cpp +++ b/tests/CodecAnimTest.cpp @@ -14,6 +14,7 @@ #include "Resources.h" #include "Test.h" +#include "sk_tool_utils.h" #include #include @@ -239,7 +240,8 @@ DEF_TEST(Codec_frames, r) { // First copy the pixels from the cached frame const int requiredFrame = frameInfos[index].fRequiredFrame; if (requiredFrame != SkCodec::kNone) { - const bool success = cachedFrames[requiredFrame].copyTo(bm); + const bool success = sk_tool_utils::copy_to(bm, kN32_SkColorType, + cachedFrames[requiredFrame]); REPORTER_ASSERT(r, success); } } -- cgit v1.2.3