aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-10-14Fix serialization crash for saved pages in the browser.android-4.0.2_r1ics-mr0-releaseDerek Sollenberger
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
2011-10-12Fix font issue for some sites using offline reading mode.Derek Sollenberger
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
2011-09-06Ignore the alpha bit for 32-bit ico images.Derek Sollenberger
The 32-bit images have a full alpha channel so a dedicated alpha bit is unecessary. This CL mirrors an identical change in Skia... http://code.google.com/p/skia/source/detail?spec=svn2187&r=2051 bug: 5003756 Change-Id: Id3eab2e12aa49c0193d87df255a78758ba080d60
2011-09-02Merge "Update Skia's NinePatch decoder"Derek Sollenberger
2011-09-02Update Skia's NinePatch decoderDerek Sollenberger
This CL enables the decoder to handle collapsing the stretchy area along one axis while still stretching the other. This prevents us from falling into the standard bitmap strech and produces better looking results. bug: 5239166 Change-Id: Iadde581d7853430c6fd59446959a34661a19e927
2011-09-01Change #if SK_DEBUG to #ifdefRussell Brenner
Fixes previous CL 131603. Using bug# from original CL. Bug: 4387353 Change-Id: Ie7e78402ab7c0ab448e8cb6ad21a709ecca9daef
2011-08-30Turn off uneeded debug messages in the jpeg decoder.Derek Sollenberger
bug: 4387353 Change-Id: I5c8ae97d6c3407dbdb87bd4be1078c29eb925bd6
2011-08-24Merge upstream bug fixes from Skia into Android.Derek Sollenberger
This CL pulls in r1835 and r1870 from Skia's trunk. bug: 5197241 Change-Id: I79b51cf8605bc16641cfe7b3e1b369f801bf0922
2011-08-04remove font cache log msgMichael Kolb
Bug: 5122491 Remove font cache purge log message Change-Id: Ib5a23433b8cb1402c96b8d510ed875be7400c80c
2011-07-26Fix crash when playing back a picture with an unknown font.Derek Sollenberger
bug: 5009656 Change-Id: Ic91bdb84e42b4d07f88bd6df1a2bedc2031404df
2011-07-26Fix shader crash when drawing a bitmap.Derek Sollenberger
This change has also been submitted upstream to Skia in r1954. bug: 5060654 Change-Id: Iac9ce0d9150c59e4db6653081d7f46843ea8f2bf
2011-07-21Add image cropping support in Skia-WebP decoder.Vikas Arora
Implement virtual methods 'onBuildTileIndex' & 'onDecodeRegion' for supporting image cropping for Skia-WebP image Decoder. Utilize the native rescaling+Cropping capability of WebP-Decoder to implement image cropping. - Incorporated code comments from Pascal. - Found one bug w.r.t setting SampleSize. Rectifying that in this patch. Change-Id: Ib7b04129a65ed17f845d0600f3553b9b24846838
2011-07-18Implement on-the-fly image resizing (down-scaling).Vikas Arora
Implement on-the-fly image resizing (down-scaling) for WebP images. The image decoder is aware of the device memory constriant via SampleSize set by the application like Webkit/WebCore. sampleSize=1 implies no down-scaling. Likewise, SampleSize=2 implies resizing image width & height by a factor of '1/2', resulting in '1/4'th size for the decoded image. SampleSize is merely a hint from the application to the decoder. Decoder may choose to ignore this hint and decode the image at full scale. Native WebP image decoder (new APIs) supports on-the-fly resizing. Making the Skia-WebP decoder 'SampleSize' aware and implementing the on-the-fly resizing in this change. Change-Id: Ibbd62baf4a6ad2d3904aafb22807f4513641e64c
2011-07-15Merge "Read font info from system config files"Chet Haase
2011-07-15Read font info from system config filesChet Haase
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
2011-07-15Use the WebP native color-modes for Skia-WebP-Decoder.Vikas Arora
Remove the custom code for decoding WebP image. Use the native color-modes RGBA, RGBA_4444 & RGB_565 for Skia-WebP-Decoder class. - Removed other dead code as well. Change-Id: I414778b71aaea754d92ed6b07ebd7b6336e1f102
2011-07-12Merge "Add support for WebP incremental decoding."Derek Sollenberger
2011-07-12Add support for multiple styles in the fallback fonts.Derek Sollenberger
bug: 4390209 Change-Id: I74774b43b3f0c903fb96911e156d9911cf55bb68
2011-07-11Revert "Allow multiple styles for fallback fonts"Russell Brenner
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
2011-07-07Add null-check in remove_from_family()Russell Brenner
An invalid face is not expected here, but still should not be allowed to crash. Bug: 5002710 Change-Id: Ifd11e918f968d5eef67932e514ea6754819fb7a5
2011-07-07Merge "Restored null-check in SkFontHost::NextLogicalFont"Russell Brenner
2011-07-07Restored null-check in SkFontHost::NextLogicalFontRussell Brenner
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
2011-07-07Add support for WebP incremental decoding.Vikas Arora
Updated the Android-Skia-WebP decoder with following changes: - Added support for incremental WebP decoding. So instead of allocating input buffer corresponding to the whole image (could be few MBs), the input is read iteratively in a buffer size of 64KB. - Refactored onDecode method (O(200) lines) to a smaller (O(30) lines) method with 2-3 helper functions. - Removed low (byte-level) parsing from this code and calling WebP public APIs for the same (like WebPGetInfo). - Incorporated Pascal's feedback. - Few more feedback from Pascal. Change-Id: I104822ec3922eca1efc19422908f07770c4c140b
2011-07-06Add Droid Ethiopic to fallback listRussell Brenner
Regular and Bold styles are now included in the fallback list. Bug: 4902641 Change-Id: Ia88dedb136ab00dee3ae4e4cc5552e0d3a743f13
2011-07-06Allow multiple styles for fallback fontsRussell Brenner
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
2011-06-30Revert "Allow multiple styles for fallback fonts"Russell Brenner
This reverts commit da49dc51598fa6f5ffae857f73bb8be12caf216e. Bug: 4980240 Change-Id: Ib0470d458db12821a89ce019d395152d06296305
2011-06-29Allow multiple styles for fallback fontsRussell Brenner
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
2011-06-27am 0896ce1e: (-s ours) Merge from gingerbread - do not mergeJean-Baptiste Queru
* commit '0896ce1e7b7418350e9f6ca9b4b9ad675ccb9b86': Restore legacy behaviors for better compatibility
2011-06-27Merge "Removed invalid assert"Russell Brenner
2011-06-24Removed invalid assertRussell Brenner
Test for alpha==255 is apparently cloned from S32A_Opaque_BlitRow32_arm, but does not apply to Blend variant. Change-Id: I5d6154399265cb6f8291595a9bc62b2741301590
2011-06-24Merge 3c1b974a and a4f65ce7Jean-Baptiste Queru
Change-Id: I536026aab833367350b595b41911e9888cff2e3a
2011-06-24Merge from gingerbread - do not mergeJean-Baptiste Queru
Change-Id: Iba2f457ca4e8ea90078d1028e1ea829b3d889285
2011-06-24Merge "Restore legacy behaviors for better compatibility"android-sdk-adt_r12Jean-Baptiste Queru
2011-06-24Restore legacy behaviors for better compatibilityJean-Baptiste Queru
Change-Id: Ifdf889d2ed36cc88bdc105cbb629fe2f68111ccd
2011-06-24Merge "Skia Merge (revision 1562)"Derek Sollenberger
2011-06-24Merge "Add WebP Encoder support to SkImageEncoder."Jean-Baptiste Queru
2011-06-23Skia Merge (revision 1562)Derek Sollenberger
Change-Id: Ief005abc9eb741ccf5efec3d1f29fe2dfc23103d
2011-06-22Add WebP Encoder support to SkImageEncoder.Vikas Arora
Extending Skia-WebP interface to handle the WebP encoding as well. The WebP encoding is required for sharing WebP images and transcoding images from other formats like PNG/JPEG to WEBP. Change-Id: I23d52323abf5e7eec0c6d3e0159a1ca7baee468b
2011-06-14Fix broken build due to missing interface definition.Derek Sollenberger
Change-Id: Ifcdb6d43f6ee23e6d91d01dc4fe25140f2d3d870
2011-06-14Merge "Create a GrGLDefaultInterface for Android."Derek Sollenberger
2011-06-13Ignore temporary AOSP changesJean-Baptiste Queru
Change-Id: Iea0c23cf20fb25e7148be1def0623fe40b7c6f23
2011-06-13Merge "Fix build - restore older behaviors"android-sdk-tools_r12Jean-Baptiste Queru
2011-06-13Fix build - restore older behaviorsJean-Baptiste Queru
Change-Id: Ie9f88806b1083f0b4ef99731bd4f1e42fff467fe
2011-06-13Merge "Make this virtual function non-pure, temporarily."Jean-Baptiste Queru
2011-06-13Make this virtual function non-pure, temporarily.Jean-Baptiste Queru
This makes it easier for now to deal with situations where derived classes don't have an implementation. Change-Id: Iaf4b3495441cb5881ad98633e55da1c5acdd9768
2011-06-08Merge "Skia Merge (revision 1510)"Derek Sollenberger
2011-06-07Merge "Updated Skia-Webp wrapper to work with latest version (0.1.2)"Shimeng (Simon) Wang
2011-06-07Updated Skia-Webp wrapper to work with latest version (0.1.2)Vikas Arora
issue: 3291572 Change-Id: I86258b82a9105e5db459c436d8bcfa1841609ed7
2011-06-07Skia Merge (revision 1510)Derek Sollenberger
This CL includes bug fixes and closely mirrors the version of Skia used in Chrome M13, which is likely to be our baseline for ICS. The CL also adds source files for the SampleApp which will allow us to execute basic skia tests. The SampleApp requires the utils/views directory in order to run. Finally, we have included the PDF backend for Skia in order to experiment with using it to generate PDF files for certain applications. Note: The SampleApp and PDF code are not built as part of libskia. Change-Id: I1895ccfbd8074e25f19148cc7bd1b4af571fb307
2011-06-02Fix for antialiased text with shadows.Derek Sollenberger
bug: 4502715 Change-Id: I44f994b86d0e0d7b31087880805196a3bda7a1b1