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

Unified Diff: src/lazy/SkCachingPixelRef.h

Issue 320873003: change pixelref to not inherit from SkFlattenable (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 6 years, 5 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/SkScaledImageCache.cpp ('k') | src/lazy/SkDiscardablePixelRef.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/lazy/SkCachingPixelRef.h
diff --git a/src/lazy/SkCachingPixelRef.h b/src/lazy/SkCachingPixelRef.h
index 9fc71c3616ec35f41eaaa1c644746042aae9763d..193fe454823d9051675ee3fca3a16f49d60f8ab7 100644
--- a/src/lazy/SkCachingPixelRef.h
+++ b/src/lazy/SkCachingPixelRef.h
@@ -48,12 +48,15 @@ protected:
virtual SkData* onRefEncodedData() SK_OVERRIDE {
return fImageGenerator->refEncodedData();
}
+
+#ifdef SK_SUPPORT_LEGACY_PIXELREF_UNFLATTENABLE
// No need to flatten this object. When flattening an SkBitmap,
// SkWriteBuffer will check the encoded data and write that
// instead.
// Future implementations of SkWriteBuffer will need to
// special case for onRefEncodedData as well.
SK_DECLARE_UNFLATTENABLE_OBJECT()
+#endif
private:
SkImageGenerator* const fImageGenerator;
« no previous file with comments | « src/core/SkScaledImageCache.cpp ('k') | src/lazy/SkDiscardablePixelRef.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698