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/hairlines.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gm/hairlines.cpp') diff --git a/gm/hairlines.cpp b/gm/hairlines.cpp index 89c5cd3d4f..6ec5bdeb77 100644 --- a/gm/hairlines.cpp +++ b/gm/hairlines.cpp @@ -138,9 +138,9 @@ protected: { // Arc example to test imperfect truncation bug (crbug.com/295626) - static const SkScalar kRad = SkIntToScalar(2000); - static const SkScalar kStartAngle = 262.59717f; - static const SkScalar kSweepAngle = SkScalarHalf(17.188717f); + constexpr SkScalar kRad = SkIntToScalar(2000); + constexpr SkScalar kStartAngle = 262.59717f; + constexpr SkScalar kSweepAngle = SkScalarHalf(17.188717f); SkPath* bug = &fPaths.push_back(); @@ -163,8 +163,8 @@ protected: } void onDraw(SkCanvas* canvas) override { - static const SkAlpha kAlphaValue[] = { 0xFF, 0x40 }; - static const SkScalar kWidths[] = { 0, 0.5f, 1.5f }; + constexpr SkAlpha kAlphaValue[] = { 0xFF, 0x40 }; + constexpr SkScalar kWidths[] = { 0, 0.5f, 1.5f }; enum { kMargin = 5, -- cgit v1.2.3