83696 Commits

Author SHA1 Message Date
Raph Levien
5a3a896405 am ff55a581: Snap advance widths to integers
* commit 'ff55a581fa07b52f3cffcf3fc825d297cf955ffe':
  Snap advance widths to integers
2014-09-04 00:16:27 +00:00
Raph Levien
ff55a581fa Snap advance widths to integers
Fractional advance widths were causing subtle problems with text
positioning when the same text was drawn with different spans in the
hwui renderer. Quantizing the coordinates on layout (as opposed to
waiting until the renderer draws the glyphs) solves the problem.

This patch also fixes a discrepancy between x position and advance
widths when letterspacing.

Bug: 17347779
Change-Id: Ia705944047408c2839d5ad078eefd6bbec446872
2014-09-03 10:42:52 -07:00
Raph Levien
604053e564 am 543c65c8: Try Unicode decomposition for selecting fallback font
* commit '543c65c80b71e3111314bf429004a10d004e861b':
  Try Unicode decomposition for selecting fallback font
2014-08-27 17:07:48 +00:00
Raph Levien
543c65c80b Try Unicode decomposition for selecting fallback font
This patch finds an appropriate fallback font in the case where no font
directly maps the requested character, but a font does exist for the
character's canonical decomposition. This yields correct rendering of
compatibility characters such as U+FA70.

Bug: 15816880
Bug: 16856221
Change-Id: Idff8ed6b942fec992a0815a32028b95af091d0ee
2014-08-26 22:20:16 -07:00
Behdad Esfahbod
ddd99662c1 am 11c8920a: Allocate font vector on stack
* commit '11c8920a3fc1c5895e777f71c822501367eef69c':
  Allocate font vector on stack
2014-08-22 18:36:40 +00:00
Behdad Esfahbod
11c8920a3f Allocate font vector on stack
This reduces another allocation (last one?) we were doing when
fulfilling shaping requests from the cache.

Bug: 17111260
Change-Id: Ieb8ae1ccfcaacedb257e1e9263777f10623aaf98
2014-08-21 19:25:06 -04:00
Behdad Esfahbod
55f6f0cd86 am df03550a: Fix Layout initialization in the skipCache path
* commit 'df03550a40706a55ca1bfcb67da62765194cf98f':
  Fix Layout initialization in the skipCache path
2014-08-21 22:09:56 +00:00
Behdad Esfahbod
df03550a40 Fix Layout initialization in the skipCache path
C++ local var initialization always tricks me.  Previously, Layout
didn't have a constructor, which meant that defining it on the stack
left mAdvance uninitialized.  This was not an issue when we were doing
"new Layout()", since that invokes zero-initialization, but was an
issue for the skipCache path that was allocating layout on stack by
just "Layout l" instead of "Layout l = Layout()".  To avoid surprises,
add a constructors that clears everything.

Also adds reset() method to reset the layout for reuse.

Change-Id: I3e02f00da9dd7d360abe13f63c310f6882292d0a
2014-08-21 17:26:04 -04:00
Behdad Esfahbod
2f65c78209 am a33151e9: Speed up cache lookup
* commit 'a33151e9c78c5547eeadbaaa9168dad361df05e4':
  Speed up cache lookup
2014-08-21 20:39:33 +00:00
Behdad Esfahbod
a33151e9c7 Speed up cache lookup
Avoid copying the string for cache lookup.

Bug: 17111260
Change-Id: Ic220bfc991fc6b3dada197304aabdf72a8941bd7
2014-08-21 14:00:25 -04:00
Behdad Esfahbod
a50cc8616c am 2f24599f: Choose same font for Emoji keycap and its base character
* commit '2f24599f4a258160854d18096b302ec2c3aa66c9':
  Choose same font for Emoji keycap and its base character
2014-08-08 19:56:55 +00:00
Behdad Esfahbod
2f24599f4a Choose same font for Emoji keycap and its base character
The U+20E3 COMBINING KEYCAP is used in our fonts to generate an emoji
rendering of ASCII numbers and letters through GSUB.  For that to work
we need to choose the same (Emoji) font for the character coming
*before* the COMBINING KEYCAP character.

