diff options
| author |  djsollen <djsollen@google.com> | 2016-03-29 19:07:07 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-29 19:07:07 -0700 |
| commit | 890579051d4096a8f769eadb9cde3f931d7abd7c (patch) | |
| tree | 3c683bc8f4fc81d6b48fbf763c50540c39a64098 /gm/localmatriximagefilter.cpp | |
| parent | 308d988cba909ffbb456d4f327820a57df0d1d51 (diff) | |
Revert of Switch SkLocalMatrixImageFilter and SkPaintImageFilter over to sk_sp (patchset #6 id:100001 of https://codereview.chromium.org/1842793002/ )
Reason for revert:
This CL is causing the autoroll into Chromium & google3 to fail.
Original issue's description:
> Switch SkLocalMatrixImageFilter and SkPaintImageFilter over to sk_sp
>
> TBR=reed@google.com
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1842793002
>
> Committed: https://skia.googlesource.com/skia/+/a33cf07a2273315363c0b6fb5d3ce811742f5a85
TBR=fmalita@chromium.org,reed@google.com,robertphillips@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1837293003
Diffstat (limited to 'gm/localmatriximagefilter.cpp')
| -rw-r--r-- | gm/localmatriximagefilter.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gm/localmatriximagefilter.cpp b/gm/localmatriximagefilter.cpp index 5414fe341c..d53380b858 100644 --- a/gm/localmatriximagefilter.cpp +++ b/gm/localmatriximagefilter.cpp @@ -49,7 +49,7 @@ protected: return SkISize::Make(640, 640); } - static void show_image(SkCanvas* canvas, SkImage* image, sk_sp<SkImageFilter> filter) { + static void show_image(SkCanvas* canvas, SkImage* image, SkImageFilter* filter) { SkPaint paint; paint.setStyle(SkPaint::kStroke_Style); SkRect r = SkRect::MakeIWH(image->width(), image->height()).makeOutset(SK_ScalarHalf, @@ -81,14 +81,14 @@ protected: canvas->translate(40, 40); for (auto&& factory : factories) { - sk_sp<SkImageFilter> filter(factory()); + SkAutoTUnref<SkImageFilter> filter(factory()); canvas->save(); show_image(canvas, image0.get(), filter); for (const auto& matrix : matrices) { - sk_sp<SkImageFilter> localFilter(filter->makeWithLocalMatrix(matrix)); + SkAutoTUnref<SkImageFilter> localFilter(filter->newWithLocalMatrix(matrix)); canvas->translate(spacer, 0); - show_image(canvas, image0.get(), std::move(localFilter)); + show_image(canvas, image0.get(), localFilter); } canvas->restore(); canvas->translate(0, spacer); |