From 8c6411a603266e94dd87445ac30e0b1abc36b0af Mon Sep 17 00:00:00 2001 From: "reed@google.com" Date: Wed, 22 May 2013 13:21:32 +0000 Subject: [PATCH] reenable lerpmode in gms, now that I think we fixed the global-initialization BUG= Review URL: https://codereview.chromium.org/15737004 git-svn-id: http://skia.googlecode.com/svn/trunk@9234 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gyp/gmslides.gypi | 2 +- src/ports/SkGlobalInitialization_default.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gyp/gmslides.gypi b/gyp/gmslides.gypi index 860c2f5..d07820d 100644 --- a/gyp/gmslides.gypi +++ b/gyp/gmslides.gypi @@ -49,7 +49,7 @@ '../gm/hittestpath.cpp', '../gm/imageblur.cpp', '../gm/imagemagnifier.cpp', -# '../gm/lerpmode.cpp', + '../gm/lerpmode.cpp', '../gm/lighting.cpp', '../src/image/SkImage_Codec.cpp', '../gm/image.cpp', diff --git a/src/ports/SkGlobalInitialization_default.cpp b/src/ports/SkGlobalInitialization_default.cpp index 0106dc8..297f138 100644 --- a/src/ports/SkGlobalInitialization_default.cpp +++ b/src/ports/SkGlobalInitialization_default.cpp @@ -42,6 +42,7 @@ #include "SkImages.h" #include "SkLayerDrawLooper.h" #include "SkLayerRasterizer.h" +#include "SkLerpXfermode.h" #include "SkLightingImageFilter.h" #include "SkMagnifierImageFilter.h" #include "SkMatrixConvolutionImageFilter.h" @@ -81,6 +82,7 @@ void SkFlattenable::InitializeFlattenables() { SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkErodeImageFilter) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLayerDrawLooper) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLayerRasterizer) + SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLerpXfermode) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPath1DPathEffect) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(Sk2DPathEffect) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLine2DPathEffect) -- 2.7.4