summaryrefslogtreecommitdiffstats
path: root/include/minikin/Layout.h
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@google.com>2014-07-29 12:46:07 -0400
committerBehdad Esfahbod <behdad@google.com>2014-07-29 12:46:07 -0400
commit09f1901d6befcab49ed46cb77151a5d4af14a3b9 (patch)
treec52c933c28a0cb2a88b1a6ff1e5dc6a225740f7f /include/minikin/Layout.h
parent41b1aa18d7c32b4383993cd1b0a7e2e6648be14e (diff)
downloadandroid_frameworks_minikin-09f1901d6befcab49ed46cb77151a5d4af14a3b9.tar.gz
android_frameworks_minikin-09f1901d6befcab49ed46cb77151a5d4af14a3b9.tar.bz2
android_frameworks_minikin-09f1901d6befcab49ed46cb77151a5d4af14a3b9.zip
Add doLayout variant that does NOT take css string
New API removes CSS string and directly takes needed objects. Bug: 16651112 Change-Id: Ie5f7c2ab05be6cbd77cae0a5fd6bb453771ada59
Diffstat (limited to 'include/minikin/Layout.h')
-rw-r--r--include/minikin/Layout.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/minikin/Layout.h b/include/minikin/Layout.h
index 11e5819..cd08e00 100644
--- a/include/minikin/Layout.h
+++ b/include/minikin/Layout.h
@@ -68,9 +68,13 @@ public:
void dump() const;
void setFontCollection(const FontCollection* collection);
+ // Deprecated. Will be removed.
void doLayout(const uint16_t* buf, size_t start, size_t count, size_t bufSize,
const std::string& css);
+ void doLayout(const uint16_t* buf, size_t start, size_t count, size_t bufSize,
+ int bidiFlags, const FontStyle &style, const MinikinPaint &paint);
+
void draw(Bitmap*, int x0, int y0, float size) const;
// This must be called before any invocations.