diff options
| author |  bsalomon <bsalomon@google.com> | 2016-05-03 10:11:55 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-05-03 10:11:55 -0700 |
| commit | 308febaebd7048041ecd3ef4487e893238119d08 (patch) | |
| tree | c6f57563180bab4d6bf36fd4ba448b13c53f4cec /src/gpu/GrStyle.h | |
| parent | b4511344b61bffc02219c1282610411529ddb7f8 (diff) | |
Revert of Make GrStyle more sk_sp savy (patchset #1 id:1 of https://codereview.chromium.org/1947543002/ )
Reason for revert:
Crashing Ubuntu/GCC bot (but not clang)
Original issue's description:
> Make GrStyle more sk_sp savy
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1947543002
>
> Committed: https://skia.googlesource.com/skia/+/46db22f1cfc65a7a4f1de13d774718347362f60f
TBR=robertphillips@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review-Url: https://codereview.chromium.org/1943973002
Diffstat (limited to 'src/gpu/GrStyle.h')
| -rw-r--r-- | src/gpu/GrStyle.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gpu/GrStyle.h b/src/gpu/GrStyle.h index 62165bf311..4eef252de4 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, 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 @@ public: 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 @@ public: const SkStrokeRec& strokeRec() const { return fStrokeRec; } private: - void initPathEffect(sk_sp<SkPathEffect> pe); + void initPathEffect(SkPathEffect* pe); struct DashInfo { DashInfo& operator=(const DashInfo& that) { |