Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(257)

Unified Diff: src/gpu/GrStyle.cpp

Issue 1943973002: Revert of Make GrStyle more sk_sp savy (Closed) Base URL: https://chromium.googlesource.com/skia.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/GrStyle.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrStyle.cpp
diff --git a/src/gpu/GrStyle.cpp b/src/gpu/GrStyle.cpp
index 330a7d797be16f55ca2267afadadbc1146cc3bd9..40a148bb4a9c6e88063d064aa3232ef6fda50202 100644
--- a/src/gpu/GrStyle.cpp
+++ b/src/gpu/GrStyle.cpp
@@ -7,7 +7,7 @@
#include "GrStyle.h"
-void GrStyle::initPathEffect(sk_sp<SkPathEffect> pe) {
+void GrStyle::initPathEffect(SkPathEffect* pe) {
if (!pe) {
fDashInfo.fType = SkPathEffect::kNone_DashType;
return;
@@ -17,7 +17,7 @@
if (fStrokeRec.getStyle() == SkStrokeRec::kFill_Style) {
fPathEffect.reset(nullptr);
} else {
- fPathEffect = std::move(pe);
+ fPathEffect.reset(SkSafeRef(pe));
fDashInfo.fType = SkPathEffect::kDash_DashType;
fDashInfo.fIntervals.reset(info.fCount);
fDashInfo.fPhase = info.fPhase;
@@ -26,7 +26,7 @@
return;
}
} else {
- fPathEffect = std::move(pe);
+ fPathEffect.reset(SkSafeRef(pe));
}
fDashInfo.fType = SkPathEffect::kNone_DashType;
fDashInfo.fIntervals.reset(0);
« no previous file with comments | « src/gpu/GrStyle.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698