diff options
| author | Behdad Esfahbod <behdad@google.com> | 2014-07-25 19:30:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-24 15:37:54 +0000 |
| commit | c437f6eef2e92fd1ca1c542a8e41315253ec7747 (patch) | |
| tree | 86167820487cf016778358da4c2881596ba0298e /core/jni/android/graphics/MinikinUtils.h | |
| parent | b9333b5970911343950900a6f46dcbbd6d920ce9 (diff) | |
| parent | 63c5c78a72a21d57913e8601cc2a1ab72a424a02 (diff) | |
| download | frameworks_base-c437f6eef2e92fd1ca1c542a8e41315253ec7747.zip frameworks_base-c437f6eef2e92fd1ca1c542a8e41315253ec7747.tar.gz frameworks_base-c437f6eef2e92fd1ca1c542a8e41315253ec7747.tar.bz2 | |
Merge "Further centralize Minikin interaction" into lmp-dev
Diffstat (limited to 'core/jni/android/graphics/MinikinUtils.h')
| -rw-r--r-- | core/jni/android/graphics/MinikinUtils.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/jni/android/graphics/MinikinUtils.h b/core/jni/android/graphics/MinikinUtils.h index 0562c3b..647cbd8 100644 --- a/core/jni/android/graphics/MinikinUtils.h +++ b/core/jni/android/graphics/MinikinUtils.h @@ -45,8 +45,8 @@ class TypefaceImpl; class MinikinUtils { public: - static std::string setLayoutProperties(Layout* layout, const Paint* paint, int bidiFlags, - TypefaceImpl* typeface); + static void doLayout(Layout* layout, const Paint* paint, int bidiFlags, TypefaceImpl* typeface, + const uint16_t* buf, size_t start, size_t count, size_t bufSize); static float xOffsetForTextAlign(Paint* paint, const Layout& layout); |