commit 2dc236b2bae13b9a0ed9b3f7320502aecd7983b3
author Tom Hudson <tomhudson@google.com> Wed Oct 15 15:46:42 2014 -0400
committer Tom Hudson <tomhudson@google.com> Wed Oct 15 15:51:39 2014 -0400
tree 0fdb6c210ba1cba9397252a69d05fdf72e6f35a9
parent 6cbb42186e990c401da1e1dbc465fd58fde158a1

Clean up physical coupling

Narrow the use of #include directives in hwui, replacing with forward
declarations where straightforward. Speeds compiles; doesn't do any
restructuring of code.

Change-Id: Icac2baffb5896f55d8c6718e9bd9d4bfa02d3ca0

libs/hwui/font/CacheTexture.cpp

diff --git a/libs/hwui/font/CacheTexture.cpp b/libs/hwui/font/CacheTexture.cpp
index 24ffb80..380c0ed 100644
--- a/libs/hwui/font/CacheTexture.cpp
+++ b/libs/hwui/font/CacheTexture.cpp
@@ -17,6 +17,7 @@
 #include <SkGlyph.h>
 
 #include "CacheTexture.h"
+#include "FontUtil.h"
 #include "../Caches.h"
 #include "../Debug.h"
 #include "../Extensions.h"

libs/hwui/font/CacheTexture.h

diff --git a/libs/hwui/font/CacheTexture.h b/libs/hwui/font/CacheTexture.h
index 4cc4f22..a107c7a 100644
--- a/libs/hwui/font/CacheTexture.h
+++ b/libs/hwui/font/CacheTexture.h
@@ -23,7 +23,6 @@
 
 #include <utils/Log.h>
 
-#include "FontUtil.h"
 #include "../PixelBuffer.h"
 #include "../Rect.h"
 #include "../Vertex.h"

libs/hwui/font/CachedGlyphInfo.h

diff --git a/libs/hwui/font/CachedGlyphInfo.h b/libs/hwui/font/CachedGlyphInfo.h
index 6680a00..0642d59 100644
--- a/libs/hwui/font/CachedGlyphInfo.h
+++ b/libs/hwui/font/CachedGlyphInfo.h
@@ -19,11 +19,11 @@
 
 #include <SkFixed.h>
 
-#include "CacheTexture.h"
-
 namespace android {
 namespace uirenderer {
 
+class CacheTexture;
+
 struct CachedGlyphInfo {
     // Has the cache been invalidated?
     bool mIsValid;

libs/hwui/font/Font.h

diff --git a/libs/hwui/font/Font.h b/libs/hwui/font/Font.h
index 0f10464..af9bb50 100644
--- a/libs/hwui/font/Font.h
+++ b/libs/hwui/font/Font.h
@@ -28,7 +28,7 @@
 #include <SkPaint.h>
 #include <SkPathMeasure.h>
 
-#include "CachedGlyphInfo.h"
+#include "FontUtil.h"
 #include "../Rect.h"
 #include "../Matrix.h"
 
@@ -39,6 +39,8 @@
 // Font
 ///////////////////////////////////////////////////////////////////////////////
 
+class CachedGlyphInfo;
+class CacheTexture;
 class FontRenderer;
 
 /**

libs/hwui/font/FontUtil.h

diff --git a/libs/hwui/font/FontUtil.h b/libs/hwui/font/FontUtil.h
index c2fd5f5..e302afb 100644
--- a/libs/hwui/font/FontUtil.h
+++ b/libs/hwui/font/FontUtil.h
@@ -19,8 +19,6 @@
 
 #include <SkUtils.h>
 
-#include "Properties.h"
-
 ///////////////////////////////////////////////////////////////////////////////
 // Defines
 ///////////////////////////////////////////////////////////////////////////////