Revert "SkMath takes some functions from from SkTypes"
This reverts commit 3b347232bc0fd576792474562e474a7a8278200d.
Reason for revert: tree done gone red.
Original change's description:
> SkMath takes some functions from from SkTypes
>
> Moved to include/core/SkMath.h: Sk{Is|}Align{2|4|8|Ptr}, SkLeftShift,
> SkAbs{32|}, SkM{ax|in}32 SkTM{in|ax}, SkTClamp, SkFastMin32, SkTPin.
>
> Change-Id: Ibcc07be0fc3677731048e7cc86006e7aa493cb92
> Reviewed-on: https://skia-review.googlesource.com/133381
> Auto-Submit: Hal Canary <halcanary@google.com>
> Reviewed-by: Ben Wagner <bungeman@google.com>
> Commit-Queue: Hal Canary <halcanary@google.com>
TBR=mtklein@google.com,halcanary@google.com,bungeman@google.com,reed@google.com
Change-Id: I44073cf397e2a3a6a941a90f0aa63c6396d4c742
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/152587
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
diff --git a/include/gpu/GrContextOptions.h b/include/gpu/GrContextOptions.h
index 95d3881..79f6503 100644
--- a/include/gpu/GrContextOptions.h
+++ b/include/gpu/GrContextOptions.h
@@ -8,12 +8,11 @@
#ifndef GrContextOptions_DEFINED
#define GrContextOptions_DEFINED
-#include "../private/GrTypesPriv.h"
-#include "SkMath.h"
-#include "GrDriverBugWorkarounds.h"
-#include "GrTypes.h"
#include "SkData.h"
#include "SkTypes.h"
+#include "GrTypes.h"
+#include "../private/GrTypesPriv.h"
+#include "GrDriverBugWorkarounds.h"
#include <vector>