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

src/views/SkEventSink.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkEventSink.h"
-#include "SkMutex.h"
 #include "SkTagList.h"
+#include "SkThread.h"
+
+#include "SkThread.h"
 #include "SkTime.h"
 
 class SkEventSink_Globals {
 public:
     SkEventSink_Globals() {
         fNextSinkID = 0;
         fSinkHead = NULL;
     }
 
     SkMutex         fSinkMutex;
@@ skipping 224 matching lines @@
         sink = sink->fNextSink;
     }
     return NULL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////
 
 #if 0   // experimental, not tested
 
-#include "SkMutex.h"
+#include "SkThread.h"
 #include "SkTDict.h"
 
 #define kMinStringBufferSize    128
 SK_DECLARE_STATIC_MUTEX(gNamedSinkMutex);
 static SkTDict<SkEventSinkID>   gNamedSinkIDs(kMinStringBufferSize);
 
 /** Register a name/id pair with the system. If the name already exists,
     replace its ID with the new id. This pair will persist until UnregisterNamedSink()
     is called.
 */
@@ skipping 24 matching lines @@
 /** Remove all name/id pairs from the system. This is call internally
     on shutdown, to ensure no memory leaks. It should not be called
     before shutdown.
 */
 void SkEventSink::RemoveAllNamedSinkIDs()
 {
     SkAutoMutexAcquire  ac(gNamedSinkMutex);
     (void)gNamedSinkIDs.reset();
 }
 #endif