SkMacros split from SkTypes.h

Change-Id: I383719ee181c6925ebf62ffc70e1c0f12ee7cf84
Reviewed-on: https://skia-review.googlesource.com/134326
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>

11 files changed, 15 insertions, 6 deletions

diff --git a/src/codec/SkPngCodec.cpp b/src/codec/SkPngCodec.cpp
index 31a407c670..1cb1c74621 100644
--- a/src/codec/SkPngCodec.cpp
+++ b/src/codec/SkPngCodec.cpp
@@ -11,6 +11,7 @@
 #include "SkColorSpace.h"
 #include "SkColorSpacePriv.h"
 #include "SkColorTable.h"
+#include "SkMacros.h"
 #include "SkMath.h"
 #include "SkOpts.h"
 #include "SkPngCodec.h"
diff --git a/src/core/SkAutoBlitterChoose.h b/src/core/SkAutoBlitterChoose.h
index b6c0433fbf..40d438e02c 100644
--- a/src/core/SkAutoBlitterChoose.h
+++ b/src/core/SkAutoBlitterChoose.h
@@ -11,6 +11,7 @@
 #include "SkArenaAlloc.h"
 #include "SkBlitter.h"
 #include "SkDraw.h"
+#include "SkMacros.h"
 
 class SkMatrix;
 class SkPaint;
diff --git a/src/core/SkAutoMalloc.h b/src/core/SkAutoMalloc.h
index f5c872954d..9c6dad959e 100644
--- a/src/core/SkAutoMalloc.h
+++ b/src/core/SkAutoMalloc.h
@@ -8,8 +8,9 @@
 #ifndef SkAutoMalloc_DEFINED
 #define SkAutoMalloc_DEFINED
 
-#include "SkTypes.h"
+#include "SkMacros.h"
 #include "SkMalloc.h"
+#include "SkTypes.h"
 
 #include <memory>
 
diff --git a/src/core/SkDescriptor.h b/src/core/SkDescriptor.h
index 4bae7be8f6..7f1939dcc2 100644
--- a/src/core/SkDescriptor.h
+++ b/src/core/SkDescriptor.h
@@ -5,10 +5,10 @@
  * found in the LICENSE file.
  */
 
-
 #ifndef SkDescriptor_DEFINED
 #define SkDescriptor_DEFINED
 
+#include "SkMacros.h"
 #include "SkOpts.h"
 #include "SkTo.h"
 #include "SkTypes.h"
diff --git a/src/core/SkMask.h b/src/core/SkMask.h
index 337664d9da..89d83528d9 100644
--- a/src/core/SkMask.h
+++ b/src/core/SkMask.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -6,11 +5,11 @@
  * found in the LICENSE file.
  */
 
-
 #ifndef SkMask_DEFINED
 #define SkMask_DEFINED
 
 #include "SkColorPriv.h"
+#include "SkMacros.h"
 #include "SkRect.h"
 #include "SkTemplates.h"
 
diff --git a/src/core/SkPath.cpp b/src/core/SkPath.cpp
index cabc116ea1..605454bcf7 100644
--- a/src/core/SkPath.cpp
+++ b/src/core/SkPath.cpp
@@ -11,6 +11,7 @@
 #include "SkCubicClipper.h"
 #include "SkData.h"
 #include "SkGeometry.h"
+#include "SkMacros.h"
 #include "SkMath.h"
 #include "SkMatrixPriv.h"
 #include "SkPathPriv.h"
diff --git a/src/core/SkRasterClip.h b/src/core/SkRasterClip.h
index e7d77ab370..ff80824afd 100644
--- a/src/core/SkRasterClip.h
+++ b/src/core/SkRasterClip.h
@@ -8,8 +8,9 @@
 #ifndef SkRasterClip_DEFINED
 #define SkRasterClip_DEFINED
 
-#include "SkRegion.h"
 #include "SkAAClip.h"
+#include "SkMacros.h"
+#include "SkRegion.h"
 
 class SkRRect;
 
diff --git a/src/core/SkScopeExit.h b/src/core/SkScopeExit.h
index bdec7b34f0..4c9adcd0d8 100644
--- a/src/core/SkScopeExit.h
+++ b/src/core/SkScopeExit.h
@@ -9,6 +9,8 @@
 #define SkScopeExit_DEFINED
 
 #include "SkTypes.h"
+#include "SkMacros.h"
+
 #include <functional>
 
 /** SkScopeExit calls a std:::function<void()> in its destructor. */
diff --git a/src/core/SkSharedMutex.h b/src/core/SkSharedMutex.h
index 21c9f46d64..33f1f10246 100644
--- a/src/core/SkSharedMutex.h
+++ b/src/core/SkSharedMutex.h
@@ -9,6 +9,7 @@
 #define SkSharedLock_DEFINED
 
 #include "SkAtomics.h"
+#include "SkMacros.h"
 #include "SkSemaphore.h"
 #include "SkTypes.h"
 
diff --git a/src/gpu/vk/GrVkUtil.h b/src/gpu/vk/GrVkUtil.h
index 08eef1a1d0..71cc5d4e6a 100644
--- a/src/gpu/vk/GrVkUtil.h
+++ b/src/gpu/vk/GrVkUtil.h
@@ -10,9 +10,10 @@
 
 #include "GrColor.h"
 #include "GrTypes.h"
+#include "SkMacros.h"
+#include "ir/SkSLProgram.h"
 #include "vk/GrVkDefines.h"
 #include "vk/GrVkInterface.h"
-#include "ir/SkSLProgram.h"
 
 class GrVkGpu;
 
diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp
index d98e68fc9f..85e92ce840 100644
--- a/src/ports/SkFontHost_win.cpp
+++ b/src/ports/SkFontHost_win.cpp
@@ -16,6 +16,7 @@
 #include "SkFontDescriptor.h"
 #include "SkGlyph.h"
 #include "SkHRESULT.h"
+#include "SkMacros.h"
 #include "SkMakeUnique.h"
 #include "SkMaskGamma.h"
 #include "SkMatrix22.h"