SkTypes: more into SkMacros

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

8 files changed, 10 insertions, 3 deletions

diff --git a/src/core/SkAAClip.cpp b/src/core/SkAAClip.cpp
index 54d6726e65..46c09e0ca5 100644
--- a/src/core/SkAAClip.cpp
+++ b/src/core/SkAAClip.cpp
@@ -10,6 +10,7 @@
 #include "SkAtomics.h"
 #include "SkBlitter.h"
 #include "SkColorData.h"
+#include "SkMacros.h"
 #include "SkPath.h"
 #include "SkRectPriv.h"
 #include "SkScan.h"
diff --git a/src/core/SkBitmapProcState.cpp b/src/core/SkBitmapProcState.cpp
index 2f727397d9..105637176a 100644
--- a/src/core/SkBitmapProcState.cpp
+++ b/src/core/SkBitmapProcState.cpp
@@ -9,6 +9,7 @@
 #include "SkBitmapController.h"
 #include "SkBitmapProcState.h"
 #include "SkColorData.h"
+#include "SkMacros.h"
 #include "SkPaint.h"
 #include "SkShader.h"   // for tilemodes
 #include "SkUtilsArm.h"
diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp
index 14c1063668..58489b9ec8 100644
--- a/src/core/SkDraw.cpp
+++ b/src/core/SkDraw.cpp
@@ -17,6 +17,7 @@
 #include "SkDrawProcs.h"
 #include "SkFindAndPlaceGlyph.h"
 #include "SkMaskFilterBase.h"
+#include "SkMacros.h"
 #include "SkMatrix.h"
 #include "SkMatrixUtils.h"
 #include "SkPaint.h"
diff --git a/src/core/SkEdgeClipper.cpp b/src/core/SkEdgeClipper.cpp
index 2abbd1b1d4..b2b95fc78e 100644
--- a/src/core/SkEdgeClipper.cpp
+++ b/src/core/SkEdgeClipper.cpp
@@ -5,10 +5,10 @@
  * found in the LICENSE file.
  */
 
-
 #include "SkEdgeClipper.h"
 #include "SkGeometry.h"
 #include "SkLineClipper.h"
+#include "SkMacros.h"
 
 static bool quick_reject(const SkRect& bounds, const SkRect& clip) {
     return bounds.fTop >= clip.fBottom || bounds.fBottom <= clip.fTop;
diff --git a/src/core/SkRegion.cpp b/src/core/SkRegion.cpp
index 6ae8e5b5f9..3d48f3696b 100644
--- a/src/core/SkRegion.cpp
+++ b/src/core/SkRegion.cpp
@@ -8,6 +8,7 @@
 #include "SkRegion.h"
 
 #include "SkAtomics.h"
+#include "SkMacros.h"
 #include "SkRegionPriv.h"
 #include "SkSafeMath.h"
 #include "SkTemplates.h"
diff --git a/src/core/SkScalerContext.h b/src/core/SkScalerContext.h
index 4a799f90dd..6d4b9151ee 100644
--- a/src/core/SkScalerContext.h
+++ b/src/core/SkScalerContext.h
@@ -11,6 +11,7 @@
 #include <memory>
 
 #include "SkGlyph.h"
+#include "SkMacros.h"
 #include "SkMask.h"
 #include "SkMaskFilter.h"
 #include "SkMaskGamma.h"
diff --git a/src/core/SkScan_Path.cpp b/src/core/SkScan_Path.cpp
index 89ef4ca32d..c26a22476e 100644
--- a/src/core/SkScan_Path.cpp
+++ b/src/core/SkScan_Path.cpp
@@ -5,19 +5,20 @@
  * found in the LICENSE file.
  */
 
-#include "SkScanPriv.h"
 #include "SkBlitter.h"
 #include "SkEdge.h"
 #include "SkEdgeBuilder.h"
 #include "SkGeometry.h"
+#include "SkMacros.h"
 #include "SkPath.h"
 #include "SkQuadClipper.h"
 #include "SkRasterClip.h"
 #include "SkRectPriv.h"
 #include "SkRegion.h"
 #include "SkSafe32.h"
-#include "SkTemplates.h"
+#include "SkScanPriv.h"
 #include "SkTSort.h"
+#include "SkTemplates.h"
 
 #define kEDGE_HEAD_Y    SK_MinS32
 #define kEDGE_TAIL_Y    SK_MaxS32
diff --git a/src/core/SkStroke.cpp b/src/core/SkStroke.cpp
index f08ea2b211..bb216d12d1 100644
--- a/src/core/SkStroke.cpp
+++ b/src/core/SkStroke.cpp
@@ -8,6 +8,7 @@
 #include "SkStrokerPriv.h"
 
 #include "SkGeometry.h"
+#include "SkMacros.h"
 #include "SkPathPriv.h"
 #include "SkPointPriv.h"
 #include "SkTo.h"