diff options
| author |  reed <reed@google.com> | 2016-02-22 05:54:53 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-02-22 05:54:53 -0800 |
| commit | 75a73297cb44c65a9efcf5f212854cb457140e34 (patch) | |
| tree | d8618dd1eba948fab6cf77146f4c697ec44b6ca7 /samplecode | |
| parent | 03762fea75b0fe34ac0375407b83b6ae52e453b4 (diff) | |
Reland of ix misc asserts and checks found by fuzzer (patchset #1 id:1 of https://codereview.chromium.org/1713413002/ )
Reason for revert:
deps instability seemingly fixed. trying again.
Original issue's description:
> Revert of fix misc asserts and checks found by fuzzer (patchset #1 id:1 of https://codereview.chromium.org/1713383002/ )
>
> Reason for revert:
> speculative deps-roll fix
>
> Original issue's description:
> > fix misc asserts and checks found by fuzzer
> >
> > BUG=skia:
> > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1713383002
> >
> > TBR=robertphilips
> >
> > Committed: https://skia.googlesource.com/skia/+/00bea4ad310c4ec4dd95809b47ce3fbfa8fd0e1e
>
> TBR=robertphillips@google.com
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/d98ef6377269e3596423225ab922301ed40529a0
TBR=robertphillips@google.com
# 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/1723473002
Diffstat (limited to 'samplecode')
| -rw-r--r-- | samplecode/SampleFilterFuzz.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/samplecode/SampleFilterFuzz.cpp b/samplecode/SampleFilterFuzz.cpp index f8ceed452c..45b43df953 100644 --- a/samplecode/SampleFilterFuzz.cpp +++ b/samplecode/SampleFilterFuzz.cpp @@ -204,7 +204,7 @@ static SkTypeface::Style make_typeface_style() { } static SkPath1DPathEffect::Style make_path_1d_path_effect_style() { - return static_cast<SkPath1DPathEffect::Style>(R(SkPath1DPathEffect::kStyleCount)); + return static_cast<SkPath1DPathEffect::Style>(R((int)SkPath1DPathEffect::kMorph_Style + 1)); } static SkColor make_color() { @@ -529,7 +529,9 @@ static SkPaint make_paint() { paint.setMaskFilter(make_mask_filter()); SkAutoTUnref<SkTypeface> typeface( SkTypeface::CreateFromName(make_font_name().c_str(), make_typeface_style())); +#if 0 paint.setTypeface(typeface); +#endif SkLayerRasterizer::Builder rasterizerBuilder; SkPaint paintForRasterizer; if (R(2) == 1) { |