aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/GrDistanceFieldGenFromVector.cpp
diff options
context:
space:
mode:
authorGravatar Hal Canary <halcanary@google.com>2017-01-10 15:02:26 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-01-11 15:36:45 +0000
commita5494f117086d712855e4b6289c58c92d1549bcf (patch)
tree1f43412b8e0d5047f738d26e1bb165b29b542af8 /src/gpu/GrDistanceFieldGenFromVector.cpp
parent21d742dbafde600d7f0d3b7de95cd083dd54ad97 (diff)
SkTypes.h : move SkAutoMalloc into SkAutoMalloc.h
* SkAutoFree moved to SkTemplates.h (now implmented with unique_ptr). * SkAutoMalloc and SkAutoSMalloc moved to SkAutoMalloc.h * "SkAutoFree X(sk_malloc_throw(N));" --> "SkAutoMalloc X(N);" Change-Id: Idacd86ca09e22bf092422228599ae0d9bedded88 Reviewed-on: https://skia-review.googlesource.com/4543 Reviewed-by: Ben Wagner <bungeman@google.com> Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'src/gpu/GrDistanceFieldGenFromVector.cpp')
-rw-r--r--src/gpu/GrDistanceFieldGenFromVector.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/gpu/GrDistanceFieldGenFromVector.cpp b/src/gpu/GrDistanceFieldGenFromVector.cpp
index 8179500660..4a509e67af 100644
--- a/src/gpu/GrDistanceFieldGenFromVector.cpp
+++ b/src/gpu/GrDistanceFieldGenFromVector.cpp
@@ -7,12 +7,14 @@
#include "SkDistanceFieldGen.h"
#include "GrDistanceFieldGenFromVector.h"
-#include "SkMatrix.h"
-#include "SkPoint.h"
+
+#include "GrConfig.h"
+#include "GrPathUtils.h"
+#include "SkAutoMalloc.h"
#include "SkGeometry.h"
+#include "SkMatrix.h"
#include "SkPathOps.h"
-#include "GrPathUtils.h"
-#include "GrConfig.h"
+#include "SkPoint.h"
/**
* If a scanline (a row of texel) cross from the kRight_SegSide