summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@google.com>2014-07-24 19:18:14 -0400
committerBehdad Esfahbod <behdad@google.com>2014-07-24 19:18:14 -0400
commitf0a1e5b2da5aaccbc1c010413365cd8c304cf5d9 (patch)
treece0073076e2c8aaf5a7170553da2df97fd62261a /include
parent8e7a3dae37e9a22b2c054aec852615843d71caf6 (diff)
downloadandroid_frameworks_minikin-f0a1e5b2da5aaccbc1c010413365cd8c304cf5d9.tar.gz
android_frameworks_minikin-f0a1e5b2da5aaccbc1c010413365cd8c304cf5d9.tar.bz2
android_frameworks_minikin-f0a1e5b2da5aaccbc1c010413365cd8c304cf5d9.zip
Remove deprecated API
It has been unused outside minikin. Change-Id: Iaa2237767d81c77f90d0264e633375e601dd72f1
Diffstat (limited to 'include')
-rw-r--r--include/minikin/Layout.h11
1 files changed, 1 insertions, 10 deletions
diff --git a/include/minikin/Layout.h b/include/minikin/Layout.h
index e30f2f2..11e5819 100644
--- a/include/minikin/Layout.h
+++ b/include/minikin/Layout.h
@@ -68,19 +68,13 @@ public:
void dump() const;
void setFontCollection(const FontCollection* collection);
- // deprecated - missing functionality
- void doLayout(const uint16_t* buf, size_t nchars);
-
void doLayout(const uint16_t* buf, size_t start, size_t count, size_t bufSize,
const std::string& css);
void draw(Bitmap*, int x0, int y0, float size) const;
- // deprecated - pass as argument to doLayout instead
- void setProperties(const std::string& css);
-
// This must be called before any invocations.
- // TODO: probably have a factory instead
+ // TODO: probably have a factory instead
static void init();
// public accessors
@@ -122,9 +116,6 @@ private:
// Append another layout (for example, cached value) into this one
void appendLayout(Layout* src, size_t start);
- // deprecated - remove when setProperties is removed
- std::string mCssString;
-
std::vector<LayoutGlyph> mGlyphs;
std::vector<float> mAdvances;