Revert "Remove SkThread.h from public API."

Too much depends on SkThread being in include/core in Chrome build.

This reverts commit b1aec17df6078115c797839c9646081ccba2bd09.

NOTREECHECKS=true
NOTRY=true
R=reed@google.com, mtklein@google.com
TBR=reed

BUG=skia:

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/303813003

git-svn-id: http://skia.googlecode.com/svn/trunk@14934 2bbb7eff-a529-9590-31e7-b0007b416f81

9 files changed, 9 insertions, 11 deletions

diff --git a/include/core/SkInstCnt.h b/include/core/SkInstCnt.h
index 9b5fb28449..7e5b454b15 100644
--- a/include/core/SkInstCnt.h
+++ b/include/core/SkInstCnt.h
@@ -29,7 +29,7 @@
 
 #include "SkOnce.h"
 #include "SkTArray.h"
-#include "../../src/core/SkThread.h"
+#include "SkThread.h"
 extern bool gPrintInstCount;
 
 // The non-root classes just register themselves with their parent
diff --git a/include/core/SkOnce.h b/include/core/SkOnce.h
index 0e981e2144..d5330b9408 100644
--- a/include/core/SkOnce.h
+++ b/include/core/SkOnce.h
@@ -29,10 +29,9 @@
 // You may optionally pass SkOnce a second function to be called at exit for cleanup.
 
 #include "SkDynamicAnnotations.h"
+#include "SkThread.h"
 #include "SkTypes.h"
 
-#include "../../src/core/SkThread.h"
-
 #define SK_ONCE_INIT { false, { 0, SkDEBUGCODE(0) } }
 #define SK_DECLARE_STATIC_ONCE(name) static SkOnceFlag name = SK_ONCE_INIT
 
diff --git a/include/core/SkRefCnt.h b/include/core/SkRefCnt.h
index 8074a8511f..41c78293fa 100644
--- a/include/core/SkRefCnt.h
+++ b/include/core/SkRefCnt.h
@@ -11,11 +11,10 @@
 #define SkRefCnt_DEFINED
 
 #include "SkDynamicAnnotations.h"
+#include "SkThread.h"
 #include "SkInstCnt.h"
 #include "SkTemplates.h"
 
-#include "../../src/core/SkThread.h"
-
 /** \class SkRefCntBase
 
     SkRefCntBase is the base class for objects that may be shared by multiple
diff --git a/src/core/SkThread.h b/include/core/SkThread.h
index c8cd4e9112..c8cd4e9112 100644
--- a/src/core/SkThread.h
+++ b/include/core/SkThread.h
diff --git a/include/core/SkWeakRefCnt.h b/include/core/SkWeakRefCnt.h
index f165257f89..210dcc9f1c 100644
--- a/include/core/SkWeakRefCnt.h
+++ b/include/core/SkWeakRefCnt.h
@@ -9,7 +9,7 @@
 #define SkWeakRefCnt_DEFINED
 
 #include "SkRefCnt.h"
-#include "../../src/core/SkThread.h"
+#include "SkThread.h"
 
 /** \class SkWeakRefCnt
 
diff --git a/include/gpu/GrBackendEffectFactory.h b/include/gpu/GrBackendEffectFactory.h
index 81f908863a..0fc981cbe9 100644
--- a/include/gpu/GrBackendEffectFactory.h
+++ b/include/gpu/GrBackendEffectFactory.h
@@ -10,10 +10,9 @@
 
 #include "GrTypes.h"
 #include "SkTemplates.h"
+#include "SkThread.h"
 #include "SkTypes.h"
 
-#include "../../src/core/SkThread.h"
-
 /** Given a GrEffect of a particular type, creates the corresponding graphics-backend-specific
     effect object. Also tracks equivalence of shaders generated via a key. Each factory instance
     is assigned a generation ID at construction. The ID of the return of GrEffect::getFactory()
diff --git a/src/views/SkEvent.cpp b/src/views/SkEvent.cpp
index c9dd3ea532..52a0c4dd7f 100644
--- a/src/views/SkEvent.cpp
+++ b/src/views/SkEvent.cpp
@@ -265,7 +265,7 @@ void SkEvent::inflate(const SkDOM& dom, const SkDOM::Node* node)
     #define EVENT_LOGN(s, n)
 #endif
 
-#include "../../src/core/SkThread.h"
+#include "SkThread.h"
 #include "SkTime.h"
 
 class SkEvent_Globals {
diff --git a/src/views/SkEventSink.cpp b/src/views/SkEventSink.cpp
index 5b533276ee..7763adef54 100644
--- a/src/views/SkEventSink.cpp
+++ b/src/views/SkEventSink.cpp
@@ -9,8 +9,9 @@
 
 #include "SkEventSink.h"
 #include "SkTagList.h"
+#include "SkThread.h"
 
-#include "../../src/core/SkThread.h"
+#include "SkThread.h"
 #include "SkTime.h"
 
 class SkEventSink_Globals {
diff --git a/src/views/SkOSMenu.cpp b/src/views/SkOSMenu.cpp
index 36543d1e00..3de0a9eb77 100644
--- a/src/views/SkOSMenu.cpp
+++ b/src/views/SkOSMenu.cpp
@@ -6,7 +6,7 @@
  */
 #include <stdarg.h>
 #include "SkOSMenu.h"
-#include "../../src/core/SkThread.h"
+#include "SkThread.h"
 
 static int gOSMenuCmd = 7000;