Chromium Code Reviews| Index: src/core/SkOpts.cpp |
| diff --git a/src/core/SkOpts.cpp b/src/core/SkOpts.cpp |
| index 570e329094cfac0111e08a10893bb9d958dd2279..3c6b5c12c8ae5324c782598d7486c81d66127a27 100644 |
| --- a/src/core/SkOpts.cpp |
| +++ b/src/core/SkOpts.cpp |
| @@ -137,8 +137,10 @@ namespace SkOpts { |
| #endif |
| } |
| - SK_DECLARE_STATIC_ONCE(gInitOnce); |
| - void Init() { SkOnce(&gInitOnce, init); } |
| + void Init() { |
| + static SkOnce once; |
| + once(init); |
| + } |
| #if SK_ALLOW_STATIC_GLOBAL_INITIALIZERS |
| static struct AutoInit { |