commit 9ca065e2fdb5cf9f7c1ec5582af9989378a36e57
author Mike Klein <mtklein@google.com> Mon Mar 01 13:31:18 2021 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Mar 01 20:18:21 2021 +0000
tree c50d6cd0564845a796797f81b2061649e3fa7e44
parent 0c2d14a1b976b3d7c543b17730ef120350101b62

fix races in dashcircle.cpp

Remove static from locals that are not constexpr.

See
https://task-driver.skia.org/logs/sMqS6sn7QDHLAJjHkSg7/65e8489b-9f04-4da5-bea4-d996dc0bb9ba

Change-Id: I2c1d75c8cd2866b500b0d33ac8a1b8cd9b9fb567
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/377940
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>

gm/dashcircle.cpp

diff --git a/gm/dashcircle.cpp b/gm/dashcircle.cpp
index 00705ee..3bebcbd 100644
--- a/gm/dashcircle.cpp
+++ b/gm/dashcircle.cpp
@@ -172,7 +172,7 @@
 
         SkMatrix rotate;
         rotate.setRotate(25.f);
-        static const SkMatrix kMatrices[]{
+        const SkMatrix kMatrices[]{
                 SkMatrix::I(),
             SkMatrix::Scale(1.2f, 1.2f),
                 SkMatrix::MakeAll(1, 0, 0, 0, -1, 0, 0, 0, 1),  // y flipper
@@ -191,8 +191,8 @@
 
         // Compute the union of bounds of all of our test cases.
         SkRect bounds = SkRect::MakeEmpty();
-        static const SkRect kBounds = kThinCircle.makeOutset(kThinStrokeWidth / 2.f,
-                                                             kThinStrokeWidth / 2.f);
+        const SkRect kBounds = kThinCircle.makeOutset(kThinStrokeWidth / 2.f,
+                                                      kThinStrokeWidth / 2.f);
         for (const auto& m : kMatrices) {
             SkRect devBounds;
             m.mapRect(&devBounds, kBounds);