diff options
| author |  mtklein <mtklein@chromium.org> | 2015-01-13 08:40:23 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-01-13 08:40:23 -0800 |
| commit | 199ba8e19b0cafb37eea3beab162bc4b52728fff (patch) | |
| tree | 143928c3d09c28f887ca752978b49cc0662b43f5 /src/utils | |
| parent | 60f8353f683277f360c5a74e2905c8de987a2dfe (diff) | |
namespace {} trick for SK_DECLARE_STATIC_ONCE
Like all our other SK_DECLARE_STATIC_*, it's usually not a thread-safe
thing to put inside a function. Adding namespace {} prevents that
syntactically.
Needs https://codereview.chromium.org/841263004/ to land first.
BUG=chromium:447890
No public API changes.
TBR=reed@google.com
Review URL: https://codereview.chromium.org/806473006
Diffstat (limited to 'src/utils')
| -rw-r--r-- | src/utils/SkEventTracer.cpp | 2 | ||||
| -rw-r--r-- | src/utils/win/SkDWrite.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/utils/SkEventTracer.cpp b/src/utils/SkEventTracer.cpp index 4c0470b389..ef2a0552b5 100644 --- a/src/utils/SkEventTracer.cpp +++ b/src/utils/SkEventTracer.cpp @@ -51,8 +51,8 @@ static void intialize_default_tracer(SkEventTracer* current_instance) { } +SK_DECLARE_STATIC_ONCE(once); SkEventTracer* SkEventTracer::GetInstance() { - SK_DECLARE_STATIC_ONCE(once); SkOnce(&once, intialize_default_tracer, SkEventTracer::gInstance); SkASSERT(SkEventTracer::gInstance); return SkEventTracer::gInstance; diff --git a/src/utils/win/SkDWrite.cpp b/src/utils/win/SkDWrite.cpp index 7801059187..363ac438d9 100644 --- a/src/utils/win/SkDWrite.cpp +++ b/src/utils/win/SkDWrite.cpp @@ -41,10 +41,9 @@ static void create_dwrite_factory(IDWriteFactory** factory) { } +SK_DECLARE_STATIC_ONCE(once); IDWriteFactory* sk_get_dwrite_factory() { - SK_DECLARE_STATIC_ONCE(once); SkOnce(&once, create_dwrite_factory, &gDWriteFactory); - return gDWriteFactory; } |