Have /src files use header directly.

BUG=skia:

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

gyp/views.gyp

@@ -20,6 +20,7 @@
         'xml.gyp:xml',
       ],
       'include_dirs': [
+        '../include/private',
         '../include/views',
         '../include/views/unix',
         '../src/gpu',

src/core/SkAAClip.cpp

@@ -7,7 +7,7 @@
  */
 
 #include "SkAAClip.h"
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 #include "SkBlitter.h"
 #include "SkColorPriv.h"
 #include "SkPath.h"

src/core/SkBitmap.cpp

@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 #include "SkBitmap.h"
 #include "SkColorPriv.h"
 #include "SkData.h"

src/core/SkBitmapHeap.h

@@ -8,7 +8,7 @@
 #ifndef SkBitmapHeap_DEFINED
 #define SkBitmapHeap_DEFINED
 
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 #include "SkBitmap.h"
 #include "SkPoint.h"
 #include "SkRefCnt.h"

src/core/SkClipStack.cpp

@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 #include "SkCanvas.h"
 #include "SkClipStack.h"
 #include "SkPath.h"

src/core/SkDrawable.cpp

@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 #include "SkCanvas.h"
 #include "SkDrawable.h"
 

src/core/SkPicture.cpp

@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 #include "SkMessageBus.h"
 #include "SkPicture.h"
 #include "SkPictureData.h"

src/core/SkRegion.cpp

@@ -7,7 +7,7 @@
  */
 
 
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 #include "SkRegionPriv.h"
 #include "SkTemplates.h"
 #include "SkUtils.h"

src/core/SkRegionPriv.h

@@ -11,7 +11,7 @@
 #define SkRegionPriv_DEFINED
 
 #include "SkRegion.h"
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 
 #define assert_sentinel(value, isSentinel) \
     SkASSERT(((value) == SkRegion::kRunTypeSentinel) == isSentinel)

src/core/SkShader.cpp

@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 #include "SkBitmapProcShader.h"
 #include "SkColorShader.h"
 #include "SkEmptyShader.h"

src/core/SkSharedMutex.cpp

@@ -7,7 +7,7 @@
 
 #include "SkSharedMutex.h"
 
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 #include "SkTypes.h"
 #include "../private/SkSemaphore.h"
 

src/core/SkSharedMutex.h

@@ -8,7 +8,7 @@
 #ifndef SkSharedLock_DEFINED
 #define SkSharedLock_DEFINED
 
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 #include "SkSemaphore.h"
 #include "SkTypes.h"
 

src/core/SkString.cpp

@@ -7,7 +7,7 @@
  */
 
 
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 #include "SkFixed.h"
 #include "SkString.h"
 #include "SkUtils.h"

src/core/SkTLS.cpp

@@ -12,7 +12,7 @@
 
 
 #ifdef SK_TRACE_TLS_LIFETIME
-    #include "../private/SkAtomics.h"
+    #include "SkAtomics.h"
     static int32_t gTLSRecCount;
 #endif
 

src/core/SkTaskGroup.h

@@ -9,7 +9,7 @@
 #define SkTaskGroup_DEFINED
 
 #include "SkTypes.h"
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 #include "SkTemplates.h"
 
 struct SkRunnable;

src/core/SkTraceEvent.h

@@ -10,7 +10,7 @@
 #ifndef SkTraceEvent_DEFINED
 #define SkTraceEvent_DEFINED
 
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 #include "SkEventTracer.h"
 #include "SkTraceEventCommon.h"
 

src/core/SkTypefaceCache.cpp

@@ -9,7 +9,7 @@
 
 
 #include "SkTypefaceCache.h"
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 #include "SkMutex.h"
 
 #define TYPEFACE_CACHE_LIMIT    1024

src/image/SkImage_Base.h

@@ -8,7 +8,7 @@
 #ifndef SkImage_Base_DEFINED
 #define SkImage_Base_DEFINED
 
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 #include "SkImage.h"
 #include "SkSurface.h"
 

src/image/SkImage_Gpu.h

@@ -8,7 +8,7 @@
 #ifndef SkImage_Gpu_DEFINED
 #define SkImage_Gpu_DEFINED
 
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 #include "GrTexture.h"
 #include "GrGpuResourcePriv.h"
 #include "SkBitmap.h"

src/utils/SkEventTracer.cpp

@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 #include "SkEventTracer.h"
 #include "SkOncePtr.h"
 

src/views/SkOSMenu.cpp

@@ -4,7 +4,7 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#include "../private/SkAtomics.h"
+#include "SkAtomics.h"
 #include "SkOSMenu.h"
 #include <stdarg.h>