| 725b3e03acb91dc69296554932624b36612bd189 |
|
04-Jul-2012 |
Billy Hewlett <billyh@google.com> |
DO NOT MERGE Han Preference
Cherry-pick Id8c91ae0be6cad8a7ef77a0cd5803676290986c1 from master.
During font initialization, create a seperate fallback list for each
locale. At runtime, use the fallbacklist associated with the locale
set in the paint object. Fallback files are associated with locales in
fallback_fonts.xml. Multiple files can be associated with the same
locale, ordering within that langauge and apart from that language in
the fallback order is preserved.
This changelist also includes some refactoring, notably of the
functions that call getNextContext().
Change-Id: I121f0e491a522c4a8558a0066b2d8969fb8a3667
/external/skia/src/ports/SkFontHost_android.cpp
|
| 669f287c3eec9ca1755d8d27ba1b5e17464b714a |
|
26-Jun-2012 |
Billy Hewlett <billyh@google.com> |
Cleanup ref counts for SkCreateTypefaceForScript
After this checkin, SkCreateTypefaceForScript refs each typeface
that it creates before it returns it. Additionally, all supported harfbuzz
codepoints are added to the unicode mapping array. This patch also fixes a test crash (see bug)
Bug:6756432
Change-Id: Ida3276b76e745b817f9e63be54945e411516dd03
/external/skia/src/ports/SkFontHost_android.cpp
|
| 212ef7a5d592a11522f73d858bf98f5201631b70 |
|
21-Jun-2012 |
Billy Hewlett <billyh@google.com> |
Revert "Revert "Use Elegant fonts for Webkit, Compact fonts for Textview""
This reverts commit 81957ccb58db76c172e195dc3e31eba85d3e4ac9
/external/skia/src/ports/SkFontHost_android.cpp
|
| 81957ccb58db76c172e195dc3e31eba85d3e4ac9 |
|
21-Jun-2012 |
Billy Hewlett <billyh@google.com> |
Revert "Use Elegant fonts for Webkit, Compact fonts for Textview"
This reverts commit 421654d4bf3ca50e2247a7389851d2e8f4812564
/external/skia/src/ports/SkFontHost_android.cpp
|
| 421654d4bf3ca50e2247a7389851d2e8f4812564 |
|
12-Jun-2012 |
Billy Hewlett <billyh@google.com> |
Use Elegant fonts for Webkit, Compact fonts for Textview
Fonts can be marked with elegant or compact in fallback_fonts.xml.
Webkit uses elegant fonts, Textview uses compact fonts (the default),
unmarked fonts are used by both.
Bug: 6649136
Change-Id: I6ab6173c2efc50eba8fcc488c89dfdd083fb9c06
/external/skia/src/ports/SkFontHost_android.cpp
|
| cde7dcc5111806870f94721561056e990a9211c8 |
|
04-Jun-2012 |
Billy Hewlett <billyh@google.com> |
Fix hardcoded font path. Allow adding new font path thru Skia changes.
Bug: 6609231
Change-Id: Ie37ada42e7e78ab78318f3ed76eb627bffaddb1a
/external/skia/src/ports/SkFontHost_android.cpp
|
| 7c6d54cdf8d0da62a7478bda7927d779b0481218 |
|
11-May-2012 |
Raph Levien <raph@google.com> |
Fix bug 6479740: Serif font gone in tot/jb-dev
addNameLocked() was failing when namelist count == 0, which was causing
the fonts not to be loaded.
Change-Id: Ib7c9ee96e3f0574ac3cc920ce086338d60ef7397
/external/skia/src/ports/SkFontHost_android.cpp
|
| 127ddb8a959885dc35cb3f1b0b0b3b798104d553 |
|
09-May-2012 |
Fabrice Di Meglio <fdimeglio@google.com> |
Fix bugs with duplicate fallback fonts.
Cleaned up the system font and fallback font list
memory management using smart arrays.
Cleaned up the addition and removal of font records from
the font family lists. Previously, list insertion was occurring
when the typeface was constructed, which obscured much of the logic.
Bug #6406249 SystemUI crashed when changing Locale
Change-Id: I3e33f7868f1b0a6835b91652652a457799d991d5
/external/skia/src/ports/SkFontHost_android.cpp
|
| 42ca8dae406fe8e68f51fc7c059d9cb688966ab9 |
|
09-May-2012 |
Jeff Brown <jeffbrown@google.com> |
Fix lock issue in Skia fonthost for Android.
load_system_fonts() could potentially be called without
a lock held. To make this problem less likely to happen
again in the future, adopted a naming convention for all
locked methods.
Change-Id: I04ff5e8ad005e5c1180aae9be8c134d0d384ac2c
/external/skia/src/ports/SkFontHost_android.cpp
|
| aebbe265b8f9136fa5a5f44141cd5a4bb0914d21 |
|
01-May-2012 |
Derek Sollenberger <djsollen@google.com> |
Fix two font issue that are causing crashes and ANRs
1) fixes a bug where the a custom font can be loaded prior to the
system fonts being loaded when Skia is first loaded.
2) fixes a bug where the lists for system fonts and fallbacks can be
corrupted if the font in the configuration file is not present
This should fix bug 5911298
Change-Id: I93b93e0f20d916b91438e8bbaa50a32ac5e20d88
/external/skia/src/ports/SkFontHost_android.cpp
|
| f98d96e192db421eed54103eedfcbb6600f73c08 |
|
19-Apr-2012 |
Derek Sollenberger <djsollen@google.com> |
Reset Skia to the default font cache size that we used in ICS.
bug: 6226962
Change-Id: I8d078faa836c1daa38810bc24aa24942cb70676f
/external/skia/src/ports/SkFontHost_android.cpp
|
| 55613bba538c7c23b2295cbafdb2243a4c4c3358 |
|
30-Mar-2012 |
John Reck <jreck@google.com> |
Fix grabbing a lock recursively
Bug: 5383693
Change-Id: I71258a269aa1b739c655c9ef9f2cf043c9928079
/external/skia/src/ports/SkFontHost_android.cpp
|
| d71541402192b57e2e03355594567afcd60c14b8 |
|
08-Mar-2012 |
Russell Brenner <russellbrenner@google.com> |
Reload fallback fonts when system language changes
When the system locale is changed, skia reloads its fallback fonts
using the best-matching configuration files for both framework and
vendor.
Bug: 5873170
Change-Id: Ie1d13cb404905ae2af05d8f20fbd857c96f39e4b
/external/skia/src/ports/SkFontHost_android.cpp
|
| 4f1dae40e24d57d647db01443b8bf2410514b8b5 |
|
06-Mar-2012 |
Derek Sollenberger <djsollen@google.com> |
Skia Merge (revision 3312)
This CL also includes changes made to Android's copy of
Skia in their J release branch.
Change-Id: Ib2baecf48004951a3ad4a1574cdc38790c814cbc
/external/skia/src/ports/SkFontHost_android.cpp
|
| 1cab2921ab279367f8206cdadc9259d12e603548 |
|
18-Jan-2012 |
Derek Sollenberger <djsollen@google.com> |
Skia merge (revision 3022)
This CL has companion changes to account for API updates in...
(1) frameworks/base
(2) external/webkit
Change-Id: Ibb989e76e8bd24313849f9631dbef42cdef9eb7d
/external/skia/src/ports/SkFontHost_android.cpp
|
| 643e66b71286d7b1f6fdb9c64f45b185d0700398 |
|
14-Oct-2011 |
Derek Sollenberger <djsollen@google.com> |
Fix serialization crash for saved pages in the browser.
The uint packing optimization was producing incorrect results in
this case. Since it only saves us approx 1 byte per font there is
no need to try to keep it around.
bug: 5461283
Change-Id: Ic2b0154d433fa620e588b048c32064358aa94bc4
/external/skia/src/ports/SkFontHost_android.cpp
|
| 40646971fb336f93951a6fc616f83c00e4de7add |
|
12-Oct-2011 |
Derek Sollenberger <djsollen@google.com> |
Fix font issue for some sites using offline reading mode.
Custom fonts (e.g. WebFonts) were not properly serialized and
resulted in unexpected behavior when a picture was saved for
offline reading. This CL serializes the custom font so that we
can use it later when playing the picture back.
bug: 5388379
Change-Id: Ic29e9bf10ac70c46a45f3902ea93558b235fd2dd
/external/skia/src/ports/SkFontHost_android.cpp
|
| 9c0ebce1a8c21bbbe49d9f935685b82b5eb5047f |
|
06-Jul-2011 |
Chet Haase <chet@google.com> |
Read font info from system config files
This change adds new files in /system/etc: system_fonts.xml and
fallback_fonts.xml. The change also allows a third file to be added
by vendors in /vendor/etc/fallback_fonts.xml. These files, loaded at
boot time, mimic the logic that used to be in code, but which is
now configurable through editing these files, making the system more
flexible and easy to work with for us and vendors as future fonts
are added to the system.
Change-Id: Iac0af4924ca0454c6dde4d53058b1425200ed4b7
/external/skia/src/ports/SkFontHost_android.cpp
|
| b65301aa53c9076da7b381c3f5ac3373f0cfa351 |
|
12-Jul-2011 |
Derek Sollenberger <djsollen@google.com> |
Add support for multiple styles in the fallback fonts.
bug: 4390209
Change-Id: I74774b43b3f0c903fb96911e156d9911cf55bb68
/external/skia/src/ports/SkFontHost_android.cpp
|
| eb4843787eb5afdc08871f38de631736d8f3a9f3 |
|
11-Jul-2011 |
Russell Brenner <russellbrenner@google.com> |
Revert "Allow multiple styles for fallback fonts"
The change being reverted somehow alters the reference counting of
SkTypeface instances, resulting in prematurely freed font data, which
is the underlying issue with the disappearing clock on the lockscreen
(http://b/5004404).
This reverts commit 792a256ab723bbc4b55ba00194fe2a9195cae8c0.
Bug: 5004404
Change-Id: I5c3b225f860ce2dcfc0751bded2d842b43a2d3c4
/external/skia/src/ports/SkFontHost_android.cpp
|
| 8af39c6fd2e903d2b0a2b1b91b295b847a3ec772 |
|
07-Jul-2011 |
Russell Brenner <russellbrenner@google.com> |
Add null-check in remove_from_family()
An invalid face is not expected here, but still should not be allowed
to crash.
Bug: 5002710
Change-Id: Ifd11e918f968d5eef67932e514ea6754819fb7a5
/external/skia/src/ports/SkFontHost_android.cpp
|
| 7b45a2a7180f3d12d3c01a7eb71aa40b37ef648a |
|
07-Jul-2011 |
Russell Brenner <russellbrenner@google.com> |
Merge "Restored null-check in SkFontHost::NextLogicalFont"
|
| 04b5451c69f535017109bba8594ce7111c4da2a7 |
|
07-Jul-2011 |
Russell Brenner <russellbrenner@google.com> |
Restored null-check in SkFontHost::NextLogicalFont
This updated line was to have been included in CL 118811, but some
bad gerrit-fu caused it to go amiss.
Bug: 4390209
Change-Id: Ia7b8e2849cfae3cdfbebc09a91fe26f2355f1ebb
/external/skia/src/ports/SkFontHost_android.cpp
|
| 9b37d4117b767112e4dd706ebe23b4fe58f18d70 |
|
07-Jul-2011 |
Russell Brenner <russellbrenner@google.com> |
Add Droid Ethiopic to fallback list
Regular and Bold styles are now included in the fallback list.
Bug: 4902641
Change-Id: Ia88dedb136ab00dee3ae4e4cc5552e0d3a743f13
/external/skia/src/ports/SkFontHost_android.cpp
|
| 792a256ab723bbc4b55ba00194fe2a9195cae8c0 |
|
01-Jul-2011 |
Russell Brenner <russellbrenner@google.com> |
Allow multiple styles for fallback fonts
Fallback fonts are now recorded with their styles in the list of
available fonts (which is now a doubly-linked list). NextLogicalFont()
has a new parameter, providing the originally requested fontID, from
which we can determine the requested style, which we then pass to
find_best_face() to pick from the available styles.
SkFontHost::NextLogicalFont() no longer assumes that origFontID is
valid (see http://b/issue?id=4980240).
Bug: 4390209
Change-Id: I2e600f7eb75d207e95bae8cc9ed8379ade396058
/external/skia/src/ports/SkFontHost_android.cpp
|
| cc8395159cea368f09a2fce36229c7bc93828c9a |
|
01-Jul-2011 |
Russell Brenner <russellbrenner@google.com> |
Revert "Allow multiple styles for fallback fonts"
This reverts commit da49dc51598fa6f5ffae857f73bb8be12caf216e.
Bug: 4980240
Change-Id: Ib0470d458db12821a89ce019d395152d06296305
/external/skia/src/ports/SkFontHost_android.cpp
|
| da49dc51598fa6f5ffae857f73bb8be12caf216e |
|
31-May-2011 |
Russell Brenner <russellbrenner@google.com> |
Allow multiple styles for fallback fonts
Fallback fonts are now recorded with their styles in the list of
available fonts (which is now a doubly-linked list). NextLogicalFont()
has a new parameter, providing the originally requested fontID, from
which we can determine the requested style, which we then pass to
find_best_face() to pick from the available styles.
Bug: 4390209
Change-Id: I0c45fd7cefd00df3805bd75df77c519f6d922fe7
/external/skia/src/ports/SkFontHost_android.cpp
|
| 0199fa7423f89a129da2b22a488f2c18e2e4727f |
|
23-Jun-2011 |
Derek Sollenberger <djsollen@google.com> |
Skia Merge (revision 1562)
Change-Id: Ief005abc9eb741ccf5efec3d1f29fe2dfc23103d
/external/skia/src/ports/SkFontHost_android.cpp
|
| 71531ca1f484da5837be8017a0c83e5bff701587 |
|
24-Feb-2011 |
Derek Sollenberger <djsollen@google.com> |
Skia Merge (revision 842)
This merge picks up the fixed width font updates and improved
blur code from the Skia repository.
Change-Id: Iad2301a353c31da27ca214527cf4ed8f24641749
/external/skia/src/ports/SkFontHost_android.cpp
|
| 40528743dbb9ce7f39f093e0cdc47849ac8887cf |
|
07-Jan-2011 |
Derek Sollenberger <djsollen@google.com> |
Skia Merge (revision 808)
This merge has companion changes in the following projects in order
to be compatible with changes to skia interfaces and practices:
1. /frameworks/base
2. /external/webkit
Change-Id: I54092971305579e81a8fdb27bbe04ec340792e3b
/external/skia/src/ports/SkFontHost_android.cpp
|
| 956f20cebc0d9c7a1c59dc18a556b7aaff22b39c |
|
22-Sep-2010 |
satok <satok@google.com> |
Use MOTOYA Japanese fonts (MTLmr3m.ttf, MTLc3m.ttf) for Japanese fonts
Change-Id: I1eccbe49f88c155b4b5490e2783db9d3ef2371be
/external/skia/src/ports/SkFontHost_android.cpp
|
| ff1f66966879e612660387285b7ead9c040ff88f |
|
10-May-2010 |
The Android Open Source Project <initial-contribution@android.com> |
merge from open-source master
Change-Id: I064902aa9745342ccfe868331ccc000767e92fc0
|
| 19ca923e9120da2c5a2e66044a88022065d3c122 |
|
26-Apr-2010 |
Peter Eliasson <peter.eliasson.x@sonyericsson.com> |
Improved error handling when font loading fails.
Without this this patch, an application could trigger a platform crash
by calling:
Typeface typeface = Typeface.createFromFile("");
boolean isBold = typeface.isBold();
The crash occurs since the find_name_and_style function does not
return an error code.
Change-Id: Id1d2a43b47d956c5a52f01e7d4b8cbb12631d59a
/external/skia/src/ports/SkFontHost_android.cpp
|
| 95c58e02fc5c7e165599773225d32901fd9ba4e3 |
|
02-Mar-2010 |
Mike Reed <reed@google.com> |
add arabic, hebrew, thai fonts to our fallback list
/external/skia/src/ports/SkFontHost_android.cpp
|
| e3c6561496ef60345d830f1ab883afb1d1f251ef |
|
31-Jul-2009 |
Mike Reed <reed@google.com> |
add GetFileName api to fonthost, to return (optionally) the file backing a given font
minor refresh on freetype and blitrow.h from skia/trunk
/external/skia/src/ports/SkFontHost_android.cpp
|
| 679464e412ba31c1b42b5cb9b8f1e6880d63f50e |
|
25-Mar-2009 |
Mike Reed <> |
Automated import from //branches/master/...@141164,141164
/external/skia/src/ports/SkFontHost_android.cpp
|
| 2094e41fe6ba5ab33405f785d3a8d54791736a38 |
|
25-Mar-2009 |
Mike Reed <> |
Automated import from //branches/master/...@141140,141140
/external/skia/src/ports/SkFontHost_android.cpp
|
| af527e02dce280c269d751322e9f60aac8cb97da |
|
19-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake_rel/...@140373
/external/skia/src/ports/SkFontHost_android.cpp
|
| 4b86a58dcecc030f2220cb91f4744f8099e7dfe6 |
|
09-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@137197
/external/skia/src/ports/SkFontHost_android.cpp
|
| 3298d565d8a70b84f28b455f6289293883c85494 |
|
05-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@136594
/external/skia/src/ports/SkFontHost_android.cpp
|
| 0910916c0f7b951ee55c4b7c6358295b9bca0565 |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/external/skia/src/ports/SkFontHost_android.cpp
|
| 6eb364108744656fcd23a96a478aa772cd4e85bc |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/external/skia/src/ports/SkFontHost_android.cpp
|
| 03202c9c3dfbf8c4feb0a1ee9b3680817e633f58 |
|
10-Jan-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@125939
/external/skia/src/ports/SkFontHost_android.cpp
|