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

Unified Diff: src/core/SkPaint.cpp

Issue 26702002: force readbuffer clients to use specialized readFoo for flattenables (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 2 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 | « src/core/SkOrderedReadBuffer.cpp ('k') | src/core/SkPathEffect.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkPaint.cpp
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp
index cfef8b18cdcd73a3ec81f27ebeadfc8d079352c7..44eef448808103d71d89fb41a480ef0c397a7ff5 100644
--- a/src/core/SkPaint.cpp
+++ b/src/core/SkPaint.cpp
@@ -2178,14 +2178,14 @@ void SkPaint::unflatten(SkFlattenableReadBuffer& buffer) {
}
if (flatFlags & kHasEffects_FlatFlag) {
- SkSafeUnref(this->setPathEffect(buffer.readFlattenableT<SkPathEffect>()));
- SkSafeUnref(this->setShader(buffer.readFlattenableT<SkShader>()));
- SkSafeUnref(this->setXfermode(buffer.readFlattenableT<SkXfermode>()));
- SkSafeUnref(this->setMaskFilter(buffer.readFlattenableT<SkMaskFilter>()));
- SkSafeUnref(this->setColorFilter(buffer.readFlattenableT<SkColorFilter>()));
- SkSafeUnref(this->setRasterizer(buffer.readFlattenableT<SkRasterizer>()));
- SkSafeUnref(this->setLooper(buffer.readFlattenableT<SkDrawLooper>()));
- SkSafeUnref(this->setImageFilter(buffer.readFlattenableT<SkImageFilter>()));
+ SkSafeUnref(this->setPathEffect(buffer.readPathEffect()));
+ SkSafeUnref(this->setShader(buffer.readShader()));
+ SkSafeUnref(this->setXfermode(buffer.readXfermode()));
+ SkSafeUnref(this->setMaskFilter(buffer.readMaskFilter()));
+ SkSafeUnref(this->setColorFilter(buffer.readColorFilter()));
+ SkSafeUnref(this->setRasterizer(buffer.readRasterizer()));
+ SkSafeUnref(this->setLooper(buffer.readDrawLooper()));
+ SkSafeUnref(this->setImageFilter(buffer.readImageFilter()));
if (buffer.readBool()) {
this->setAnnotation(SkNEW_ARGS(SkAnnotation, (buffer)))->unref();
« no previous file with comments | « src/core/SkOrderedReadBuffer.cpp ('k') | src/core/SkPathEffect.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698