Bug 1505426 - initialize SkMaskFilter flattenables. r=rhunt

2018-11-20 15:19:33 -05:00 · 2018-11-20 15:19:33 -05:00 · 7db9336472
--- 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)
 }
--- a/gfx/tests/crashtests/1505426-1.html
+++ b/gfx/tests/crashtests/1505426-1.html
@ -0,0 +1,23 @@
+<html>
+
+<head>
+  <script>
+    function start() {
+      canvas = document.getElementById('canvas')
+      context = canvas.getContext('2d')
+      canvas.setAttribute('x', 800)
+      setTimeout(function() {
+        context.fillText('i', 158, 156, 206)
+      }, 0)
+      context.setTransform(0, 1, 19, 1, 0.0989504886744, 0)
+    }
+    document.addEventListener('DOMContentLoaded', start)
+  </script>
+
+</head>
+
+<body>
+  <canvas id='canvas'></canvas>
+</body>
+
+</html>
--- 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