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

Unified Diff: src/core/SkLazyFnPtr.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/SkThreadPriv.h ('k') | src/core/SkTraceEvent.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkLazyFnPtr.h
diff --git a/src/core/SkLazyFnPtr.h b/src/core/SkLazyFnPtr.h
index 464e061a131816b9042b9a8ebcd70e94990fe537..9e9bc1165c946653c96789c6f92cc057c3bf45c2 100644
--- a/src/core/SkLazyFnPtr.h
+++ b/src/core/SkLazyFnPtr.h
@@ -31,8 +31,7 @@
// Everything below here is private implementation details. Don't touch, don't even look.
-#include "SkDynamicAnnotations.h"
-#include "SkThreadPriv.h"
+#include "SkAtomics.h"
namespace Private {
@@ -42,7 +41,7 @@ class SkLazyFnPtr {
public:
F get() {
// First, try reading to see if it's already set.
- F fn = (F)SK_ANNOTATE_UNPROTECTED_READ(fPtr);
+ F fn = (F)sk_atomic_load(&fPtr, sk_memory_order_relaxed);
if (fn != NULL) {
return fn;
}
« no previous file with comments | « include/core/SkThreadPriv.h ('k') | src/core/SkTraceEvent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698