commit d9569664fe76068adcc87d7a029350f5dbdbc4a6
author Florin Malita <fmalita@chromium.org> Thu Feb 09 16:41:34 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Feb 09 22:23:03 2017 +0000
tree 933fae23bee34048b907604fab0ceae6b42cea77
parent bd41bcc4d7e01bedd416c05f11b7b1ab10258a77

Fix int64 overflow in SkClampRange::init()

BUG=skia:5915,skia:6219

Change-Id: Ic849bf9dc90e623fc1d6269cd245a2e3eca05d1d
Reviewed-on: https://skia-review.googlesource.com/8290
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Florin Malita <fmalita@chromium.org>

tests/GradientTest.cpp

diff --git a/tests/GradientTest.cpp b/tests/GradientTest.cpp
index 4cdd0c9..e46bfb4 100644
--- a/tests/GradientTest.cpp
+++ b/tests/GradientTest.cpp
@@ -374,14 +374,26 @@
 
     static const SkScalar gPos1[]   = { 0, 0, 1 };
 
-    static const SkScalar gMatrix0[9] =
-        { 6.40969056e-10f, 0              , 6.40969056e-10f,
-          0              , 4.42539023e-39f, 6.40969056e-10f,
-          0              , 0              , 1 };
-    static const SkScalar gMatrix1[9] =
-        { -2.75294113f    , 6.40969056e-10f,  6.40969056e-10f,
-           6.40969056e-10f, 6.40969056e-10f, -3.32810161e+24f,
-           6.40969056e-10f, 6.40969056e-10f,  0 };
+    static const SkScalar gMatrix0[9] = {
+        6.40969056e-10f, 0              , 6.40969056e-10f,
+        0              , 4.42539023e-39f, 6.40969056e-10f,
+        0              , 0              , 1
+    };
+    static const SkScalar gMatrix1[9] = {
+        -2.75294113f    , 6.40969056e-10f,  6.40969056e-10f,
+         6.40969056e-10f, 6.40969056e-10f, -3.32810161e+24f,
+         6.40969056e-10f, 6.40969056e-10f,  0
+    };
+    static const SkScalar gMatrix2[9] = {
+        7.93481258e+17f, 6.40969056e-10f, 6.40969056e-10f,
+        6.40969056e-10f, 6.40969056e-10f, 6.40969056e-10f,
+        6.40969056e-10f, 6.40969056e-10f, 0.688235283f
+    };
+    static const SkScalar gMatrix3[9] = {
+        1.89180674e+11f,     6.40969056e-10f, 6.40969056e-10f,
+        6.40969056e-10f,     6.40969056e-10f, 6.40969056e-10f,
+        6.40969056e-10f, 11276.0469f        , 8.12524808e+20f
+    };
 
     static const struct {
         SkPoint            fPts[2];
@@ -413,6 +425,26 @@
             nullptr,
             gMatrix1
         },
+        {
+            {{4.42539023e-39f, 6.40969056e-10f}, {6.40969056e-10f, 1.49237238e-19f}},
+            gColors1,
+            gPos1,
+            SK_ARRAY_COUNT(gColors1),
+            SkShader::kClamp_TileMode,
+            0,
+            nullptr,
+            gMatrix2
+        },
+        {
+            {{6.40969056e-10f, 6.40969056e-10f}, {6.40969056e-10f, -0.688235283f}},
+            gColors0,
+            nullptr,
+            SK_ARRAY_COUNT(gColors0),
+            SkShader::kClamp_TileMode,
+            0,
+            gMatrix3,
+            nullptr
+        },
     };
 
     static const uint32_t gForceFlags[] = { 0, SkLinearGradient::kForce4fContext_PrivateFlag };