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

Unified Diff: include/core/SkLazyPtr.h

Issue 996763002: Clean up SkDynamicAnnotations. (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: review Created 5 years, 9 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 | « include/core/SkDynamicAnnotations.h ('k') | include/core/SkOnce.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/core/SkLazyPtr.h
diff --git a/include/core/SkLazyPtr.h b/include/core/SkLazyPtr.h
index fb2e43e874681c1e993992ae891bae40561930a4..035a269addbd162562d0c62ea195b333e4ece583 100644
--- a/include/core/SkLazyPtr.h
+++ b/include/core/SkLazyPtr.h
@@ -103,7 +103,7 @@ template <typename T> void sk_delete(T* ptr) { SkDELETE(ptr); }
template <typename T>
T consume_load(T* ptr) {
-#if DYNAMIC_ANNOTATIONS_ENABLED
+#if defined(THREAD_SANITIZER)
// TSAN gets anxious if we don't tell it what we're actually doing, a consume load.
return sk_atomic_load(ptr, sk_memory_order_consume);
#else
« no previous file with comments | « include/core/SkDynamicAnnotations.h ('k') | include/core/SkOnce.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698