320 Commits

Author SHA1 Message Date
Raph Levien
85759c393c Avoid copying of font table data
am: a8e8948

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

Change-Id: Idc4074ebf93595fa0420986814462095730f00c2
2016-04-08 16:49:56 +00:00
Raph Levien
a8e8948bd7 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
03f300c8b2 Purge hb font on Minikin font destruction
am: 1ea4165

* commit '1ea4165cef7651770fe28a0eada3da593bb149ad':
  Purge hb font on Minikin font destruction

Change-Id: Idb2034353407e8b390cc07862803f846d5adea0c
2016-04-07 22:38:47 +00:00
Raph Levien
1ea4165cef 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
6b5aa7786f Support multiple locales for font language settings.
am: dbcbe1f

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

Change-Id: Iad60bf1c01f309e70c3b1ad22e28b22afe44b33f
2016-04-05 06:42:58 +00:00
Seigo Nonaka
dbcbe1f426 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
d923389bd6 Try putting combining marks in the same font run
am: c9c0359

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

Change-Id: I6f76b791acde2dc8209e8d33da02d148a9f790d8
2016-03-31 18:25:12 +00:00
Roozbeh Pournader
c9c0359b1d 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
7f8f696818 Do not allow line breaks before currency symbols
am: 0eaf80b

* commit '0eaf80b016b6780250227b8273692d2b8978816f':
  Do not allow line breaks before currency symbols
2016-03-17 18:16:22 +00:00
Roozbeh Pournader
0eaf80b016 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
045e8676e8 Suppress log span due to returning null for itemize result.
am: 5ccdf654f5

* commit '5ccdf654f5695be1b582a3bd89482bc6915cc22a':
  Suppress log span due to returning null for itemize result.
2016-03-07 18:01:37 +00:00
Seigo Nonaka
5ccdf654f5 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
10ca65d93a Break regional indicators at even numbered code points.
am: f4c679ca68

* commit 'f4c679ca680ed79d2a9dee20d375c87f187149b6':
  Break regional indicators at even numbered code points.
2016-03-03 13:10:53 +00:00
Seigo Nonaka
f4c679ca68 Break regional indicators at even numbered code points.
Bug: 23288449
Change-Id: If1419ff9e44e8e640616979bae88311f414b42a1
2016-03-02 17:44:14 -08:00
Raph Levien
6e4fb94eb0 Fix wrong conditions in isEmojiBase
am: a58530bccc

* commit 'a58530bccc426e86dd6ae3f6be6703599b7d52a4':
  Fix wrong conditions in isEmojiBase
2016-02-27 15:57:02 +00:00
Raph Levien
a58530bccc Fix wrong conditions in isEmojiBase
I computed ranges using low <= c || c <= high, should be &&.

Bug: 26829153
Change-Id: Ic1002d90b6a408a0b415f2d117d0e57adcbc2fa9
2016-02-27 07:43:56 -08:00
Raph Levien
6a8eae727f Suppress line breaks in emoji + modifier
am: 7f9de429d4

* commit '7f9de429d43556e288e512313421c2a54513c8c4':
  Suppress line breaks in emoji + modifier
2016-02-26 20:17:27 +00:00
Raph Levien
7f9de429d4 Suppress line breaks in emoji + modifier
An emoji base with an emoji modifier renders as a single glyph and
thus should not be a line break. Current (Unicode 8) logic does
indicate a line break, so we override the results of the ICU line
break iterator. The code references a proposal to improve Unicode
behavior; when that is adopted and we upgrade ICU accordingly, the
special-case code should be deleted, but the tests can remain.

Bug: 27343378
Change-Id: I5de9c53e9a34c503816f9131e3d894e6f7a57d13
2016-02-26 19:05:34 +00:00
Seigo Nonaka
442481c200 Use color font if skin tone is specified.
am: b7d66e3db0

* commit 'b7d66e3db0473ace4ddfd3b553c4e9796e49c410':
  Use color font if skin tone is specified.
2016-02-26 03:22:09 +00:00
Seigo Nonaka
b7d66e3db0 Use color font if skin tone is specified.
If skin tone is specified, the base emoji should be emoji style even
if it is text presentation default emoji.

This patch also removes wrong test case which expects default emoji
presentation but it is controlled by family order in /etc/fonts.xml
and there is no special logic for default presentation in minikin.
Thus the default presentation unit test should not be in minikin.

Bug: 27342346

Change-Id: I74a2b2feab4d559535049e368cfd833063cce81c
2016-02-26 11:26:30 +09:00
Raph Levien
bccbdfb377 Merge "Suppress grapheme cluster breaks in emoji with modifiers" into nyc-dev
am: 336d826c44

* commit '336d826c44264bbca59a7ee52809a516534f9b7e':
  Suppress grapheme cluster breaks in emoji with modifiers
