Atomics overhaul.

include/core/SkThreadPriv.h

Index: include/core/SkThreadPriv.h
diff --git a/include/core/SkThreadPriv.h b/include/core/SkThreadPriv.h
index 09d5a669f140d741687961d27fec1f49c77884c8..aca71a6709d9cab6ac570941076ab8b3dde040bc 100644
--- a/include/core/SkThreadPriv.h
+++ b/include/core/SkThreadPriv.h
@@ -8,16 +8,7 @@
 #ifndef SkThreadPriv_DEFINED
 #define SkThreadPriv_DEFINED
 
-#include "SkTypes.h"
-
-// SkAtomics.h must provide inline implementations for the following declarations.
-
-/** Atomic compare and set, for pointers.
- *  If *addr == before, set *addr to after.  Always returns previous value of *addr.
- *  This must issue a release barrier on success, acquire on failure, and always a compiler barrier.
- */
-static void* sk_atomic_cas(void** addr, void* before, void* after);
-
+// TODO: delete this file
 #include "SkAtomics.h"
 
 #endif//SkThreadPriv_DEFINED