aboutsummaryrefslogtreecommitdiffstats
path: root/src/core/SkReadBuffer.h
diff options
context:
space:
mode:
authorreed <reed@google.com>2016-03-22 07:35:17 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-22 07:35:17 -0700
commit1eb81db650d31f50be67b12d60c4f9e7dd08432f (patch)
tree58a5fd565f06a398192be170009fefa2a12a1ee2 /src/core/SkReadBuffer.h
parentee451cf09de31267c93b64e1fdac7c823cee7e85 (diff)
downloadplatform_external_skqp-1eb81db650d31f50be67b12d60c4f9e7dd08432f.tar.gz
platform_external_skqp-1eb81db650d31f50be67b12d60c4f9e7dd08432f.tar.bz2
platform_external_skqp-1eb81db650d31f50be67b12d60c4f9e7dd08432f.zip
Revert of switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.org/1822623002/ )
Reason for revert: need to fix unguarded makeWithFilter Original issue's description: > switch colorfilters to sk_sp > > BUG=skia: > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1822623002 > > Committed: https://skia.googlesource.com/skia/+/f809d7687a4fb7b88b651b046da2bc0035d6aa09 TBR=fmalita@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1820303002
Diffstat (limited to 'src/core/SkReadBuffer.h')
-rw-r--r--src/core/SkReadBuffer.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/core/SkReadBuffer.h b/src/core/SkReadBuffer.h
index 46f6b818da..575375eded 100644
--- a/src/core/SkReadBuffer.h
+++ b/src/core/SkReadBuffer.h
@@ -130,9 +130,7 @@ public:
template <typename T> T* readFlattenable() {
return (T*) this->readFlattenable(T::GetFlattenableType());
}
- sk_sp<SkColorFilter> readColorFilter() {
- return sk_sp<SkColorFilter>(this->readFlattenable<SkColorFilter>());
- }
+ SkColorFilter* readColorFilter() { return this->readFlattenable<SkColorFilter>(); }
sk_sp<SkDrawLooper> readDrawLooper() {
return sk_sp<SkDrawLooper>(this->readFlattenable<SkDrawLooper>());
}