From dbfd7ab10883f173f5c1b653a233e18dc6142002 Mon Sep 17 00:00:00 2001 From: mtklein Date: Thu, 1 Sep 2016 11:24:54 -0700 Subject: Replace a lot of 'static const' with 'constexpr' or 'const'. 'static const' means, there must be at most one of these, and initialize it at compile time if possible or runtime if necessary. This leads to unexpected code execution, and TSAN* will complain about races on the guard variables. Generally 'constexpr' or 'const' are better choices. Neither can cause races: they're either intialized at compile time (constexpr) or intialized each time independently (const). This CL prefers constexpr where possible, and uses const where not. It even prefers constexpr over const where they don't make a difference... I want to have lots of examples of constexpr for people to see and mimic. The scoped-to-class static has nothing to do with any of this, and is not changed. * Not yet on the bots, which use an older TSAN. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2300623005 Review-Url: https://codereview.chromium.org/2300623005 --- gm/gradients_no_texture.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gm/gradients_no_texture.cpp') diff --git a/gm/gradients_no_texture.cpp b/gm/gradients_no_texture.cpp index b688aab4cb..5d0d4c9202 100644 --- a/gm/gradients_no_texture.cpp +++ b/gm/gradients_no_texture.cpp @@ -15,11 +15,11 @@ struct GradData { const SkScalar* fPos; }; -static const SkColor gColors[] = { +constexpr SkColor gColors[] = { SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE, SK_ColorWHITE, }; -static const GradData gGradData[] = { +constexpr GradData gGradData[] = { { 1, gColors, nullptr }, { 2, gColors, nullptr }, { 3, gColors, nullptr }, @@ -71,7 +71,7 @@ static sk_sp Make2Conical(const SkPoint pts[2], const GradData& data, typedef sk_sp (*GradMaker)(const SkPoint pts[2], const GradData& data, SkShader::TileMode tm); -static const GradMaker gGradMakers[] = { +constexpr GradMaker gGradMakers[] = { MakeLinear, MakeRadial, MakeSweep, Make2Radial, Make2Conical, }; @@ -92,16 +92,16 @@ protected: SkISize onISize() override { return SkISize::Make(640, 615); } void onDraw(SkCanvas* canvas) override { - static const SkPoint kPts[2] = { { 0, 0 }, + constexpr SkPoint kPts[2] = { { 0, 0 }, { SkIntToScalar(50), SkIntToScalar(50) } }; - static const SkShader::TileMode kTM = SkShader::kClamp_TileMode; + constexpr SkShader::TileMode kTM = SkShader::kClamp_TileMode; SkRect kRect = { 0, 0, SkIntToScalar(50), SkIntToScalar(50) }; SkPaint paint; paint.setAntiAlias(true); paint.setDither(fDither); canvas->translate(SkIntToScalar(20), SkIntToScalar(20)); - static const uint8_t kAlphas[] = { 0xff, 0x40 }; + constexpr uint8_t kAlphas[] = { 0xff, 0x40 }; for (size_t a = 0; a < SK_ARRAY_COUNT(kAlphas); ++a) { for (size_t i = 0; i < SK_ARRAY_COUNT(gGradData); ++i) { canvas->save(); -- cgit v1.2.3