commit ba923d38a5ea092aaa37967c5367ae19e2e4f017
author halcanary <halcanary@google.com> Mon Dec 07 12:02:33 2015 -0800
committer Commit bot <commit-bot@chromium.org> Mon Dec 07 12:02:33 2015 -0800
tree ac44eb0bdeab5c653342c3b0ee30627dff093ede
parent d61c384342aaf7facf31b948db98acc32d81d21b

SkImageShaderFactoryToName SkAlphaThresholdFilterFactoryToName

https://gold.skia.org/diff?test=image-shader&left=8807a80c69a5d565821432fe6a7b74ec&top=80222191bf0768b0fc62c8e05b58fb5f

https://gold.skia.org/diff?test=imagealphathreshold&left=fc3fbbfbd1b1e7ec1c33c00c6c22b9a8&top=493096aac6f44b91cd6522c6049d5a56

BUG=skia:4613

Review URL: https://codereview.chromium.org/1499443002

gyp/ports.gyp

diff --git a/gyp/ports.gyp b/gyp/ports.gyp
index 140be77..35f5284 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',

src/ports/SkGlobalInitialization_chromium.cpp

diff --git a/src/ports/SkGlobalInitialization_chromium.cpp b/src/ports/SkGlobalInitialization_chromium.cpp
index 8ff43f7..5da6379 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 @@
         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 @@
         SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorFilterImageFilter)
         SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDownSampleImageFilter)
 
+        SkAlphaThresholdFilter::InitializeFlattenables();
         SkArithmeticMode::InitializeFlattenables();
         SkBlurMaskFilter::InitializeFlattenables();
         SkColorFilter::InitializeFlattenables();

src/ports/SkGlobalInitialization_default.cpp

diff --git a/src/ports/SkGlobalInitialization_default.cpp b/src/ports/SkGlobalInitialization_default.cpp
index 3038e25..7c39ad6 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 @@
         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 @@
         SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkColorFilterImageFilter)
         SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDownSampleImageFilter)
 
+        SkAlphaThresholdFilter::InitializeFlattenables();
         SkArithmeticMode::InitializeFlattenables();
         SkBlurMaskFilter::InitializeFlattenables();
         SkColorFilter::InitializeFlattenables();