2016-02-24 21:07:45 +00:00
Raph Levien
336d826c44 Merge "Suppress grapheme cluster breaks in emoji with modifiers" into nyc-dev 2016-02-24 20:58:55 +00:00
Raph Levien
675933f271 Suppress grapheme cluster breaks in emoji with modifiers
An emoji with a modifier should be treated as a single grapheme, i.e.
it should not be possible to place the cursor between the base and
modifier.  This patch implements the proposed Rule GB9c from Mark
Davis's proposal entitled "Fixing breaking properties for emoji",
L2/16-011R3.

The patch also skips over variation sequences attached the to the
preceding character, for computing grapheme cluster boundaries.

Bug: 26829153
Change-Id: Iff5bc2bb8e5246223a017c7cf33acfbf63817f16
2016-02-24 12:43:36 -08:00
Seigo Nonaka
a69b250e65 Merge "Support Hanb script." into nyc-dev
am: 9b2942bfe6

* commit '9b2942bfe6ed152b142163fa173831674ba17464':
  Support Hanb script.
2016-02-23 04:04:44 +00:00
Seigo Nonaka
9b2942bfe6 Merge "Support Hanb script." into nyc-dev 2016-02-23 03:57:58 +00:00
Raph Levien
aca6476db8 Merge "Suppress linebreaks in emoji ZWJ sequences" into nyc-dev
am: e87aac42d0

* commit 'e87aac42d0f7c80a0836d4cde29ed36e4e848003':
  Suppress linebreaks in emoji ZWJ sequences
2016-02-19 18:02:35 +00:00
Raph Levien
e87aac42d0 Merge "Suppress linebreaks in emoji ZWJ sequences" into nyc-dev 2016-02-19 17:53:48 +00:00
Keisuke Kuroyanagi
d43f5022d2 Optimize: Use measureText instead of doLayout.
am: 761218bce9

* commit '761218bce9059c4c73e5089ce5924913cbd5fb6f':
  Optimize: Use measureText instead of doLayout.
2016-02-18 23:30:50 +00:00
Raph Levien
a14712eaf8 Suppress linebreaks in emoji ZWJ sequences
Due to the way emoji ZWJ sequences are defined, the ICU line breaking
algorithm determines that there are valid line breaks inside the
sequence. This patch suppresses these line breaks.

This is an adaptation of I225ebebc0f4186e4b8f48fee399c4a62b3f0218a
into the nyc-dev branch.

Bug: 25433289
Change-Id: I84b50b1e6ef13d436965eab389659d02a30d100f
2016-02-18 15:00:24 -08:00
Keisuke Kuroyanagi
761218bce9 Optimize: Use measureText instead of doLayout.
With this CL, measureText is used for getRunAdvance,
getOffsetForAdvance and line breaking.

Bug: 24505153
Change-Id: Ib699f6b1391b46537736fc274cdb41686586b550
2016-02-18 11:46:48 -08:00
Raph Levien
b708833cf3 Disable hyphenation when word overlaps style boundary
am: 72ab39455f

* commit '72ab39455f2fe587116066d5ec66d75cd89f0114':
  Disable hyphenation when word overlaps style boundary
2016-02-18 19:16:02 +00:00
Raph Levien
72ab39455f Disable hyphenation when word overlaps style boundary
In cases when a word (as defined by the ICU break iterator) overlaps a
style boundary, the returned wordStart can be extend before the range
currently being measured for layout. When we try to hyphenate the
resulting substrings, we get a negative range, which crashes. This
patch disables hyphenation in this case.

Bug: 27237112
Change-Id: I76d04b39dd3b4d6d267aaaf4bebc9ab361891646
2016-02-18 10:33:14 -08:00
Seigo Nonaka
77c3f8eb24 Support Hanb script.
Hanb is a union of Han and Bopomofo.

Bug: 26687969
Change-Id: Ic696bcbbc9607f3842fd0115668b8e7bd917e62b
2016-02-18 18:28:52 +09:00
Seigo Nonaka
80904b8960 Merge "Improve Paint.measureText and Paint.hasGlyph for variation sequences." into nyc-dev
am: 082dc16139

* commit '082dc16139a239d6df3c78b9ef5542e38d6405d0':
  Improve Paint.measureText and Paint.hasGlyph for variation sequences.
2016-02-18 04:38:00 +00:00
Seigo Nonaka
082dc16139 Merge "Improve Paint.measureText and Paint.hasGlyph for variation sequences." into nyc-dev 2016-02-18 04:33:36 +00:00
Raph Levien
5649913f3e Add error logging on invalid cmap - DO NOT MERGE am: ac3b9bc4ea am: 055b8c8cda -s ours am: c4ed0af154 am: 0eb5239cf5 -s ours am: 794c4d930b am: 7cfeeaeb0b am: fbf13599d9 -s ours
am: 7a9fa36d3d

* commit '7a9fa36d3d6fa1691d6436e8c9b9e234913f140f':
  Add error logging on invalid cmap - DO NOT MERGE
