aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/gpu
diff options
context:
space:
mode:
authorGravatar reed <reed@google.com>2014-07-07 14:32:06 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-07-07 14:32:06 -0700
commit9a9eae21ed5235869702a66d6decddd6643792c3 (patch)
treea790837e35bb43388491a095adb69896fdc660bc /include/gpu
parent620fc60b0486765d5bf9d9d3ea50dabe4f358307 (diff)
change pixelref to not inherit from SkFlattenable
If I can "inline" MallocPixelRef unflatten, then I think we can delete this code. The only caller today should be unflattening in the legacy path for bitmaps. R=robertphillips@google.com Author: reed@google.com Review URL: https://codereview.chromium.org/320873003
Diffstat (limited to 'include/gpu')
-rw-r--r--include/gpu/SkGrPixelRef.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/gpu/SkGrPixelRef.h b/include/gpu/SkGrPixelRef.h
index 36802a0558..5599fb79c9 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