Make class members that are static constexpr also be inline.
This is in prep for compiling with -std=c++14 and -Wno-c++17-extensions
when building with clang. Chrome has encountered problems with
third_party headers that are included both in Skia and other Chrome
sources that produce different code based on whether preprocessor macros
indicate a C++14 or C++17 compilation.
In C++17 they are already inline implicitly. When compiling with C++14
we can get linker errors unless they're explicitly inlined or defined
outside the class. With -Wno-c++17-extensions we can explicitly inline
them in the C++14 build because the warning that would be generated
about using a C++17 language extension is suppressed.
We cannot do this in public headers because we support compiling with
C++14 without suppressing the C++17 language extension warnings.
Bug: chromium:1257145
Change-Id: Iaf5f4c62a398f98dd4ca9b7dfb86f2d5cab21d66
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/457498
Reviewed-by: Ben Wagner <bungeman@google.com>
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
diff --git a/gm/pixelsnap.cpp b/gm/pixelsnap.cpp
index 659f3f0..31136e6 100644
--- a/gm/pixelsnap.cpp
+++ b/gm/pixelsnap.cpp
@@ -28,15 +28,15 @@
protected:
// kTrans should be even or checkboards wont agree in different test cases.
- static constexpr int kTrans = 14;
- static constexpr int kLabelPad = 4;
+ inline static constexpr int kTrans = 14;
+ inline static constexpr int kLabelPad = 4;
// The inverse of this value should be a perfect SkScalar.
- static constexpr int kSubPixelSteps = 8;
- static constexpr int kLabelTextSize = 9;
+ inline static constexpr int kSubPixelSteps = 8;
+ inline static constexpr int kLabelTextSize = 9;
static_assert(kSubPixelSteps < 99, "label_offset_too_small");
- static constexpr int kLabelOffsetX = 2 * kLabelTextSize + kLabelPad;
- static constexpr int kLabelOffsetY = kLabelTextSize + kLabelPad;
+ inline static constexpr int kLabelOffsetX = 2 * kLabelTextSize + kLabelPad;
+ inline static constexpr int kLabelOffsetY = kLabelTextSize + kLabelPad;
SkISize onISize() override {
return SkISize::Make((kSubPixelSteps + 1) * kTrans + kLabelOffsetX + kLabelPad,