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

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
Index: src/core/SkPaint.cpp
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp
index ea99ede665d786b222ee1d6530ae613529a7f84a..a48dffd91e6c0a1ca8b3567d02a8167b10ab7479 100644
--- a/src/core/SkPaint.cpp
+++ b/src/core/SkPaint.cpp
@@ -2172,15 +2172,15 @@ 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->setAnnotation(buffer.readFlattenableT<SkAnnotation>()));
+ 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()));
+ SkSafeUnref(this->setAnnotation(buffer.readAnnotation()));
} else {
this->setPathEffect(NULL);
this->setShader(NULL);

Powered by Google App Engine
This is Rietveld 408576698