diff options
| author |  reed <reed@chromium.org> | 2015-12-21 08:52:45 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-12-21 08:52:45 -0800 |
| commit | 5e1ddb108638d1d51a3940fcae1dd23adc5ac53b (patch) | |
| tree | 8ab43398fb5dcca83c9ef546ac9107658088143b /samplecode | |
| parent | fb56218292d6c7b509d382f39994c3783b2483a0 (diff) | |
Reland of change all factories to return their base-class (patchset #1 id:1 of https://codereview.chromium.org/1540203002/ )
Reason for revert:
chrome changes have landed
Original issue's description:
> 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:
>
> Committed: https://skia.googlesource.com/skia/+/2d6ba6690f8951e152d8e793191b14afd52f5506
TBR=
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1533373002
Diffstat (limited to 'samplecode')
| -rw-r--r-- | samplecode/SampleAll.cpp | 2 | ||||
| -rw-r--r-- | samplecode/SampleTiling.cpp | 4 | ||||
| -rw-r--r-- | samplecode/SampleUnpremul.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp index b5a0fe568d..21d93bd8ae 100644 --- a/samplecode/SampleAll.cpp +++ b/samplecode/SampleAll.cpp @@ -382,7 +382,7 @@ protected: light.fAmbient = 0x48; light.fSpecular = 0x80; SkScalar sigma = SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(12)/5); - SkEmbossMaskFilter* embossFilter = SkEmbossMaskFilter::Create(sigma, light); + SkMaskFilter* embossFilter = SkEmbossMaskFilter::Create(sigma, light); SkXfermode* xfermode = SkXfermode::Create(SkXfermode::kXor_Mode); SkColorFilter* lightingFilter = SkColorFilter::CreateLightingFilter( diff --git a/samplecode/SampleTiling.cpp b/samplecode/SampleTiling.cpp index ba79e5a0ba..ed244eb3d2 100644 --- a/samplecode/SampleTiling.cpp +++ b/samplecode/SampleTiling.cpp @@ -55,8 +55,8 @@ static const int gWidth = 32; static const int gHeight = 32; class TilingView : public SampleView { - SkAutoTUnref<SkPicture> fTextPicture; - SkAutoTUnref<SkBlurDrawLooper> fLooper; + SkAutoTUnref<SkPicture> fTextPicture; + SkAutoTUnref<SkDrawLooper> fLooper; public: TilingView() : fLooper(SkBlurDrawLooper::Create(0x88000000, diff --git a/samplecode/SampleUnpremul.cpp b/samplecode/SampleUnpremul.cpp index 6d5cf6cccc..4e3e1fae97 100644 --- a/samplecode/SampleUnpremul.cpp +++ b/samplecode/SampleUnpremul.cpp @@ -83,7 +83,7 @@ protected: SkPaint paint; paint.setAntiAlias(true); paint.setTextSize(SkIntToScalar(24)); - SkAutoTUnref<SkBlurDrawLooper> looper( + SkAutoTUnref<SkDrawLooper> looper( SkBlurDrawLooper::Create(SK_ColorBLUE, SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(2)), 0, 0)); |