2 files changed, 8 insertions, 8 deletions
diff --git a/src/core/SkTaskGroup.cpp b/src/core/SkTaskGroup.cpp
index 78ab71c79d..9469b8c1ce 100644
--- a/src/core/SkTaskGroup.cpp
+++ b/src/core/SkTaskGroup.cpp
@@ -11,20 +11,20 @@
 SkTaskGroup::SkTaskGroup(SkExecutor& executor) : fPending(0), fExecutor(executor) {}
 
 void SkTaskGroup::add(std::function<void(void)> fn) {
-    fPending.fetch_add(+1, sk_memory_order_relaxed);
+    fPending.fetch_add(+1, std::memory_order_relaxed);
     fExecutor.add([=] {
         fn();
-        fPending.fetch_add(-1, sk_memory_order_release);
+        fPending.fetch_add(-1, std::memory_order_release);
     });
 }
 
 void SkTaskGroup::batch(int N, std::function<void(int)> fn) {
     // TODO: I really thought we had some sort of more clever chunking logic.
-    fPending.fetch_add(+N, sk_memory_order_relaxed);
+    fPending.fetch_add(+N, std::memory_order_relaxed);
     for (int i = 0; i < N; i++) {
         fExecutor.add([=] {
             fn(i);
-            fPending.fetch_add(-1, sk_memory_order_release);
+            fPending.fetch_add(-1, std::memory_order_release);
         });
     }
 }
@@ -34,7 +34,7 @@ void SkTaskGroup::wait() {
     // This lets SkTaskGroups nest arbitrarily deep on a single SkExecutor:
     // no thread ever blocks waiting for others to do its work.
     // (We may end up doing work that's not part of our task group.  That's fine.)
-    while (fPending.load(sk_memory_order_acquire) > 0) {
+    while (fPending.load(std::memory_order_acquire) > 0) {
         fExecutor.borrow();
     }
 }
diff --git a/src/core/SkTaskGroup.h b/src/core/SkTaskGroup.h
index cba9eea366..ff291ea29e 100644
--- a/src/core/SkTaskGroup.h
+++ b/src/core/SkTaskGroup.h
@@ -8,9 +8,9 @@
 #ifndef SkTaskGroup_DEFINED
 #define SkTaskGroup_DEFINED
 
-#include "SkAtomics.h"
 #include "SkExecutor.h"
 #include "SkTypes.h"
+#include <atomic>
 #include <functional>
 
 class SkTaskGroup : SkNoncopyable {
@@ -37,8 +37,8 @@ public:
     };
 
 private:
-    SkAtomic<int32_t> fPending;
-    SkExecutor&       fExecutor;
+    std::atomic<int32_t> fPending;
+    SkExecutor&          fExecutor;
 };
 
 #endif//SkTaskGroup_DEFINED