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

Unified Diff: src/gpu/GrStyle.h

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 | « no previous file | src/gpu/GrStyle.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrStyle.h
diff --git a/src/gpu/GrStyle.h b/src/gpu/GrStyle.h
index 62165bf31118140d14af051930bc4067f5560725..4eef252de4f4668244bef8d55ce76ddfb922e24e 100644
--- a/src/gpu/GrStyle.h
+++ b/src/gpu/GrStyle.h
@@ -29,9 +29,9 @@
fDashInfo.fType = SkPathEffect::kNone_DashType;
}
- GrStyle(const SkStrokeRec& strokeRec, sk_sp<SkPathEffect> pe) : fStrokeRec(strokeRec) {
+ GrStyle(const SkStrokeRec& strokeRec, SkPathEffect* pe) : fStrokeRec(strokeRec) {
SkASSERT(SkStrokeRec::kStrokeAndFill_Style != strokeRec.getStyle());
- this->initPathEffect(std::move(pe));
+ this->initPathEffect(pe);
}
GrStyle(const GrStyle& that) : fStrokeRec(SkStrokeRec::kFill_InitStyle) {
@@ -40,7 +40,7 @@
explicit GrStyle(const SkPaint& paint) : fStrokeRec(paint) {
SkASSERT(SkStrokeRec::kStrokeAndFill_Style != fStrokeRec.getStyle());
- this->initPathEffect(sk_ref_sp(paint.getPathEffect()));
+ this->initPathEffect(paint.getPathEffect());
}
GrStyle& operator=(const GrStyle& that) {
@@ -68,7 +68,7 @@
const SkStrokeRec& strokeRec() const { return fStrokeRec; }
private:
- void initPathEffect(sk_sp<SkPathEffect> pe);
+ void initPathEffect(SkPathEffect* pe);
struct DashInfo {
DashInfo& operator=(const DashInfo& that) {
« no previous file with comments | « no previous file | src/gpu/GrStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698