This is a special-case of a broader need to choose fonts per grapheme
cluster as opposed to per character, but for now, special-case U+20E3.

Bug: 7557244
Change-Id: I958e5a01068df8495bbb9bc3b9ed871cea1838b6
2014-08-08 15:37:28 -04:00
Behdad Esfahbod
f7a71d4b4e am a944efa7: Support fontFeatureSettings
* commit 'a944efa7a0e61169f56c0002b95e9d6951b1e86e':
  Support fontFeatureSettings
2014-07-30 21:42:58 +00:00
Behdad Esfahbod
a944efa7a0 Support fontFeatureSettings
Bug: 15246510
Change-Id: I544915d29b2be4fb9f82f1989188a3a918c50fbc
2014-07-30 17:29:00 -04:00
Behdad Esfahbod
947aaacee5 am 8bee8f92: Fix examples build
* commit '8bee8f92e045f5e709dbcbedd9d486b55e73f54e':
  Fix examples build
2014-07-29 21:17:20 +00:00
Behdad Esfahbod
6abdc7368f am 2d51f518: Merge "Remove CSS string doLayout entrypoint and supporting code" into lmp-dev
* commit '2d51f518d22eb897603c80f4df5149c711f705b2':
  Remove CSS string doLayout entrypoint and supporting code
2014-07-29 21:01:36 +00:00
Behdad Esfahbod
997dacbde1 am f3879f9b: Initialize MinikinPaint members
* commit 'f3879f9b1f5593552e96cd0f3c2cf755c376fb85':
  Initialize MinikinPaint members
2014-07-29 21:01:36 +00:00
Behdad Esfahbod
8bee8f92e0 Fix examples build
Was broken after recent CSS removal.

Change-Id: I160fbc73286b21336d6f3943ff92d7d150dff74b
2014-07-29 16:57:00 -04:00
Behdad Esfahbod
f3879f9b1f Initialize MinikinPaint members
We are stack-allocating MinikinPaint objects in Minikin clients, and
without a constructor adding new members to the struct cannot be done
without updating all clients (only one right now!).

Change-Id: I4170f16498bb6b07cb795495011aca58087ed0bd
2014-07-29 16:26:49 -04:00
Behdad Esfahbod
b501846d80 Add doLayout variant that does NOT take css string
New API removes CSS string and directly takes needed objects.

Bug: 16651112
Change-Id: Ie5f7c2ab05be6cbd77cae0a5fd6bb453771ada59
2014-07-29 12:46:07 -04:00
Behdad Esfahbod
2d51f518d2 Merge "Remove CSS string doLayout entrypoint and supporting code" into lmp-dev 2014-07-27 22:35:46 +00:00
Behdad Esfahbod
bff381b1be Remove CSS string doLayout entrypoint and supporting code
All usage is ported to the new doLayout() API now.

Bug: 16651112
Change-Id: I2c959138a69853b5e30098889d771fe5f4cfaa66
2014-07-29 15:51:12 -04:00
Behdad Esfahbod
94300c2146 Merge "Don't get stuck on invalid UTF-16" into lmp-dev 2014-07-24 15:37:54 +00:00
Behdad Esfahbod
abf2e7d050 Don't get stuck on invalid UTF-16
Replaces invalid unicode with replacement character U+FFFD and always
makes forward progress.

Bug: 15849380

Change-Id: Ic59ef6c64b0f5c4450bcae61597adcc269d6e7c5
2014-07-25 19:13:10 +00:00
Behdad Esfahbod
675a078bdf Towards CSS removal
Extract language from FontStyle during shaping.  Don't attach CSS
to LayoutContext.

Change-Id: Ie621d3415410178d0d15fa7b810eb8e412342ab6
2014-07-24 20:26:03 -04:00
Behdad Esfahbod
ded72d1e4a Remove deprecated API
It has been unused outside minikin.

