diff options
| author |  bsalomon <bsalomon@google.com> | 2016-05-03 09:31:44 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-05-03 09:31:44 -0700 |
| commit | 46db22f1cfc65a7a4f1de13d774718347362f60f (patch) | |
| tree | 3aa44cd02366d1ebfad6b34df1e682d35d182504 /src/gpu | |
| parent | 92605b35efa0155c44d24bd8415b4cc1db8831db (diff) | |
Make GrStyle more sk_sp savy
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1947543002
Review-Url: https://codereview.chromium.org/1947543002
Diffstat (limited to 'src/gpu')
| -rw-r--r-- | src/gpu/GrStyle.cpp | 6 | ||||
| -rw-r--r-- | src/gpu/GrStyle.h | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/gpu/GrStyle.cpp b/src/gpu/GrStyle.cpp index 40a148bb4a..330a7d797b 100644 --- a/src/gpu/GrStyle.cpp +++ b/src/gpu/GrStyle.cpp @@ -7,7 +7,7 @@ #include "GrStyle.h" -void GrStyle::initPathEffect(SkPathEffect* pe) { +void GrStyle::initPathEffect(sk_sp<SkPathEffect> pe) { if (!pe) { fDashInfo.fType = SkPathEffect::kNone_DashType; return; @@ -17,7 +17,7 @@ void GrStyle::initPathEffect(SkPathEffect* pe) { if (fStrokeRec.getStyle() == SkStrokeRec::kFill_Style) { fPathEffect.reset(nullptr); } else { - fPathEffect.reset(SkSafeRef(pe)); + fPathEffect = std::move(pe); fDashInfo.fType = SkPathEffect::kDash_DashType; fDashInfo.fIntervals.reset(info.fCount); fDashInfo.fPhase = info.fPhase; @@ -26,7 +26,7 @@ void GrStyle::initPathEffect(SkPathEffect* pe) { return; } } else { - fPathEffect.reset(SkSafeRef(pe)); + fPathEffect = std::move(pe); } fDashInfo.fType = SkPathEffect::kNone_DashType; fDashInfo.fIntervals.reset(0); diff --git a/src/gpu/GrStyle.h b/src/gpu/GrStyle.h index 4eef252de4..62165bf311 100644 --- a/src/gpu/GrStyle.h +++ b/src/gpu/GrStyle.h @@ -29,9 +29,9 @@ public: fDashInfo.fType = SkPathEffect::kNone_DashType; } - GrStyle(const SkStrokeRec& strokeRec, SkPathEffect* pe) : fStrokeRec(strokeRec) { + GrStyle(const SkStrokeRec& strokeRec, sk_sp<SkPathEffect> pe) : fStrokeRec(strokeRec) { SkASSERT(SkStrokeRec::kStrokeAndFill_Style != strokeRec.getStyle()); - this->initPathEffect(pe); + this->initPathEffect(std::move(pe)); } GrStyle(const GrStyle& that) : fStrokeRec(SkStrokeRec::kFill_InitStyle) { @@ -40,7 +40,7 @@ public: explicit GrStyle(const SkPaint& paint) : fStrokeRec(paint) { SkASSERT(SkStrokeRec::kStrokeAndFill_Style != fStrokeRec.getStyle()); - this->initPathEffect(paint.getPathEffect()); + this->initPathEffect(sk_ref_sp(paint.getPathEffect())); } GrStyle& operator=(const GrStyle& that) { @@ -68,7 +68,7 @@ public: const SkStrokeRec& strokeRec() const { return fStrokeRec; } private: - void initPathEffect(SkPathEffect* pe); + void initPathEffect(sk_sp<SkPathEffect> pe); struct DashInfo { DashInfo& operator=(const DashInfo& that) { |