commit c46813d72464f950b6f945f46a979caeaa05d21b
author Leon Scroggins III <scroggo@google.com> Tue Feb 16 10:20:11 2016 -0500
committer Leon Scroggins <scroggo@google.com> Tue Feb 16 16:32:13 2016 +0000
tree b017a3dc3050c227a521ae351a44c755b0949d4a
parent 5db2f16f15549c490c9541602a96f42bef984acb

Clean up some Skia includes

Neither of these files need SkScalerContext.h. Remove those includes.
One really needs SkGlyph.h, so include it instead.

Change-Id: Ic7cfce9e7784c9290c5a2dfdd8385b65d32f9b76

libs/hwui/font/CacheTexture.h

diff --git a/libs/hwui/font/CacheTexture.h b/libs/hwui/font/CacheTexture.h
index 5510666..4dfb41d 100644
--- a/libs/hwui/font/CacheTexture.h
+++ b/libs/hwui/font/CacheTexture.h
@@ -23,7 +23,7 @@
 #include "Vertex.h"
 
 #include <GLES3/gl3.h>
-#include <SkScalerContext.h>
+#include <SkGlyph.h>
 #include <utils/Log.h>
 
 

libs/hwui/font/Font.h

diff --git a/libs/hwui/font/Font.h b/libs/hwui/font/Font.h
index e8882d9..288f733 100644
--- a/libs/hwui/font/Font.h
+++ b/libs/hwui/font/Font.h
@@ -23,7 +23,6 @@
 
 #include <SkScalar.h>
 #include <SkGlyphCache.h>
-#include <SkScalerContext.h>
 #include <SkPaint.h>
 #include <SkPathMeasure.h>