aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--gyp/ports.gyp1
-rw-r--r--src/ports/SkGlobalInitialization_chromium.cpp4
-rw-r--r--src/ports/SkGlobalInitialization_default.cpp4
3 files changed, 9 insertions, 0 deletions
diff --git a/gyp/ports.gyp b/gyp/ports.gyp
index 140be777e4..35f5284c18 100644
--- a/gyp/ports.gyp
+++ b/gyp/ports.gyp
@@ -21,6 +21,7 @@
'../include/utils',
'../include/utils/win',
'../src/core',
+ '../src/image',
'../src/lazy',
'../src/ports',
'../src/sfnt',
diff --git a/src/ports/SkGlobalInitialization_chromium.cpp b/src/ports/SkGlobalInitialization_chromium.cpp
index 8ff43f78e8..5da637941b 100644
--- a/src/ports/SkGlobalInitialization_chromium.cpp
+++ b/src/ports/SkGlobalInitialization_chromium.cpp
@@ -15,6 +15,7 @@
#include "Sk1DPathEffect.h"
#include "Sk2DPathEffect.h"
+#include "SkAlphaThresholdFilter.h"
#include "SkArithmeticMode.h"
#include "SkArcToPathEffect.h"
#include "SkBitmapSourceDeserializer.h"
@@ -37,6 +38,7 @@
#include "SkEmbossMaskFilter.h"
#include "SkFlattenable.h"
#include "SkGradientShader.h"
+#include "SkImageShader.h"
#include "SkImageSource.h"
#include "SkLayerDrawLooper.h"
#include "SkLayerRasterizer.h"
@@ -102,6 +104,7 @@ public:
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkEmbossMaskFilter)
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkEmptyShader)
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkErodeImageFilter)
+ SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkImageShader)
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkImageSource)
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLayerDrawLooper)
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLayerRasterizer)
@@ -130,6 +133,7 @@ public:
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorFilterImageFilter)
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDownSampleImageFilter)
+ SkAlphaThresholdFilter::InitializeFlattenables();
SkArithmeticMode::InitializeFlattenables();
SkBlurMaskFilter::InitializeFlattenables();
SkColorFilter::InitializeFlattenables();
diff --git a/src/ports/SkGlobalInitialization_default.cpp b/src/ports/SkGlobalInitialization_default.cpp
index 3038e25c5d..7c39ad6c22 100644
--- a/src/ports/SkGlobalInitialization_default.cpp
+++ b/src/ports/SkGlobalInitialization_default.cpp
@@ -11,6 +11,7 @@
#include "Sk1DPathEffect.h"
#include "Sk2DPathEffect.h"
+#include "SkAlphaThresholdFilter.h"
#include "SkArithmeticMode.h"
#include "SkArcToPathEffect.h"
#include "SkBitmapSourceDeserializer.h"
@@ -33,6 +34,7 @@
#include "SkEmbossMaskFilter.h"
#include "SkFlattenable.h"
#include "SkGradientShader.h"
+#include "SkImageShader.h"
#include "SkImageSource.h"
#include "SkLayerDrawLooper.h"
#include "SkLayerRasterizer.h"
@@ -81,6 +83,7 @@ public:
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkEmbossMaskFilter)
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkEmptyShader)
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkErodeImageFilter)
+ SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkImageShader)
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkImageSource)
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLayerDrawLooper)
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLayerRasterizer)
@@ -109,6 +112,7 @@ public:
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorFilterImageFilter)
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDownSampleImageFilter)
+ SkAlphaThresholdFilter::InitializeFlattenables();
SkArithmeticMode::InitializeFlattenables();
SkBlurMaskFilter::InitializeFlattenables();
SkColorFilter::InitializeFlattenables();