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

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

Issue 1834303003: Delete SkFlattenable::Type (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Rebase 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 unified diff | Download patch
« no previous file with comments | « src/core/SkFlattenableSerialization.cpp ('k') | src/core/SkReadBuffer.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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 virtual void readPoint(SkPoint* point); 119 virtual void readPoint(SkPoint* point);
120 SkPoint readPoint() { SkPoint p; this->readPoint(&p); return p; } 120 SkPoint readPoint() { SkPoint p; this->readPoint(&p); return p; }
121 virtual void readMatrix(SkMatrix* matrix); 121 virtual void readMatrix(SkMatrix* matrix);
122 virtual void readIRect(SkIRect* rect); 122 virtual void readIRect(SkIRect* rect);
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();
130 template <typename T> sk_sp<T> readFlattenable() { 130 template <typename T> sk_sp<T> readFlattenable() {
131 return sk_sp<T>((T*)this->readFlattenable(T::GetFlattenableType())); 131 return sk_sp<T>((T*)this->readFlattenable());
132 } 132 }
133 sk_sp<SkColorFilter> readColorFilter() { return this->readFlattenable<SkColo rFilter>(); } 133 sk_sp<SkColorFilter> readColorFilter() { return this->readFlattenable<SkColo rFilter>(); }
134 sk_sp<SkDrawLooper> readDrawLooper() { return this->readFlattenable<SkDrawLo oper>(); } 134 sk_sp<SkDrawLooper> readDrawLooper() { return this->readFlattenable<SkDrawLo oper>(); }
135 sk_sp<SkImageFilter> readImageFilter() { return this->readFlattenable<SkImag eFilter>(); } 135 sk_sp<SkImageFilter> readImageFilter() { return this->readFlattenable<SkImag eFilter>(); }
136 sk_sp<SkMaskFilter> readMaskFilter() { return this->readFlattenable<SkMaskFi lter>(); } 136 sk_sp<SkMaskFilter> readMaskFilter() { return this->readFlattenable<SkMaskFi lter>(); }
137 sk_sp<SkPathEffect> readPathEffect() { return this->readFlattenable<SkPathEf fect>(); } 137 sk_sp<SkPathEffect> readPathEffect() { return this->readFlattenable<SkPathEf fect>(); }
138 sk_sp<SkRasterizer> readRasterizer() { return this->readFlattenable<SkRaster izer>(); } 138 sk_sp<SkRasterizer> readRasterizer() { return this->readFlattenable<SkRaster izer>(); }
139 sk_sp<SkShader> readShader() { return this->readFlattenable<SkShader>(); } 139 sk_sp<SkShader> readShader() { return this->readFlattenable<SkShader>(); }
140 sk_sp<SkXfermode> readXfermode() { return this->readFlattenable<SkXfermode>( ); } 140 sk_sp<SkXfermode> readXfermode() { return this->readFlattenable<SkXfermode>( ); }
141 141
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 SkPicture::InstallPixelRefProc fBitmapDecoder; 228 SkPicture::InstallPixelRefProc fBitmapDecoder;
229 229
230 #ifdef DEBUG_NON_DETERMINISTIC_ASSERT 230 #ifdef DEBUG_NON_DETERMINISTIC_ASSERT
231 // Debugging counter to keep track of how many bitmaps we 231 // Debugging counter to keep track of how many bitmaps we
232 // have decoded. 232 // have decoded.
233 int fDecodedBitmapIndex; 233 int fDecodedBitmapIndex;
234 #endif // DEBUG_NON_DETERMINISTIC_ASSERT 234 #endif // DEBUG_NON_DETERMINISTIC_ASSERT
235 }; 235 };
236 236
237 #endif // SkReadBuffer_DEFINED 237 #endif // SkReadBuffer_DEFINED
OLDNEW
« no previous file with comments | « src/core/SkFlattenableSerialization.cpp ('k') | src/core/SkReadBuffer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698