diff options
author | reed <reed@google.com> | 2016-02-21 10:27:49 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-02-21 10:27:49 -0800 |
commit | d98ef6377269e3596423225ab922301ed40529a0 (patch) | |
tree | 84d3be6a2cd374d1317ac05ce71cdff7be606ad3 /include/core/SkPathEffect.h | |
parent | df56af4b4ac979a18ea1507bffe2e80f9faab47c (diff) |
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:
Review URL: https://codereview.chromium.org/1713413002
Diffstat (limited to 'include/core/SkPathEffect.h')
-rw-r--r-- | include/core/SkPathEffect.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/include/core/SkPathEffect.h b/include/core/SkPathEffect.h index a77b9467e4..bd68c8fa72 100644 --- a/include/core/SkPathEffect.h +++ b/include/core/SkPathEffect.h @@ -183,13 +183,7 @@ public: The reference counts for outer and inner are both incremented in the constructor, and decremented in the destructor. */ - static SkPathEffect* Create(SkPathEffect* outer, SkPathEffect* inner) { - if (!outer) { - return SkSafeRef(inner); - } - if (!inner) { - return SkSafeRef(outer); - } + static SkComposePathEffect* Create(SkPathEffect* outer, SkPathEffect* inner) { return new SkComposePathEffect(outer, inner); } @@ -226,13 +220,7 @@ public: The reference counts for first and second are both incremented in the constructor, and decremented in the destructor. */ - static SkPathEffect* Create(SkPathEffect* first, SkPathEffect* second) { - if (!first) { - return SkSafeRef(second); - } - if (!second) { - return SkSafeRef(first); - } + static SkSumPathEffect* Create(SkPathEffect* first, SkPathEffect* second) { return new SkSumPathEffect(first, second); } |