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

Unified Diff: include/core/SkColorTable.h

Issue 27392002: Remove SkColorTable from SkFlattenable hierarchy. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: reupload 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 | « no previous file | src/core/SkColorTable.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/core/SkColorTable.h
diff --git a/include/core/SkColorTable.h b/include/core/SkColorTable.h
index c6e31b94d421e7f7c18ea2f458640b70bc62b719..8a21258697d5b8f9b1e50385af6f19f6f80a519f 100644
--- a/include/core/SkColorTable.h
+++ b/include/core/SkColorTable.h
@@ -19,7 +19,7 @@
SkColorTable holds an array SkPMColors (premultiplied 32-bit colors) used by
8-bit bitmaps, where the bitmap bytes are interpreted as indices into the colortable.
*/
-class SkColorTable : public SkFlattenable {
+class SkColorTable : public SkRefCnt {
public:
SK_DECLARE_INST_COUNT(SkColorTable)
@@ -75,11 +75,8 @@ public:
SkDEBUGCODE(f16BitCacheLockCount -= 1);
}
- SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkColorTable)
-
-protected:
explicit SkColorTable(SkFlattenableReadBuffer&);
- void flatten(SkFlattenableWriteBuffer&) const;
+ void writeToBuffer(SkFlattenableWriteBuffer&) const;
private:
SkPMColor* fColors;
@@ -91,7 +88,7 @@ private:
void inval16BitCache();
- typedef SkFlattenable INHERITED;
+ typedef SkRefCnt INHERITED;
};
#endif
« no previous file with comments | « no previous file | src/core/SkColorTable.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698