diff options
| author | Tom Hudson <tomhudson@google.com> | 2014-10-16 11:57:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-16 11:57:16 +0000 |
| commit | 07c05e38a1d82181b9e52329e80eea1a4dfccd9a (patch) | |
| tree | 7c8dd24b54f26990d547d1670e5905fa9c6fcccb /libs/hwui/font | |
| parent | d44e9f9ed714dbd2e1dc93dff3f97b95ab01a977 (diff) | |
| parent | 2dc236b2bae13b9a0ed9b3f7320502aecd7983b3 (diff) | |
| download | frameworks_base-07c05e38a1d82181b9e52329e80eea1a4dfccd9a.zip frameworks_base-07c05e38a1d82181b9e52329e80eea1a4dfccd9a.tar.gz frameworks_base-07c05e38a1d82181b9e52329e80eea1a4dfccd9a.tar.bz2 | |
Merge "Clean up physical coupling"
Diffstat (limited to 'libs/hwui/font')
| -rw-r--r-- | libs/hwui/font/CacheTexture.cpp | 1 | ||||
| -rw-r--r-- | libs/hwui/font/CacheTexture.h | 1 | ||||
| -rw-r--r-- | libs/hwui/font/CachedGlyphInfo.h | 4 | ||||
| -rw-r--r-- | libs/hwui/font/Font.h | 4 | ||||
| -rw-r--r-- | libs/hwui/font/FontUtil.h | 2 |
5 files changed, 6 insertions, 6 deletions
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" 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" 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; diff --git a/libs/hwui/font/Font.h b/libs/hwui/font/Font.h index 595cc49..d54bc44 100644 --- a/libs/hwui/font/Font.h +++ b/libs/hwui/font/Font.h @@ -27,7 +27,7 @@ #include <SkPaint.h> #include <SkPathMeasure.h> -#include "CachedGlyphInfo.h" +#include "FontUtil.h" #include "../Rect.h" #include "../Matrix.h" @@ -38,6 +38,8 @@ namespace uirenderer { // Font /////////////////////////////////////////////////////////////////////////////// +class CachedGlyphInfo; +class CacheTexture; class FontRenderer; /** 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 /////////////////////////////////////////////////////////////////////////////// |