OSDN Git Service

Switch all text layout to Minikin
authorRaph Levien <raph@google.com>
Wed, 25 Jun 2014 23:32:13 +0000 (16:32 -0700)
committerRaph Levien <raph@google.com>
Thu, 26 Jun 2014 15:23:48 +0000 (08:23 -0700)
commit3660789f06c5fbcb81e6c7c79612048bff8f0f66
tree196563ff00e0e273611914c875b90b07e340ea01
parentd194262f53799ef7cd660729a8f1027263f73e27
Switch all text layout to Minikin

This patch switches all text layout operations to use Minikin, removes
the USE_MINIKIN #ifdef, and deletes some of the code that was only used
in the old TextLayout path (although some more refactoring remains).

Change-Id: I51b5c4e2bb46cfd9d204c12b9f16f135c769f5b5
13 files changed:
core/jni/Android.mk
core/jni/android/graphics/Canvas.cpp
core/jni/android/graphics/FontFamily.cpp
core/jni/android/graphics/MinikinUtils.h
core/jni/android/graphics/Paint.cpp
core/jni/android/graphics/TextLayout.cpp [deleted file]
core/jni/android/graphics/TextLayoutCache.cpp [deleted file]
core/jni/android/graphics/TextLayoutCache.h [deleted file]
core/jni/android/graphics/Typeface.cpp
core/jni/android/graphics/TypefaceImpl.cpp
core/jni/android/graphics/TypefaceImpl.h
core/jni/android_view_GLES20Canvas.cpp
graphics/java/android/graphics/Typeface.java