Revert of Remove SkThread.h, include SkMutex.h or SkAtomics.h as appropriate.

src/core/SkBitmapHeap.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 SkBitmapHeap_DEFINED
 #define SkBitmapHeap_DEFINED
 
 #include "SkBitmap.h"
 #include "SkFlattenable.h"
 #include "SkRefCnt.h"
 #include "SkTDArray.h"
-#include "SkAtomics.h"
+#include "SkThread.h"
 
 /**
  * SkBitmapHeapEntry provides users of SkBitmapHeap (using internal storage) with a means to...
  *  (1) get access a bitmap in the heap
  *  (2) indicate they are done with bitmap by releasing their reference (if they were an owner).
  */
 class SkBitmapHeapEntry : SkNoncopyable {
 public:
     ~SkBitmapHeapEntry();
 
@@ skipping 19 matching lines @@
     // reclaimed.
     size_t fBytesAllocated;
 
     friend class SkBitmapHeap;
     friend class SkBitmapHeapTester;
 };
 
 
 class SkBitmapHeapReader : public SkRefCnt {
 public:
-
+    
 
     SkBitmapHeapReader() : INHERITED() {}
     virtual SkBitmap* getBitmap(int32_t slot) const = 0;
     virtual void releaseRef(int32_t slot) = 0;
 private:
     typedef SkRefCnt INHERITED;
 };
 
 
 /**
  * TODO: stores immutable bitmaps into a heap
  */
 class SkBitmapHeap : public SkBitmapHeapReader {
 public:
     class ExternalStorage : public SkRefCnt {
      public:
-
+        
 
         virtual bool insert(const SkBitmap& bitmap, int32_t slot) = 0;
 
      private:
         typedef SkRefCnt INHERITED;
     };
 
     static const int32_t UNLIMITED_SIZE = -1;
     static const int32_t IGNORE_OWNERS  = -1;
     static const int32_t INVALID_SLOT   = -1;
@@ skipping 206 matching lines @@
     const int32_t fOwnerCount;
     size_t fBytesAllocated;
 
     bool fDeferAddingOwners;
     SkTDArray<int> fDeferredEntries;
 
     typedef SkBitmapHeapReader INHERITED;
 };
 
 #endif // SkBitmapHeap_DEFINED