GitLab

Change-Id: I09d293e0656f131afc26a96285dcaeb1ee7f3b2e

Change-Id: I7069c3d076a60826f7b6508b0a73b1cd9f8031d9

Change-Id: I95299278d98114ed4b01883d7da71d31d172a3d2

Bug: 3499587
Change-Id: I5936adadeb6c610e4e305b4c3bf1e8d4df2c2e2f

Change-Id: I30b3a3806f4484d95602539def1a77a366560fdf

This merge picks up the fixed width font updates and improved
blur code from the Skia repository.

Change-Id: Iad2301a353c31da27ca214527cf4ed8f24641749

Change-Id: I0e69c9929e735b3ad206cf7c431434e27345745c

Change-Id: I712b80173c8a102a46157543979d0dde3c5008f8

Standard memory allocator in Skia abort when an allocation request
fails. However, when allocating in managed heap, need to check for
allocation failure in allocPixels(). This add checks for all allocPixels
calls in Skia Bitmap code.

Bug: 3418381
Change-Id: I3c4ac403a3c073d64a689b29d3baccdc7fc90e1a

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

* commit '4e4d0834':

Change-Id: I79a5b9476bad3ef531160b79513bcb3028ce5072

Change-Id: Id1ac03e5a795bdbd2d62b2e9d452e521abebc340

* commit 'b4f070ed':
  Do not merge.

* commit '67a98d67':
  Implement SkRegion::toString().

* commit '9221e808':
  Implement SkRegion::toString().

Change-Id: I012feed3eb119a9eda98989e13dacc53c0199e19

* commit '9f6d5271':
  Unroll skia ARGB8888 blitter loops.

* commit 'b450292f':
  Unroll skia ARGB8888 blitter loops.

Measured a 25% performance improvement on Tegra 2 for
S32_Opaque_BlitRow32.

skia_bench -config 8888 -repeat 100 -match bitmap_8888_A
Iteration time is reduced from ~130ms to ~100ms.

Change-Id: I7345a04b21d5e0c696b1f4aca763bfeda822c7b5

* commit '43c424fd':
  Do not merge.

* commit '8c4d7a6d':
  Do not merge.

* commit 'b4f070ed':
  Do not merge.

Backport changes/fixes related to tile-based decoder from Honeycomb to
Gingerbread.

Bug: 3309014

////////////////////////////////////////////////////////////////////
This is a combination of 3 commits.

Fix 3071104, where decodeRegion returned false for some large image.

decodeRegion() returns false when it cannot find a suitable color config
for SkScaledBitmapSampler. Currently SkScaledBitmapSampler does not
support RGB_565. If cinfo->out_color_space is set to RGB_565 and we
require SkScaledBitmapSampler to do the extra sampling, we will fail in
finding a suitable color config for SkScaledBitmapSampler.

To fix it, we add support of RGB_565 into SkSclaedBitmapSampler.

Change-Id: I506f4f8c55518ff356345e616e16c4b4cd0712de

Fix 3117581, where BitmapRegionDecoder fails in building tile index for
PNG files.

The virtual method of building tile index in SkImageDecoder was changed to onBuildTileIndex().
SkPNGImageDecoder needs to override the method.

Change-Id: I7c78844a4d4f7aadff5fa8fa1aa99173317139b2

Add fPreferQualityOverSpeed to SkImageDecoder.

Currently the field only affects JPEG decode, in that when it is set
to true, we choose a more accurate, but slightly slower, IDCT method.

Bug: 3238925
/////////////////////////////////////////////////////////////////////

This enable Skia to decode WebP images. Since BitmapFactory relies
on Skia to decode images, this aims at adding support for WebP format
in any application relying on BitmapFactory. Decoder relies on
libwepb library, imported as external library in external/webp in
Android source tree.

Change-Id: I13ef4c1404b989af6a856e9150c62e297200331b

The mechanism used for determining whether an SkPaint object is
the same as a cached version was broken. The problem was that Skia
would blow away the generationID in some situations (assignment
and reset), making that ID completely invalid. This would cause the
displayList rendering code to sometimes make the wrong decision, thinking
that an out of date object was actually still valid.

Change-Id: I5e11eb9ac41e5d87d528b99e3781a4d348f76490

Change-Id: Ib083409abc4110dafa32b5ee4bfa01c0caeb907b

Change-Id: I8ba53eb6d4b99ce6352358b666d30b7668aa834f

Previously we called bitmap->swap while in the scope of
SkAutoLockPixels, which results in the swapped ref count
being decremented by ~SkAutoLockPixels

Change-Id: I165ab161f2db6529db2e79665981cada5ff7d54a

Change-Id: Ie4919c18c0b71bc1d4b3976afd7657a8fb0fc0ef

Bug #3213785

This change ensures we use the same glyph cache to query unichar metrics
and glyph images.

Change-Id: I8f54c88eb94616079cc9d6aef273fb57bc487bd0

Currently the field only affects JPEG decode, in that when it is set
to true, we choose a more accurate, but slightly slower, IDCT method.

Bug: 3238925
Change-Id: I7da20de7281243dc3e246b328517df10039cd290

* commit '7c7e5653':
  Fix compilation errors: