Split atomic and mutex implementations and make inlinable.

include/core/SkInstCnt.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkInstCnt_DEFINED
 #define SkInstCnt_DEFINED
 
 /*
  * The instance counting system consists of three macros that create the
  * instance counting machinery. A class is added to the system by adding:
  *   SK_DECLARE_INST_COUNT at the top of its declaration for derived classes
  *   SK_DECLARE_INST_COUNT_ROOT at the top of its declaration for a root class
  * At the end of an application a call to all the "root" objects'
  * CheckInstanceCount methods should be made
  */
 #include "SkTypes.h"
 
 #if SK_ENABLE_INST_COUNT
 #include "SkTArray.h"
-#include "SkThread_platform.h"
+#include "SkThread.h"
 
 extern bool gPrintInstCount;
 
 // The non-root classes just register themselves with their parent
 #define SK_DECLARE_INST_COUNT(className)                                    \
     SK_DECLARE_INST_COUNT_INTERNAL(className,                               \
                                    INHERITED::AddInstChild(CheckInstanceCount);)
 
 // The root classes registers a function to print out the memory stats when
 // the app ends
@@ skipping 83 matching lines @@
 #define SK_DECLARE_INST_COUNT(className) static void AddInstChild() { INHERITED::AddInstChild(); }
 #define SK_DECLARE_INST_COUNT_ROOT(className) static void AddInstChild() { }
 #endif
 
 // Following are deprecated. They are defined only for backwards API compatibility.
 #define SK_DECLARE_INST_COUNT_TEMPLATE(className) SK_DECLARE_INST_COUNT(className)
 #define SK_DEFINE_INST_COUNT(className)
 #define SK_DEFINE_INST_COUNT_TEMPLATE(templateInfo, className)
 
 #endif // SkInstCnt_DEFINED