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

Unified Diff: include/gpu/SkGrPixelRef.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 | « include/core/SkReadBuffer.h ('k') | src/core/SkBitmap.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/gpu/SkGrPixelRef.h
diff --git a/include/gpu/SkGrPixelRef.h b/include/gpu/SkGrPixelRef.h
index 36802a05589e236c8c5984cf21dc1ad8381bf441..5599fb79c9ee42099170f0098f058ac9f845edd7 100644
--- a/include/gpu/SkGrPixelRef.h
+++ b/include/gpu/SkGrPixelRef.h
@@ -51,7 +51,9 @@ public:
// override from SkPixelRef
virtual GrTexture* getTexture() SK_OVERRIDE;
+#ifdef SK_SUPPORT_LEGACY_PIXELREF_UNFLATTENABLE
SK_DECLARE_UNFLATTENABLE_OBJECT()
+#endif
protected:
// overrides from SkPixelRef
« no previous file with comments | « include/core/SkReadBuffer.h ('k') | src/core/SkBitmap.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698