aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/core/SkPathEffect.h
diff options
context:
space:
mode:
authorGravatar ethannicholas <ethannicholas@google.com>2016-02-22 07:42:18 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2016-02-22 07:42:18 -0800
commit23e7af0e8ab8377b28e1399b4950def672284724 (patch)
treecbee927515891c54d1b9f5a4504cf8abddf17ce9 /include/core/SkPathEffect.h
parentb6ce10a235f2b692fdc014521c4a1ecbe98a00ef (diff)
Revert of fix misc asserts and checks found by fuzzer (patchset #1 id:1 of https://codereview.chromium.org/1719913002/ )
Reason for revert: Looks to be causing failures in LayerTreeHostFilters* tests (https://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel_ng/builds/177297/steps/cc_unittests%20%28with%20patch%29/logs/stdio). 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= > > Committed: https://skia.googlesource.com/skia/+/653db51b440491b0fb1908bf5a43dcc89c90044d TBR=reed@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/1721743002
Diffstat (limited to 'include/core/SkPathEffect.h')
-rw-r--r--include/core/SkPathEffect.h16
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);
}