diff options
author | Matt Sarett <msarett@google.com> | 2017-04-27 20:08:39 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-27 20:08:45 +0000 |
commit | 0122af08f6af0dee490e1a4f35b552377d0d4753 (patch) | |
tree | dc2a227b525f067fe8c837cc8d4c5c3480cb69de /gm/bitmapfilters.cpp | |
parent | 4b32ab1b7cac09f42b0867f6c63cd8656dd9918d (diff) |
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 <msarett@google.com>
> Reviewed-by: Mike Reed <reed@google.com>
>
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 <msarett@google.com>
Commit-Queue: Matt Sarett <msarett@google.com>
Diffstat (limited to 'gm/bitmapfilters.cpp')
-rw-r--r-- | gm/bitmapfilters.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gm/bitmapfilters.cpp b/gm/bitmapfilters.cpp index 7dc969286b..22e5d0943f 100644 --- a/gm/bitmapfilters.cpp +++ b/gm/bitmapfilters.cpp @@ -68,9 +68,9 @@ static SkScalar draw_row(SkCanvas* canvas, const SkBitmap& bm) { class FilterGM : public skiagm::GM { void onOnceBeforeDraw() override { make_bm(&fBM8); - sk_tool_utils::copy_to(&fBM4444, kARGB_4444_SkColorType, fBM8); - sk_tool_utils::copy_to(&fBM16, kRGB_565_SkColorType, fBM8); - sk_tool_utils::copy_to(&fBM32, kN32_SkColorType, fBM8); + fBM8.copyTo(&fBM4444, kARGB_4444_SkColorType); + fBM8.copyTo(&fBM16, kRGB_565_SkColorType); + fBM8.copyTo(&fBM32, kN32_SkColorType); } public: |