diff options
| author |  reed <reed@google.com> | 2016-03-22 07:35:17 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-22 07:35:17 -0700 |
| commit | 1eb81db650d31f50be67b12d60c4f9e7dd08432f (patch) | |
| tree | 58a5fd565f06a398192be170009fefa2a12a1ee2 /src/pdf/SkPDFDevice.cpp | |
| parent | ee451cf09de31267c93b64e1fdac7c823cee7e85 (diff) | |
Revert of switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.org/1822623002/ )
Reason for revert:
need to fix unguarded makeWithFilter
Original issue's description:
> switch colorfilters to sk_sp
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1822623002
>
> Committed: https://skia.googlesource.com/skia/+/f809d7687a4fb7b88b651b046da2bc0035d6aa09
TBR=fmalita@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1820303002
Diffstat (limited to 'src/pdf/SkPDFDevice.cpp')
| -rw-r--r-- | src/pdf/SkPDFDevice.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp index 66048ff751..514cd88408 100644 --- a/src/pdf/SkPDFDevice.cpp +++ b/src/pdf/SkPDFDevice.cpp @@ -2114,7 +2114,8 @@ static SkSize rect_to_size(const SkRect& r) { return SkSize::Make(r.width(), r.height()); } -static const SkImage* color_filter(const SkImage* image, SkColorFilter* colorFilter) { +static const SkImage* color_filter(const SkImage* image, + SkColorFilter* colorFilter) { sk_sp<SkSurface> surface(SkSurface::NewRaster( SkImageInfo::MakeN32Premul(image->dimensions()))); if (!surface) { @@ -2123,7 +2124,7 @@ static const SkImage* color_filter(const SkImage* image, SkColorFilter* colorFil SkCanvas* canvas = surface->getCanvas(); canvas->clear(SK_ColorTRANSPARENT); SkPaint paint; - paint.setColorFilter(sk_ref_sp(colorFilter)); + paint.setColorFilter(colorFilter); canvas->drawImage(image, 0, 0, &paint); canvas->flush(); return surface->makeImageSnapshot().release(); |