356 Commits

Author SHA1 Message Date
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
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
Raph Levien
0b5d3b2bea Avoid copying of font table data
am: aaa4e34

* commit 'aaa4e3470270496e6eb80704eadecb2cb7c56bf0':
  Avoid copying of font table data

Change-Id: Idc4074ebf93595fa0420986814462095730f00c2
2016-04-08 16:49:56 +00:00
Raph Levien
aaa4e34702 Avoid copying of font table data
The hb_font_t object holds on to tables of font data, acquired through
the MinikinFont::GetTable interface, which is based on copying data
into caller-owned buffers. Now that we're caching lots of hb_font_t's,
the cost of these buffers is significant.

This patch moves to a different interface, inspired by HarfBuzz's
hb_reference_table API, where the font can provide a pointer to the
actual font data (which will often be mmap'ed, so it doesn't even
consume physical RAM).

Bug: 27860101
Change-Id: Id766ab16a8d342bf7322a90e076e801271d527d4
2016-04-08 08:26:38 -07:00
Raph Levien
aa49542698 Purge hb font on Minikin font destruction
am: 9afcc6e

* commit '9afcc6e2bd4d89e4e1deb6e18c3c4daca4e114fd':
  Purge hb font on Minikin font destruction

Change-Id: Idb2034353407e8b390cc07862803f846d5adea0c
2016-04-07 22:38:47 +00:00
Raph Levien
9afcc6e2bd Purge hb font on Minikin font destruction
This patch eagerly purges the corresponding hb_font_t object from
the HbFontCache when the underlying MinikinFont is destroyed. After
that, the key will no longer be accessed, so having the entry is
wastes memory.

Bug: 27251075
Bug: 27860101
Change-Id: I1b98016133fe3baf6525ac37d970a65ddccadb4f
2016-04-07 13:43:15 -07:00
Seigo Nonaka
5f7df3eca5 Support multiple locales for font language settings.
am: f3afe92

* commit 'f3afe92def0fff022889fd036d68451223aac146':
  Support multiple locales for font language settings.

Change-Id: Iad60bf1c01f309e70c3b1ad22e28b22afe44b33f
2016-04-05 06:42:58 +00:00
Seigo Nonaka
f3afe92def Support multiple locales for font language settings.
Some fonts support multiple scripts, for example, some fonts for
Korean supports not only "Kore" but also "Jamo".

To select fonts based on their multiple languages, this CL introduces
the following changes:
- Compares all languages of the font family and use the maximum score
  for font selection.
- Even if each language of the font family doesn't support the requested
  language, the font get score of 2 if the requested font is covered by
  all of the languages of the font family. For example, the font for
  "ko-Hang,ko-Hani" gets score of 2 for the requested language "ko-Kore".

Bug: 26687969

Change-Id: I7f13b51464c9b01982bb573251d77052b9ddbd70
2016-04-04 22:31:16 +09:00
Roozbeh Pournader
85593542c4 Try putting combining marks in the same font run
am: 16ed4ef

* commit '16ed4ef07ed8fb2333447b48055633bf8d4f38e4':
  Try putting combining marks in the same font run

Change-Id: I6f76b791acde2dc8209e8d33da02d148a9f790d8
2016-03-31 18:25:12 +00:00
Roozbeh Pournader
16ed4ef07e Try putting combining marks in the same font run
Indic combining marks, when combined with a common character such as
a hyphen or a dotted circle, used to get rendered in a different font
due to the greedy algorithm used in determining runs, which resulted
in the base character and the combining mark getting rendered in
separate font runs, resulting in a dotted circle appearing in phrases
such as "100-ാം" (0031 0030 0030 002D 0D3E 0D02).

This change makes combining marks change the font run of the base
character if the base character is supported in the same font as the
combining mark, similar to the support for emoji modifiers and the
combining keycap.

Bug: 25036888
Bug: 24535344
Change-Id: I8e2798e8ecb8efaf723a0fd02c05c6fbdef8b365
2016-03-30 17:48:34 -07:00
Roozbeh Pournader
4293c2a94e Do not allow line breaks before currency symbols
am: d8917c6

* commit 'd8917c69a9f7b7ca52f7ac850922dab4322113f5':
  Do not allow line breaks before currency symbols
2016-03-17 18:16:22 +00:00
Roozbeh Pournader
d8917c69a9 Do not allow line breaks before currency symbols
Implement the change proposed in UTC document L2/16-043R
(http://www.unicode.org/L2/L2016/16043r-line-break-pr-po.txt) to make
sure we do not break between letters and currency symbols.

Bug: 24959657
Change-Id: Ia29d0e5625f84870bd910d0c6e19036d17206704
2016-03-16 16:21:09 -07:00
Seigo Nonaka
dac051349c Suppress log span due to returning null for itemize result.
am: cee83d4032

* commit 'cee83d40324b1f3b8e113eb8c9eda8e12ef36923':
  Suppress log span due to returning null for itemize result.
2016-03-07 18:01:37 +00:00
Seigo Nonaka
cee83d4032 Suppress log span due to returning null for itemize result.
Bug: 26808815
Change-Id: I2a5a52f2c441d27c7ef270342b4ef93c3de9e56e
2016-03-03 15:51:55 -08:00
Seigo Nonaka
28de1b3fce Break regional indicators at even numbered code points.
am: 450e96c817

* commit '450e96c8170c3d59a5896e734c90d3f9def505f8':
  Break regional indicators at even numbered code points.
2016-03-03 13:10:53 +00:00
Seigo Nonaka
450e96c817 Break regional indicators at even numbered code points.
Bug: 23288449
Change-Id: If1419ff9e44e8e640616979bae88311f414b42a1
2016-03-02 17:44:14 -08:00