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

Side by Side Diff: src/core/SkReadBuffer.h

Issue 1820303002: Revert of switch colorfilters to sk_sp (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 9 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 unified diff | Download patch
« no previous file with comments | « src/core/SkPaint.cpp ('k') | src/effects/SkBlurDrawLooper.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2011 Google Inc. 2 * Copyright 2011 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #ifndef SkReadBuffer_DEFINED 8 #ifndef SkReadBuffer_DEFINED
9 #define SkReadBuffer_DEFINED 9 #define SkReadBuffer_DEFINED
10 10
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 virtual void readRect(SkRect* rect); 123 virtual void readRect(SkRect* rect);
124 virtual void readRegion(SkRegion* region); 124 virtual void readRegion(SkRegion* region);
125 125
126 virtual void readPath(SkPath* path); 126 virtual void readPath(SkPath* path);
127 void readPaint(SkPaint* paint) { paint->unflatten(*this); } 127 void readPaint(SkPaint* paint) { paint->unflatten(*this); }
128 128
129 virtual SkFlattenable* readFlattenable(SkFlattenable::Type); 129 virtual SkFlattenable* readFlattenable(SkFlattenable::Type);
130 template <typename T> T* readFlattenable() { 130 template <typename T> T* readFlattenable() {
131 return (T*) this->readFlattenable(T::GetFlattenableType()); 131 return (T*) this->readFlattenable(T::GetFlattenableType());
132 } 132 }
133 sk_sp<SkColorFilter> readColorFilter() { 133 SkColorFilter* readColorFilter() { return this->readFlattenable<SkColorFilte r>(); }
134 return sk_sp<SkColorFilter>(this->readFlattenable<SkColorFilter>());
135 }
136 sk_sp<SkDrawLooper> readDrawLooper() { 134 sk_sp<SkDrawLooper> readDrawLooper() {
137 return sk_sp<SkDrawLooper>(this->readFlattenable<SkDrawLooper>()); 135 return sk_sp<SkDrawLooper>(this->readFlattenable<SkDrawLooper>());
138 } 136 }
139 SkImageFilter* readImageFilter() { return this->readFlattenable<SkImageFilte r>(); } 137 SkImageFilter* readImageFilter() { return this->readFlattenable<SkImageFilte r>(); }
140 SkMaskFilter* readMaskFilter() { return this->readFlattenable<SkMaskFilter >(); } 138 SkMaskFilter* readMaskFilter() { return this->readFlattenable<SkMaskFilter >(); }
141 sk_sp<SkPathEffect> readPathEffect() { 139 sk_sp<SkPathEffect> readPathEffect() {
142 return sk_sp<SkPathEffect>(this->readFlattenable<SkPathEffect>()); 140 return sk_sp<SkPathEffect>(this->readFlattenable<SkPathEffect>());
143 } 141 }
144 sk_sp<SkRasterizer> readRasterizer() { 142 sk_sp<SkRasterizer> readRasterizer() {
145 return sk_sp<SkRasterizer>(this->readFlattenable<SkRasterizer>()); 143 return sk_sp<SkRasterizer>(this->readFlattenable<SkRasterizer>());
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 SkPicture::InstallPixelRefProc fBitmapDecoder; 247 SkPicture::InstallPixelRefProc fBitmapDecoder;
250 248
251 #ifdef DEBUG_NON_DETERMINISTIC_ASSERT 249 #ifdef DEBUG_NON_DETERMINISTIC_ASSERT
252 // Debugging counter to keep track of how many bitmaps we 250 // Debugging counter to keep track of how many bitmaps we
253 // have decoded. 251 // have decoded.
254 int fDecodedBitmapIndex; 252 int fDecodedBitmapIndex;
255 #endif // DEBUG_NON_DETERMINISTIC_ASSERT 253 #endif // DEBUG_NON_DETERMINISTIC_ASSERT
256 }; 254 };
257 255
258 #endif // SkReadBuffer_DEFINED 256 #endif // SkReadBuffer_DEFINED
OLDNEW
« no previous file with comments | « src/core/SkPaint.cpp ('k') | src/effects/SkBlurDrawLooper.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698