Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1700)

Unified Diff: gm/lightingshader.cpp

Issue 2300623005: Replace a lot of 'static const' with 'constexpr' or 'const'. (Closed)
Patch Set: small msvc concession Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gm/lighting.cpp ('k') | gm/lightingshader2.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gm/lightingshader.cpp
diff --git a/gm/lightingshader.cpp b/gm/lightingshader.cpp
index 137fd64a26caf68cd3176e8b52fc531e48a32863..8576dd72d57a1d4debd8480549ab72728ac8f1d6 100644
--- a/gm/lightingshader.cpp
+++ b/gm/lightingshader.cpp
@@ -66,7 +66,7 @@ protected:
kLast_NormalMap = kTetra_NormalMap
};
- static const int kNormalMapCount = kLast_NormalMap+1;
+ static constexpr int kNormalMapCount = kLast_NormalMap+1;
SkString onShortName() override {
return SkString("lightingshader");
@@ -164,8 +164,8 @@ protected:
}
private:
- static const int kTexSize = 128;
- static const int kGMSize = 512;
+ static constexpr int kTexSize = 128;
+ static constexpr int kGMSize = 512;
SkBitmap fDiffuse;
SkBitmap fNormalMaps[kNormalMapCount];
« no previous file with comments | « gm/lighting.cpp ('k') | gm/lightingshader2.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698