Change-Id: Iaa2237767d81c77f90d0264e633375e601dd72f1
2014-07-24 19:18:14 -04:00
Behdad Esfahbod
801eb4ebad Merge "Revert "Don't pass invalid Unicode codepoint to Skia"" 2014-07-24 15:36:21 +00:00
Behdad Esfahbod
ca5b3e1676 Revert "Don't pass invalid Unicode codepoint to Skia"
After update to HarfBuzz 0.9.33 we don't need this anymore.  HarfBuzz takes care of invalid input and passes U+FFFD to us.

This reverts commit 29eb45e667be81d37f29fcce2adccb8c5e6d5ada.

Change-Id: Icfd0dc836a8d684fb1723fc215aa01f99639ff59
2014-07-25 17:31:46 +00:00
Behdad Esfahbod
7043f8f1fc Add letter-spacing support
Bug: 15594400
Change-Id: Ied94d7674be4097b0f44c9b0770d3294dc6433c1
2014-07-22 16:37:53 -04:00
Behdad Esfahbod
29eb45e667 Don't pass invalid Unicode codepoint to Skia
Bug: 15849380
Change-Id: Ib5285e57c5806bd399600fadd56e8bc809da323f
2014-07-11 11:30:06 -04:00
Behdad Esfahbod
264f497c91 Merge "Use __builtin_clzl if element is long" 2014-07-10 21:09:47 +00:00
Behdad Esfahbod
da0c3511e3 Use __builtin_clzl if element is long
Change-Id: I50a112739847fa826088854f6d172a188ff4cfb3
2014-07-10 17:48:37 -04:00
Elliott Hughes
b6138e6653 Switch minikin to the new icu.
Change-Id: I29a59edfe6102257c9f308aac1b4348ef7a18db7
2014-07-10 10:39:07 -07:00
Raph Levien
293208bda8 Assign non-coverage font runs to base font
When a run has no cmap coverage in any font, use the base font. Most of
the time, this will cause rendering of the .notdef glyph, which is
preferable to displaying nothing. In some cases, Harfbuzz may be able to
decompose the characters (not in the cmap) to ones that are, in which
case we'll render those, as long as they're in the base font.

Bug: 6629748
Bug: 15816880
Change-Id: Ibb1b9242c83626e0c7db363ad65ce44a967a005e
2014-07-09 09:18:15 -07:00
Mike Reed
f9490880cc setConfig is deprecated
Change-Id: Iffad3ef724b565d5d8fed17722630fd74cda9234
2014-07-07 10:59:40 -04:00
Raph Levien
05d59ee462 Disable "palt" OpenType feature
Proper Japanese layout requires sophisticated rules for spacing
punctuation, not just turning on the "palt" (proportional alternate)
feature. Until we can support the whole set, roll back palt.

Change-Id: If2359c529b70b1dd45dddc00e5f4aa1c91f8b0e9
2014-06-26 14:34:27 -07:00
Raph Levien
69f3585cf6 Add purgeCaches() method
Expose a method to purge caches used for TextLayout, useful for low
memory conditions.

Change-Id: I92f41afe987b7be4af5ca0a0c50fb51be35a2758
2014-06-25 23:02:52 +00:00
Raph Levien
e8bed5d3cc Implement grapheme cluster breaking
This patch includes an implementation of grapheme cluster breaking,
which is especially useful for repositioning the cursor for left and
right arrow key presses. The implementation is closely based on Unicode
TR29, and uses the ICU grapheme cluster break property, but is tailored
to more closely match the existing implementation and expected behavior.

Part of a fix for b/15653110 Improve behavior of arrow keys in EditText

Change-Id: I8eb742f77039c9ab7b2838285018cf8a8fc88343
2014-06-19 09:49:50 -07:00
Raph Levien
ba5dbb6f24 Make font runs less sticky
Fixes b/15734816 In the text "Wi-Fi", "-Fi" appears bolder than "Wi"

The problem was caused by "stickiness" in choosing fonts, where layout
would prefer using a font used for preceding characters as long as it
mapped the following characters in a run, in favor of the "best match"
rules. This patch adds a whitelist for making the stickiness more
conservative, only applying it for characters necessary for correct
shaping (ZWJ and ZWNJ in particular) and basic punctuation, where it is
desirable to match the style of the preceding text.

