diff options
author | reed <reed@chromium.org> | 2015-12-20 20:08:42 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-12-20 20:08:43 -0800 |
commit | 2d6ba6690f8951e152d8e793191b14afd52f5506 (patch) | |
tree | ff71833d1327c08c9e31451d2a18286fc95f7bb0 /gm | |
parent | d63f60a36327e9580861205ebb35cade8c49bd34 (diff) |
Revert of change all factories to return their base-class (patchset #1 id:1 of https://codereview.chromium.org/1535353002/ )
Reason for revert:
need to update some chrome/blink call-sites
Original issue's description:
> change all factories to return their base-class
>
> will watch DEPS roll to see if there are chrome sites needing updates
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1535353002
>
> TBR=
>
> Committed: https://skia.googlesource.com/skia/+/d63f60a36327e9580861205ebb35cade8c49bd34
TBR=
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1540203002
Diffstat (limited to 'gm')
-rw-r--r-- | gm/circles.cpp | 2 | ||||
-rw-r--r-- | gm/imagefiltersgraph.cpp | 4 | ||||
-rw-r--r-- | gm/rects.cpp | 2 | ||||
-rw-r--r-- | gm/shadows.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/gm/circles.cpp b/gm/circles.cpp index 369548cc59..a178ba9b8e 100644 --- a/gm/circles.cpp +++ b/gm/circles.cpp @@ -81,7 +81,7 @@ protected: // AA with blur SkPaint p; p.setAntiAlias(true); - SkDrawLooper* shadowLooper = + SkBlurDrawLooper* shadowLooper = SkBlurDrawLooper::Create(SK_ColorBLUE, SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(10)), SkIntToScalar(5), SkIntToScalar(10), diff --git a/gm/imagefiltersgraph.cpp b/gm/imagefiltersgraph.cpp index 14752dbab5..e27a523cbc 100644 --- a/gm/imagefiltersgraph.cpp +++ b/gm/imagefiltersgraph.cpp @@ -153,13 +153,13 @@ protected: 0, SK_Scalar1, 0, 0, 0, 0, 0, SK_Scalar1, 0, 0, 0, 0, 0, 0.5f, 0 }; - SkAutoTUnref<SkColorFilter> matrixCF(SkColorMatrixFilter::Create(matrix)); + SkAutoTUnref<SkColorMatrixFilter> matrixCF(SkColorMatrixFilter::Create(matrix)); SkAutoTUnref<SkImageFilter> matrixFilter(SkColorFilterImageFilter::Create(matrixCF)); SkAutoTUnref<SkImageFilter> offsetFilter( SimpleOffsetFilter::Create(10.0f, 10.f, matrixFilter)); SkAutoTUnref<SkXfermode> arith(SkArithmeticMode::Create(0, SK_Scalar1, SK_Scalar1, 0)); - SkAutoTUnref<SkImageFilter> arithFilter( + SkAutoTUnref<SkXfermodeImageFilter> arithFilter( SkXfermodeImageFilter::Create(arith, matrixFilter, offsetFilter)); SkPaint paint; diff --git a/gm/rects.cpp b/gm/rects.cpp index 38108fed22..c4d5880e14 100644 --- a/gm/rects.cpp +++ b/gm/rects.cpp @@ -95,7 +95,7 @@ protected: SkPaint p; p.setColor(SK_ColorWHITE); p.setAntiAlias(true); - SkDrawLooper* shadowLooper = + SkBlurDrawLooper* shadowLooper = SkBlurDrawLooper::Create(SK_ColorWHITE, SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(10)), SkIntToScalar(5), SkIntToScalar(10), diff --git a/gm/shadows.cpp b/gm/shadows.cpp index bb2bf3c5bd..f4034a4e5c 100644 --- a/gm/shadows.cpp +++ b/gm/shadows.cpp @@ -54,7 +54,7 @@ protected: } void onDraw(SkCanvas* canvas) override { - SkDrawLooper* shadowLoopers[5]; + SkBlurDrawLooper* shadowLoopers[5]; shadowLoopers[0] = SkBlurDrawLooper::Create(SK_ColorBLUE, SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(10)), |