370 Commits

Author SHA1 Message Date
Dan Willemsen
512defc2b8 Use LOCAL_TEST_DATA to install test data am: 068eab8ffa am: 2344eecf96
am: 3aca9aeeb8

Change-Id: I3d7dd7c58c544e90176f25cac568c10facce726b
2016-12-15 20:32:52 +00:00
Dan Willemsen
3aca9aeeb8 Use LOCAL_TEST_DATA to install test data am: 068eab8ffa
am: 2344eecf96

Change-Id: Ie02fbdc89e59707c899175dadb9700a4873f8010
2016-12-15 20:25:53 +00:00
Dan Willemsen
2344eecf96 Use LOCAL_TEST_DATA to install test data
am: 068eab8ffa

Change-Id: I09c27394d95417a0bb8b0ee8a48580e6e88dc8c6
2016-12-15 20:18:22 +00:00
Dan Willemsen
068eab8ffa Use LOCAL_TEST_DATA to install test data
This will handle installation for local builds as well as for the test
bundles.

Test: m -j minikin_tests; ls $OUT/data/nativetest*/minikin_tests
Test: m -j continous_native_tests dist; zipinfo -1 out/dist/*continuous_native_tests*.zip
Test: /data/nativetest{,64}/minikin_tests/minikin_tests
Change-Id: Iafd31fa119e7c4d92937ca8ae8346e268a6c1f38
Merged-In: Iafd31fa119e7c4d92937ca8ae8346e268a6c1f38
2016-12-15 18:47:17 +00:00
Colin Cross
50fbc9db9e Merge "Move LOCAL_PICKUP_FILES out of $OUT/data" am: c4b8bdc4ba am: 930de2656b
am: 03a647911f

Change-Id: I5bd69940f0e495119dd6154fb9e1efe34fa9a062
2016-12-09 02:10:36 +00:00
Colin Cross
03a647911f Merge "Move LOCAL_PICKUP_FILES out of $OUT/data" am: c4b8bdc4ba
am: 930de2656b

Change-Id: I1e38ef5ae3a4d6a977df856abbb160b2e5fcde4e
2016-12-09 02:05:35 +00:00
Colin Cross
930de2656b Merge "Move LOCAL_PICKUP_FILES out of $OUT/data"
am: c4b8bdc4ba

Change-Id: I0aac6741d2c92bbe46fdf89931460fbb41acc1ea
2016-12-09 02:01:37 +00:00
Colin Cross
c4b8bdc4ba Merge "Move LOCAL_PICKUP_FILES out of $OUT/data" 2016-12-09 01:53:13 +00:00
Colin Cross
2e621342bf Move LOCAL_PICKUP_FILES out of $OUT/data
minikin_tests was copying its test data to
$OUT/data/DATA/nativetest/minikin_test, and then packaging that with
LOCAL_PICKUP_FILES=$OUT/data/DATA, which would also pick up anything
any other module copyied to $OUT/data/DATA.  $OUT/data/DATA isn't
where the tests expect to find their data, they look in
/data/nativetest/minikin_test.  Copy the files to the intermediates
directory instead.

A future change will install LOCAL_PICKUP_FILES for local builds
to the correct place, so adb sync and
adb shell /data/nativetest/minikin_tests/minikin_tests will run the
tests.

Test: mma -j
Change-Id: I808ce743f51e5ccac711e22821e7e0d7cd94ffdf
2016-12-02 18:04:42 -08:00
Dan Willemsen
229f35a43a Merge "Rename libicuuc-host/libicui18n-host to libicuuc/libicui18n" am: 00b9a21209 am: acad3df882
am: f58fc7b5ff

Change-Id: I346fddaa5822eee2371d877a8bdeb055b6244c0d
2016-09-13 03:58:51 +00:00
Dan Willemsen
f58fc7b5ff Merge "Rename libicuuc-host/libicui18n-host to libicuuc/libicui18n" am: 00b9a21209
am: acad3df882

Change-Id: Ia8b56a95d11d74af5a2cac1fe8e604532c44a9cf
2016-09-13 03:56:10 +00:00
Dan Willemsen
acad3df882 Merge "Rename libicuuc-host/libicui18n-host to libicuuc/libicui18n"
am: 00b9a21209

Change-Id: Ia005ecb8dedc90aa8a908edda839da563152e861
2016-09-13 03:51:13 +00:00
Dan Willemsen
00b9a21209 Merge "Rename libicuuc-host/libicui18n-host to libicuuc/libicui18n" 2016-09-13 03:47:02 +00:00
Elliott Hughes
bb3df55710 Switch minikin to std::unique_ptr. am: 6261d82459 am: e716bdbd48
am: 2583c5c86b

Change-Id: I9c0b81d55e01b08b053a7031a214626351244607
2016-09-13 01:29:45 +00:00
Elliott Hughes
2583c5c86b Switch minikin to std::unique_ptr. am: 6261d82459
am: e716bdbd48

Change-Id: Ie9f9aac239cb29568819de699e4999989a7a11bf
2016-09-13 01:27:07 +00:00
Elliott Hughes
e716bdbd48 Switch minikin to std::unique_ptr.
am: 6261d82459

Change-Id: I91198bdae7aac9638e6ef3553b0eacac021d4f93
2016-09-13 01:24:37 +00:00
Elliott Hughes
6261d82459 Switch minikin to std::unique_ptr.
Bug: http://b/22403888
Change-Id: I9e18496fcc38ad2e6b922455daa9f2a46778ec55
2016-09-12 15:29:35 -07:00
Dan Willemsen
ccfc696dfc Rename libicuuc-host/libicui18n-host to libicuuc/libicui18n
These modules can be named the same between the target and host
libraries, which simplifies references to them, particularly in
Soong.

To prevent accidentally loading the system copy of the library,
we still rename the installed name to be libicu*-host.so. But
modules do not need to know that in order to build against them.

Change-Id: Ic38499bb236ace75333a84f23798af023e14cf5f
2016-09-12 14:37:02 -07:00
Chih-Hung Hsieh
e189ad9531 Fix google-explicit-constructor warnings in minikin am: 0114c6a1cf -s ours am: 8402f2eee8
am: 593cccabe7

Change-Id: I3623a0f372da99c5a189bc5900b3f55bc3d7b0be
2016-08-16 21:14:54 +00:00
Chih-Hung Hsieh
593cccabe7 Fix google-explicit-constructor warnings in minikin am: 0114c6a1cf -s ours
am: 8402f2eee8

Change-Id: Idf3e3882894774d917166e4eec743fb8bea0c31b
2016-08-16 21:13:13 +00:00
Chih-Hung Hsieh
8402f2eee8 Fix google-explicit-constructor warnings in minikin
am: 0114c6a1cf  -s ours

Change-Id: I51c71217e402c3cbeefd6de5ccf7252dc1687f76
2016-08-16 21:08:26 +00:00
Chih-Hung Hsieh
0114c6a1cf Fix google-explicit-constructor warnings in minikin
* Add explicit keyword to conversion constructors,
  or add NOLINT(implicit) for implicit converters.
Bug: 28341362
Test: build with WITH_TIDY=1

Change-Id: I0c7b90f9bb953a9f2e4f0fb2032fa65ac604b9ca
Merged-In: I0c7b90f9bb953a9f2e4f0fb2032fa65ac604b9ca
2016-08-16 01:48:48 +00:00
Roozbeh Pournader
f83d57f7e5 Revert "Lookup glyph from color emoji font before and after ZWJ." am: 1aa0c40db9
am: de728a34c9

Change-Id: Id1b94e72ccd480bf5395752868f7f26e17ab7491
2016-08-11 23:36:50 +00:00
Roozbeh Pournader
de728a34c9 Revert "Lookup glyph from color emoji font before and after ZWJ."
am: 1aa0c40db9

Change-Id: Icc8b76ebd3edfdeb7622bf21a6585b191cf5b15f
2016-08-11 23:32:49 +00:00
Roozbeh Pournader
1aa0c40db9 Revert "Lookup glyph from color emoji font before and after ZWJ."
This reverts commit 9431bb96406121d2eb3fda8ca8209edc434f96a0.

Bug: 30815709
Change-Id: I057d9bcd05246e58894abb4e9633bd10f6fab211
2016-08-11 21:03:00 +00:00
Seigo Nonaka
9480fd77f5 Lookup glyph from color emoji font before and after ZWJ.
am: 9431bb9640

Change-Id: Ic4900b65ed16a2ba3b5431d12a093654b7921a9b
2016-07-14 22:43:47 +00:00
Seigo Nonaka
249152f8e1 Treat U+2695, U+2640, U+2642 as emoji characters.
am: c2642f9a33

Change-Id: I551ee1c4c5368dde3bf2ab7d016634991b62f212
2016-07-14 22:43:47 +00:00
Seigo Nonaka
b746bef0ba Add some gender balanced components in to the sticky whitelist.
am: fab99dde4b

Change-Id: Ieda8b25bba40f22c9d8c33aba590e96e3396f6c4
2016-07-14 22:43:46 +00:00
Seigo Nonaka
9431bb9640 Lookup glyph from color emoji font before and after ZWJ.
Unicode recommends that the zwj sequences should be emoji presentation
even if they don't have the proper U+FE0F. Thus always lookup the glyph
for the code point before and after zwj as if they have a U+FE0F
variation selector.

Bug: 30056627
Change-Id: I03958a92337eaba4a8dd9c5be824b2665aa4a103
2016-07-13 14:12:06 -07:00
Seigo Nonaka
c2642f9a33 Treat U+2695, U+2640, U+2642 as emoji characters.
Bug: 29885295
Change-Id: I1bf191a46d05e7099265d863bae0523c50817d0b
2016-07-13 14:05:02 -07:00
Seigo Nonaka
fab99dde4b Add some gender balanced components in to the sticky whitelist.
FEMALE SIGN(U+2640), MALE SIGN(U+2642), StAFF OF AESCULAPIUS(U+2695)
will be used as the ZWJ sequenced in gender balanced emoji sequence.
To be in the same run with ZWJ, mark these emoji as sticky chracters.

With this fix, Female police officer sequence will be shown correctly
regardless of VS16.

Bug: 30026374
Change-Id: I503fc061eaa943d45208bb69e885151610c430ce
2016-07-13 14:01:41 -07:00
Roozbeh Pournader
b11b991fe7 Do not break after Myanmar viramas am: 74b56175e5
am: 8614b0420c

* commit '8614b0420cef56449c0db72f5098360c31867b06':

Change-Id: I4437e1206de2a45593e69956d8bcdf85a64b0f32
2016-05-26 02:31:31 +00:00
Roozbeh Pournader
b4bbae3202 Do not break after Myanmar viramas am: 74b56175e5
am: 00de2cc363

* commit '00de2cc3631df7ee3d755956bbf4ec6812d5517f':
  Do not break after Myanmar viramas

Change-Id: I2e240fab84a49c73165056ee5ff18dbfca0faeec
2016-05-26 02:21:28 +00:00
Roozbeh Pournader
00de2cc363 Do not break after Myanmar viramas
am: 74b56175e5

* commit '74b56175e5d41c1c1dc992208842b5576973d452':
  Do not break after Myanmar viramas

Change-Id: I13297120c3c3789c03b860c9e72b3a04922ab9fa
2016-05-26 01:44:33 +00:00
Roozbeh Pournader
8614b0420c Do not break after Myanmar viramas
am: 74b56175e5

* commit '74b56175e5d41c1c1dc992208842b5576973d452':
  Do not break after Myanmar viramas

Change-Id: Idb9303889ac87853a730cdb25fba7faaaf352b93
2016-05-26 01:44:33 +00:00
Roozbeh Pournader
74b56175e5 Do not break after Myanmar viramas
This is to work around a bug in ICU's line breaker, which thinks
there is a valid line break between a Myanmar kinzi and a consonant.
See http://bugs.icu-project.org/trac/ticket/12561 for the ICU bug.

Bug: 28964845
Change-Id: I076ac15077e5627cbccf6732900bcc60d8596dda
2016-05-25 16:46:56 -07:00
Seigo Nonaka
bf94219d63 Do not break before and after ZWJ. am: 77f4883
am: f9783b1

* commit 'f9783b1322800306d83d853e8a2de3322213313a':

Change-Id: I5a637871133d3e45c47c5b6dc8407bda946dbd62
2016-04-19 18:46:15 +00:00
Seigo Nonaka
8010ad473b Do not break before and after ZWJ. am: 77f4883
am: 3bee494

* commit '3bee494eead989500c38d98f7f863986e95e25e0':
  Do not break before and after ZWJ.

Change-Id: If1fe6c6192aae09bab68a00bc94aba3e768dd445
2016-04-19 18:42:30 +00:00
Seigo Nonaka
f9783b1322 Do not break before and after ZWJ.
am: 77f4883

* commit '77f488345316fba46c271fc04bea470819ae1712':
  Do not break before and after ZWJ.

Change-Id: Ic476d9048b44b84c69fd185b76108c961d8e8545
2016-04-19 18:39:03 +00:00
Seigo Nonaka
3bee494eea Do not break before and after ZWJ.
am: 77f4883

* commit '77f488345316fba46c271fc04bea470819ae1712':
  Do not break before and after ZWJ.

Change-Id: I00a0e31c19dd5b2fbe2ffb389bec4001dec5d6c1
2016-04-19 18:38:59 +00:00
Seigo Nonaka
77f4883453 Do not break before and after ZWJ.
The emoji list is generated from external/unicode/emoji-data.txt

Bug: 28248662
Change-Id: Ie49b3782505665d62c24371ca23d317ae5e9c5f7
2016-04-19 14:09:38 +00:00
Seigo Nonaka
34c784e5ef Returns hasVariationSelector true for VS15/VS16
am: 994aa84

* commit '994aa84f7b18466806fe552ea57da1852b909f24':
  Returns hasVariationSelector true for VS15/VS16

Change-Id: Iff3953948c8457e2a85e5859559411511a326f33
2016-04-15 15:31:59 +00:00
Seigo Nonaka
994aa84f7b Returns hasVariationSelector true for VS15/VS16
Minikin has a special font fallback for VS15/VS16, so
hasVariationSelector for emojis with VS15/VS16 should always return
true.

Bug: 27531970
Change-Id: Ieebd58f48b135b6ec50d999df68dcc09b1284606
2016-04-15 12:45:04 +09:00
Raph Levien
4d42baffd1 Merge "Clear mLineWidths in LineBreaker::finish()" into nyc-dev
am: b1203b6

* commit 'b1203b648acb109fddd537f8d76d168b7f70103e':
  Clear mLineWidths in LineBreaker::finish()

Change-Id: I968a1584b9f2d2242725b8ab7047091ca9ecd6ee
2016-04-13 16:21:38 +00:00
Raph Levien
b1203b648a Merge "Clear mLineWidths in LineBreaker::finish()" into nyc-dev 2016-04-13 16:11:56 +00:00
Raph Levien
879e8a3a47 Clear mLineWidths in LineBreaker::finish()
There was the possibility of stale indents from previous invocations
persisting in the mLineWidths across multiple invocations. This patch
clears them.

Bug: 28090810
Change-Id: I3621dfbe983512046289373711709aeade52eab4
2016-04-12 15:27:17 -07:00
Seigo Nonaka
af36413cd8 Fix minikin_unittests
am: 6c60831

* commit '6c60831cfce24b0749f50f37231e0a56d8fd4b85':
  Fix minikin_unittests

Change-Id: I865dd495ed60b0bbace0ba77b2071dac058887e9
2016-04-11 21:01:14 +00:00
Seigo Nonaka
6c60831cfc Fix minikin_unittests
This CL fixes following test cases in minikin_tests
- FontFamilyTest.hasVariationSelectorTest
- HbFontCacheTest.getHbFontLockedTest
- HbFontCacheTest.purgeCacheTest

For the fix of FontFamilyTest.hasVariationSelectorTest, removing virtual
from GetUniqueId() in MinikinFont.  After [1], MinikinFont's destructor
started calling purgeHbCache() which calls virtual method,
MinikinFont::GetUniqueId().  Fortunately, the SkTypeface::uniqueID()
returns just internal value, so we can store it at the construction time
and use it instead of calling SkTypeface::uniqueID() every time.

This patch also changes purgeHbFont to purgeHbFontLocked, as all uses of
it were already under global mutex. This change avoids deadlock on
explicit unref, as when invoked by a Java finalizer from the Java object
that holds a reference to the font.

Some of the tests needed to change to using the ref counting protocol
rather than explicitly destructing font objects, as well.

[1] 9afcc6e2bd4d89e4e1deb6e18c3c4daca4e114fd

Bug: 28105730
Bug: 28105688
Change-Id: Ie5983c4869147dacabdca81af1605066cd680b3f
2016-04-11 13:33:35 -07:00
Raph Levien
bfc161d8fa Update minikin/sample code to use new GetTable
am: 29abb82

* commit '29abb82198868908ece4600284fa8b7d3ed73f3b':
  Update minikin/sample code to use new GetTable

Change-Id: I5fcae79c42322dcc0533dbd3eb1a51007e089170
2016-04-08 17:55:14 +00:00
Raph Levien
29abb82198 Update minikin/sample code to use new GetTable
We changed the signature of the MinikinFont::GetTable method. This
patch updates the sample code, and fixes the build.

Change-Id: I1977be868bf7636986fc802915f3dd54c418a73a
2016-04-08 10:28:47 -07:00