Split atomic and mutex implementations and make inlinable.

gyp/ports.gyp

Index: gyp/ports.gyp
===================================================================
--- gyp/ports.gyp	(revision 11669)
+++ gyp/ports.gyp	(working copy)
@@ -23,6 +23,10 @@
         '../src/utils',
       ],
       'sources': [
+        '../src/ports/SkAtomics_android.h',
+        '../src/ports/SkAtomics_none.h',
+        '../src/ports/SkAtomics_sync.h',
+        '../src/ports/SkAtomics_win.h',
         '../src/ports/SkDebug_nacl.cpp',
         '../src/ports/SkDebug_stdio.cpp',
         '../src/ports/SkDebug_win.cpp',
@@ -34,14 +38,14 @@
 
         '../src/ports/SkGlobalInitialization_default.cpp',
         '../src/ports/SkMemory_malloc.cpp',
+        '../src/ports/SkMutex_none.h',
+        '../src/ports/SkMutex_pthread.h',
+        '../src/ports/SkMutex_win.h',
         '../src/ports/SkOSFile_posix.cpp',
         '../src/ports/SkOSFile_stdio.cpp',
         '../src/ports/SkOSFile_win.cpp',
         '../src/ports/SkDiscardableMemory_none.cpp',
         '../src/ports/SkPurgeableMemoryBlock_none.cpp',
-       #'../src/ports/SkThread_none.cpp',
-        '../src/ports/SkThread_pthread.cpp',
-        '../src/ports/SkThread_win.cpp',
         '../src/ports/SkTime_Unix.cpp',
         '../src/ports/SkTime_win.cpp',
        #'../src/ports/SkTLS_none.cpp',
@@ -121,7 +125,6 @@
           'sources!': [ # these are used everywhere but windows
             '../src/ports/SkDebug_stdio.cpp',
             '../src/ports/SkOSFile_posix.cpp',
-            '../src/ports/SkThread_pthread.cpp',
             '../src/ports/SkTime_Unix.cpp',
             '../src/ports/SkTLS_pthread.cpp',
           ],
@@ -145,7 +148,6 @@
             '../src/ports/SkFontMgr_default_gdi.cpp',
             '../src/ports/SkFontMgr_default_dw.cpp',
             '../src/ports/SkOSFile_win.cpp',
-            '../src/ports/SkThread_win.cpp',
             '../src/ports/SkTime_win.cpp',
             '../src/ports/SkTLS_win.cpp',
           ],