aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ports
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 /src/ports
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 'src/ports')
-rw-r--r--src/ports/SkGlobalInitialization_default.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/ports/SkGlobalInitialization_default.cpp b/src/ports/SkGlobalInitialization_default.cpp
index b08906aeff..5c693af13f 100644
--- a/src/ports/SkGlobalInitialization_default.cpp
+++ b/src/ports/SkGlobalInitialization_default.cpp
@@ -106,7 +106,9 @@ static void InitializeFlattenables() {
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMergeImageFilter)
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorFilterImageFilter)
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDownSampleImageFilter)
+#ifdef SK_SUPPORT_LEGACY_PIXELREF_UNFLATTENABLE
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkMallocPixelRef)
+#endif
SkArithmeticMode::InitializeFlattenables();
SkBlurMaskFilter::InitializeFlattenables();