aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/GrStyle.cpp
diff options
context:
space:
mode:
authorGravatar Robert Phillips <robertphillips@google.com>2017-01-13 11:02:42 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-01-13 16:50:25 +0000
commitf809c1ec98854b6d0e604744a1fc5f9a4ff493be (patch)
tree09967949730f4dce1e797aa5bc6748194bb18624 /src/gpu/GrStyle.cpp
parent5ac8260268618a992582253c4fc06bb5b0c57d61 (diff)
Try out new refFoo pattern on GrStyle
Change-Id: Ic7f30e3730a3431adf365d729320fe50f38dcea8 Reviewed-on: https://skia-review.googlesource.com/6907 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu/GrStyle.cpp')
-rw-r--r--src/gpu/GrStyle.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/GrStyle.cpp b/src/gpu/GrStyle.cpp
index 153cade919..6995355804 100644
--- a/src/gpu/GrStyle.cpp
+++ b/src/gpu/GrStyle.cpp
@@ -103,7 +103,7 @@ void GrStyle::WriteKey(uint32_t *key, const GrStyle &style, Apply apply, SkScala
SkASSERT(KeySize(style, apply) == i);
}
-void GrStyle::initPathEffect(SkPathEffect* pe) {
+void GrStyle::initPathEffect(sk_sp<SkPathEffect> pe) {
SkASSERT(!fPathEffect);
SkASSERT(SkPathEffect::kNone_DashType == fDashInfo.fType);
SkASSERT(0 == fDashInfo.fIntervals.count());
@@ -119,10 +119,10 @@ void GrStyle::initPathEffect(SkPathEffect* pe) {
fDashInfo.fPhase = info.fPhase;
info.fIntervals = fDashInfo.fIntervals.get();
pe->asADash(&info);
- fPathEffect.reset(SkSafeRef(pe));
+ fPathEffect = std::move(pe);
}
} else {
- fPathEffect.reset(SkSafeRef(pe));
+ fPathEffect = std::move(pe);
}
}