aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2016-04-06 12:27:07 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-04-06 12:27:07 -0700
commit083b869f50d4bceea6f3088e1db2bb815de7549b (patch)
tree300130590137cd86593e13703f6773b025b81029
parent9fab59d3a6f652e25aace376acc4e54c1ba1ce4a (diff)
Register SkLocalMatrixImageFilter for serialization.
This fixes one of the zillions of serialize-8888 backlisted tests. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1868453003 Review URL: https://codereview.chromium.org/1868453003
-rw-r--r--src/ports/SkGlobalInitialization_default.cpp2
-rw-r--r--tools/dm_flags.json60
-rwxr-xr-xtools/dm_flags.py3
3 files changed, 3 insertions, 62 deletions
diff --git a/src/ports/SkGlobalInitialization_default.cpp b/src/ports/SkGlobalInitialization_default.cpp
index ed0f474617..ea268f22e8 100644
--- a/src/ports/SkGlobalInitialization_default.cpp
+++ b/src/ports/SkGlobalInitialization_default.cpp
@@ -30,6 +30,7 @@
#include "SkLayerRasterizer.h"
#include "SkLightingImageFilter.h"
#include "SkLightingShader.h"
+#include "SkLocalMatrixImageFilter.h"
#include "SkLumaColorFilter.h"
#include "SkMagnifierImageFilter.h"
#include "SkMatrixConvolutionImageFilter.h"
@@ -105,6 +106,7 @@ void SkFlattenable::PrivateInitializer::InitEffects() {
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDropShadowImageFilter)
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkErodeImageFilter)
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkImageSource)
+ SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkLocalMatrixImageFilter)
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPaintImageFilter)
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkPictureImageFilter)
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkTileImageFilter)
diff --git a/tools/dm_flags.json b/tools/dm_flags.json
index c842db72ec..4407d277a7 100644
--- a/tools/dm_flags.json
+++ b/tools/dm_flags.json
@@ -141,10 +141,6 @@
"serialize-8888",
"gm",
"_",
- "localmatriximagefilter",
- "serialize-8888",
- "gm",
- "_",
"path_stroke_with_zero_length",
"serialize-8888",
"gm",
@@ -357,10 +353,6 @@
"serialize-8888",
"gm",
"_",
- "localmatriximagefilter",
- "serialize-8888",
- "gm",
- "_",
"path_stroke_with_zero_length",
"serialize-8888",
"gm",
@@ -670,10 +662,6 @@
"serialize-8888",
"gm",
"_",
- "localmatriximagefilter",
- "serialize-8888",
- "gm",
- "_",
"path_stroke_with_zero_length",
"serialize-8888",
"gm",
@@ -981,10 +969,6 @@
"serialize-8888",
"gm",
"_",
- "localmatriximagefilter",
- "serialize-8888",
- "gm",
- "_",
"path_stroke_with_zero_length",
"serialize-8888",
"gm",
@@ -1295,10 +1279,6 @@
"serialize-8888",
"gm",
"_",
- "localmatriximagefilter",
- "serialize-8888",
- "gm",
- "_",
"path_stroke_with_zero_length",
"serialize-8888",
"gm",
@@ -1602,10 +1582,6 @@
"serialize-8888",
"gm",
"_",
- "localmatriximagefilter",
- "serialize-8888",
- "gm",
- "_",
"path_stroke_with_zero_length",
"serialize-8888",
"gm",
@@ -1911,10 +1887,6 @@
"serialize-8888",
"gm",
"_",
- "localmatriximagefilter",
- "serialize-8888",
- "gm",
- "_",
"path_stroke_with_zero_length",
"serialize-8888",
"gm",
@@ -2216,10 +2188,6 @@
"serialize-8888",
"gm",
"_",
- "localmatriximagefilter",
- "serialize-8888",
- "gm",
- "_",
"path_stroke_with_zero_length",
"serialize-8888",
"gm",
@@ -2468,10 +2436,6 @@
"serialize-8888",
"gm",
"_",
- "localmatriximagefilter",
- "serialize-8888",
- "gm",
- "_",
"path_stroke_with_zero_length",
"serialize-8888",
"gm",
@@ -2813,10 +2777,6 @@
"serialize-8888",
"gm",
"_",
- "localmatriximagefilter",
- "serialize-8888",
- "gm",
- "_",
"path_stroke_with_zero_length",
"serialize-8888",
"gm",
@@ -3034,10 +2994,6 @@
"serialize-8888",
"gm",
"_",
- "localmatriximagefilter",
- "serialize-8888",
- "gm",
- "_",
"path_stroke_with_zero_length",
"serialize-8888",
"gm",
@@ -3258,10 +3214,6 @@
"serialize-8888",
"gm",
"_",
- "localmatriximagefilter",
- "serialize-8888",
- "gm",
- "_",
"path_stroke_with_zero_length",
"serialize-8888",
"gm",
@@ -3499,10 +3451,6 @@
"serialize-8888",
"gm",
"_",
- "localmatriximagefilter",
- "serialize-8888",
- "gm",
- "_",
"path_stroke_with_zero_length",
"serialize-8888",
"gm",
@@ -3739,10 +3687,6 @@
"serialize-8888",
"gm",
"_",
- "localmatriximagefilter",
- "serialize-8888",
- "gm",
- "_",
"path_stroke_with_zero_length",
"serialize-8888",
"gm",
@@ -4105,10 +4049,6 @@
"serialize-8888",
"gm",
"_",
- "localmatriximagefilter",
- "serialize-8888",
- "gm",
- "_",
"path_stroke_with_zero_length",
"serialize-8888",
"gm",
diff --git a/tools/dm_flags.py b/tools/dm_flags.py
index 19739866c1..121f7c7f96 100755
--- a/tools/dm_flags.py
+++ b/tools/dm_flags.py
@@ -75,7 +75,7 @@ def get_args(bot):
if 'TegraX1' in bot:
configs = [x.replace('gpu', 'gl') for x in configs]
configs = [x.replace('msaa', 'glmsaa') for x in configs]
-
+
# NP is running out of RAM when we run all these modes. skia:3255
if 'NexusPlayer' not in bot:
configs.extend(mode + '-8888' for mode in
@@ -169,7 +169,6 @@ def get_args(bot):
'fontmgr_match',
'fontmgr_iter',
'lightingshader',
- 'localmatriximagefilter',
'path_stroke_with_zero_length',
'textblobgeometrychange',
'verylargebitmap', # Windows only.