2016-02-18 00:30:43 +00:00
Raph Levien
7a9fa36d3d Add error logging on invalid cmap - DO NOT MERGE am: ac3b9bc4ea am: 055b8c8cda -s ours am: c4ed0af154 am: 0eb5239cf5 -s ours am: 794c4d930b am: 7cfeeaeb0b
am: fbf13599d9  -s ours

* commit 'fbf13599d9138547e1d56734c033d3637193a0bd':
  Add error logging on invalid cmap - DO NOT MERGE
2016-02-18 00:19:02 +00:00
Raph Levien
0f7db07b2d Add error logging on invalid cmap am: 9e8fd1dff7 am: 78bf54cc23 am: 83f28ad6b6
am: 960c6bd18b

* commit '960c6bd18b30accc4c18a468d42e31edcfde3da6':
  Add error logging on invalid cmap
2016-02-18 00:17:26 +00:00
Raph Levien
88645a5b0f Add penalty for breaks in URLs and email addresses
am: 76772e8ad4

* commit '76772e8ad4a88cbe87edc873dd66af7d0baf6a25':
  Add penalty for breaks in URLs and email addresses
2016-02-18 00:17:18 +00:00
Raph Levien
fbf13599d9 Add error logging on invalid cmap - DO NOT MERGE am: ac3b9bc4ea am: 055b8c8cda -s ours am: c4ed0af154 am: 0eb5239cf5 -s ours am: 794c4d930b
am: 7cfeeaeb0b

* commit '7cfeeaeb0bb7db7e86f5f7839031c580629f25ad':
  Add error logging on invalid cmap - DO NOT MERGE
2016-02-18 00:13:35 +00:00
Raph Levien
7cfeeaeb0b Add error logging on invalid cmap - DO NOT MERGE am: ac3b9bc4ea am: 055b8c8cda -s ours am: c4ed0af154 am: 0eb5239cf5 -s ours
am: 794c4d930b

* commit '794c4d930bb6a3a74734ab5f89897bb6eb92c117':
  Add error logging on invalid cmap - DO NOT MERGE
2016-02-18 00:04:40 +00:00
Raph Levien
794c4d930b Add error logging on invalid cmap - DO NOT MERGE am: ac3b9bc4ea am: 055b8c8cda -s ours am: c4ed0af154
am: 0eb5239cf5  -s ours

* commit '0eb5239cf5fdae1de84a93e0881add6cb4ead7f6':
  Add error logging on invalid cmap - DO NOT MERGE
2016-02-17 23:59:33 +00:00
Raph Levien
960c6bd18b Add error logging on invalid cmap am: 9e8fd1dff7 am: 78bf54cc23
am: 83f28ad6b6

* commit '83f28ad6b687d09fb14c5f76673376962cd563cd':
  Add error logging on invalid cmap
2016-02-17 23:55:18 +00:00
Raph Levien
0eb5239cf5 Add error logging on invalid cmap - DO NOT MERGE am: ac3b9bc4ea am: 055b8c8cda -s ours
am: c4ed0af154

* commit 'c4ed0af1541b7592f9b5b0a9f2c281f150db8c39':
  Add error logging on invalid cmap - DO NOT MERGE
2016-02-17 23:55:07 +00:00
Raph Levien
83f28ad6b6 Add error logging on invalid cmap am: 9e8fd1dff7
am: 78bf54cc23

* commit '78bf54cc23fd7752302e9e39cc6fbc7346f6f939':
  Add error logging on invalid cmap
2016-02-17 23:51:06 +00:00
Raph Levien
c4ed0af154 Add error logging on invalid cmap - DO NOT MERGE am: ac3b9bc4ea
am: 055b8c8cda  -s ours

* commit '055b8c8cda0b491f17cd597a96f651ff0c2cde49':
  Add error logging on invalid cmap - DO NOT MERGE
2016-02-17 23:47:10 +00:00
Raph Levien
78bf54cc23 Add error logging on invalid cmap
am: 9e8fd1dff7

* commit '9e8fd1dff74e2c696d3fd7a2873d982bcb0b06cd':
  Add error logging on invalid cmap
2016-02-17 23:43:34 +00:00
Raph Levien
055b8c8cda Add error logging on invalid cmap - DO NOT MERGE
am: ac3b9bc4ea

* commit 'ac3b9bc4ea57584b6b98307dc505567beaeedab1':
  Add error logging on invalid cmap - DO NOT MERGE
2016-02-17 23:43:26 +00:00
Raph Levien
90118a90f5 Add line breaks to email addresses and URLs
am: 5102c20dd5

* commit '5102c20dd50fde7ab9cdcdce173f53a6cacbd9e0':
  Add line breaks to email addresses and URLs
2016-02-17 23:42:21 +00:00
Raph Levien
084923f611 Special-case URLs and email addresses for line breaking
am: 76022a08e3

* commit '76022a08e3f01db804d97c10277ee2704ef68f45':
  Special-case URLs and email addresses for line breaking
2016-02-17 23:42:08 +00:00