Change-Id: I1cf116879f074a5a71c351846707bfdd07b0d320
2014-06-19 09:03:01 -07:00
Raph Levien
01d64756a7 am e88f8c37: Tighten requirements for fake bold
* commit 'e88f8c37c740a317f11d407d48aaacdfdad56395':
  Tighten requirements for fake bold
2014-06-12 22:31:15 +00:00
Raph Levien
1e81203f00 am 1f8de301: (-s ours) Support for fake bold and italics
* commit '1f8de3019ded454358e56a9f0f9b233e372acba8':
  Support for fake bold and italics
2014-06-12 18:07:59 +00:00
Raph Levien
c1b20c0a0c am 1e35d09d: (-s ours) Add baseFont method to FontCollection
* commit '1e35d09df19bbb9bef5c29673106975d96aeb74d':
  Add baseFont method to FontCollection
2014-06-12 18:02:23 +00:00
Raph Levien
e88f8c37c7 Tighten requirements for fake bold
The simple predicate for fake bold (2 or more grades darker than
requested) was applying it to thin (100 weight) when normal was
requested. This patch tightens the predicate to also require that
the requested weight be in the bold range.

Fix for bug 15588352 "sans-serif-thin doesn't work on lockscreen"

Change-Id: Id9988bd149a9c8a7c943e3b221f7fb4b37fb6ddb
(cherry picked from commit 0f8e4702a5aa8c43f3efa3643680dca9f45a1edd)
2014-06-12 16:29:24 +00:00
Raph Levien
3ec74f54ba Merge "Fix missing text on nonexistent font file" 2014-06-11 21:23:31 +00:00
Raph Levien
0f8e4702a5 Tighten requirements for fake bold
The simple predicate for fake bold (2 or more grades darker than
requested) was applying it to thin (100 weight) when normal was
requested. This patch tightens the predicate to also require that
the requested weight be in the bold range.

Fix for bug 15588352 "sans-serif-thin doesn't work on lockscreen"

Change-Id: Id9988bd149a9c8a7c943e3b221f7fb4b37fb6ddb
2014-06-12 09:23:21 -07:00
Raph Levien
43e8943dfd Fix missing text on nonexistent font file
Fix for bug 15570313 "Missing text on nonexistent font file"

This patch makes sure that the lastChar and mInstances arrays are in
sync with each other even when a FontFamily being added has no valid
fonts in it. Previously, when they got out of sync, unicode coverage
calculation would be wrong, resulting in missing text.

Change-Id: I69c727ef69e2c61e2b2d6b81d5a28c806327f865
2014-06-11 16:03:49 -07:00
Raph Levien
1f8de3019d Support for fake bold and italics
This patch adds support for computing when fake bold and fake italics
are needed (because the styles are requested but not provided by the
matching FontFamily), and providing them as part of the layout result.

Part of the fix for bug 15436379 Fake bold doesn't fully work (Minikin)

Change-Id: I180c034b559837943673b5c272c8e890178dff0d
2014-06-11 12:42:44 -07:00
Raph Levien
1e35d09df1 Add baseFont method to FontCollection
This patch adds a method to retrieve the base font from a
FontCollection, which is useful when querying global font metrics.

Part of the fix for bug 15467288 "Inconsistent line heights on
Minikin builds"

Change-Id: I268ae5128d0852a020d746bc22af81fc1a623228
2014-06-11 12:42:32 -07:00
Raph Levien
9c9cab6487 Merge "Provisionally enable "palt" OpenType feature" 2014-06-10 19:09:51 +00:00
Raph Levien
2b7da7bc2b Support for fake bold and italics
This patch adds support for computing when fake bold and fake italics
are needed (because the styles are requested but not provided by the
matching FontFamily), and providing them as part of the layout result.

Part of the fix for bug 15436379 Fake bold doesn't fully work (Minikin)

Change-Id: I180c034b559837943673b5c272c8e890178dff0d
2014-06-10 11:59:29 -07:00