From 7db9336472d828550906543bc0a679f29c2d18ea Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Tue, 20 Nov 2018 15:19:33 -0500 Subject: [PATCH] Bug 1505426 - initialize SkMaskFilter flattenables. r=rhunt --- .../ports/SkGlobalInitialization_default.cpp | 4 ++++ gfx/tests/crashtests/1505426-1.html | 23 +++++++++++++++++++ gfx/tests/crashtests/crashtests.list | 1 + 3 files changed, 28 insertions(+) create mode 100644 gfx/tests/crashtests/1505426-1.html diff --git a/gfx/skia/skia/src/ports/SkGlobalInitialization_default.cpp b/gfx/skia/skia/src/ports/SkGlobalInitialization_default.cpp index 2c1433d49efa..f7c330d10362 100644 --- a/gfx/skia/skia/src/ports/SkGlobalInitialization_default.cpp +++ b/gfx/skia/skia/src/ports/SkGlobalInitialization_default.cpp @@ -6,6 +6,7 @@ */ #include "SkFlattenablePriv.h" +#include "SkMaskFilter.h" #include "../../src/effects/SkDashImpl.h" #include "SkGradientShader.h" @@ -21,6 +22,9 @@ void SkFlattenable::PrivateInitializer::InitEffects() { // Shader SkGradientShader::InitializeFlattenables(); + // Mask filters. + SkMaskFilter::InitializeFlattenables(); + // PathEffect SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkDashImpl) } diff --git a/gfx/tests/crashtests/1505426-1.html b/gfx/tests/crashtests/1505426-1.html new file mode 100644 index 000000000000..d6eef7c99dce --- /dev/null +++ b/gfx/tests/crashtests/1505426-1.html @@ -0,0 +1,23 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/gfx/tests/crashtests/crashtests.list b/gfx/tests/crashtests/crashtests.list index 09cea82c65b5..d8335e542b44 100644 --- a/gfx/tests/crashtests/crashtests.list +++ b/gfx/tests/crashtests/crashtests.list @@ -173,3 +173,4 @@ load 1478035.html load 1490704-1.html load 1501518.html load 1503986-1.html +load 1505426-1.html