commit d3b3bf35676e400c3846b0dd8ac69b131b5e8bba
author Brian Osman <brianosman@google.com> Wed Feb 19 09:47:05 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Feb 19 15:29:09 2020 +0000
tree 994c65e54af1aa16e6babf45441b48bf1ec7df68
parent f0d5ea1ae73eee77b952fa3ec3634c3649c01c6a

Reland "Move runtime shader/colorfilter into SkRuntimeEffect.cpp"

This reverts commit 7281a8623799021d47ebcdb5d0efa6d200cca1cd.

Change-Id: I1759358ede39e2466362cc4d3f0b9530eff08c9e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/271656
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

src/ports/SkGlobalInitialization_default.cpp

diff --git a/src/ports/SkGlobalInitialization_default.cpp b/src/ports/SkGlobalInitialization_default.cpp
index 30d41da..7ef7c31 100644
--- a/src/ports/SkGlobalInitialization_default.cpp
+++ b/src/ports/SkGlobalInitialization_default.cpp
@@ -27,6 +27,7 @@
     #include "include/effects/SkLumaColorFilter.h"
     #include "include/effects/SkOverdrawColorFilter.h"
     #include "include/effects/SkPerlinNoiseShader.h"
+    #include "include/effects/SkRuntimeEffect.h"
     #include "include/effects/SkShaderMaskFilter.h"
     #include "include/effects/SkTableColorFilter.h"
     #include "src/core/SkColorFilter_Matrix.h"
@@ -45,7 +46,6 @@
     #include "src/shaders/SkLightingShader.h"
     #include "src/shaders/SkLocalMatrixShader.h"
     #include "src/shaders/SkPictureShader.h"
-    #include "src/shaders/SkRTShader.h"
     #include "src/shaders/SkShaderBase.h"
 
     #include "include/effects/SkImageFilters.h"
@@ -70,7 +70,6 @@
         SK_REGISTER_FLATTENABLE(SkEmptyShader);
         SK_REGISTER_FLATTENABLE(SkLocalMatrixShader);
         SK_REGISTER_FLATTENABLE(SkPictureShader);
-        SK_REGISTER_FLATTENABLE(SkRTShader);
         SkGradientShader::RegisterFlattenables();
         SkLightingShader::RegisterFlattenables();
         SkPerlinNoiseShader::RegisterFlattenables();
@@ -84,6 +83,9 @@
         SkOverdrawColorFilter::RegisterFlattenables();
         SkTableColorFilter::RegisterFlattenables();
 
+        // Shader & color filter.
+        SkRuntimeEffect::RegisterFlattenables();
+
         // Mask filters.
         SK_REGISTER_FLATTENABLE(SkEmbossMaskFilter);
         SkMaskFilter::RegisterFlattenables();