GitLab

Merge commit '2a95157f'

* commit '2a95157f':
  android-2.1_r1 snapshot

Merge commit '58a01174' into eclair-plus-aosp

* commit '58a01174':
  android-2.1_r1 snapshot

Not taking into account the BW type was causing the view hierarchy to redraw
too many views.

http://b/issue?id=2319754

am 1cc593f7: am e4c504a1: If jpeg_start_decompress fails, but we have valid output dimensions and we\'re in kDecodeBounds_Mode, go ahead and return the config to the caller instead of reporting an error.

Merge commit '1cc593f7'

* commit '1cc593f7':
  If jpeg_start_decompress fails, but we have valid output dimensions and we're in

am e4c504a1: If jpeg_start_decompress fails, but we have valid output dimensions and we\'re in kDecodeBounds_Mode, go ahead and return the config to the caller instead of reporting an error.

Merge commit 'e4c504a1' into eclair-plus-aosp

* commit 'e4c504a1':
  If jpeg_start_decompress fails, but we have valid output dimensions and we're in

kDecodeBounds_Mode, go ahead and return the config to the caller instead of reporting
an error.

Merge commit '1981752f'

* commit '1981752f':
  Do not merge

Merge "Move some utility structs/functions in SkImageDecoder_libjpeg.cpp to SkJpegUtility.h/.cpp, so that others are able to use these structs/functions when they call libjpeg for compression."

Merge commit '07a66af1' into eclair-plus-aosp

* commit '07a66af1':
  Do not merge

port stretchy from master

so that others are able to use these structs/functions when they call libjpeg for compression.

Merge commit '5fee0e9c'

* commit '5fee0e9c':
  refresh from skia/trunk, adds paint bit for bitmapfonts

Merge commit '2cf237c9' into eclair-mr2-plus-aosp

* commit '2cf237c9':
  refresh from skia/trunk, adds paint bit for bitmapfonts

There are two other related changes under review:
1) Build libjpeg to a shared library
2) Add libjpeg to the prelink map

am c246f6f2: am 091f2273: add inverse of textToGlyphs(), so we can extract the original text from the browser display for copy/paste, given that webkit renders it using glyph codes (and we need unichars).

Merge commit 'c246f6f2'

* commit 'c246f6f2':
  add inverse of textToGlyphs(), so we can extract the original text from the browser

am 091f2273: add inverse of textToGlyphs(), so we can extract the original text from the browser display for copy/paste, given that webkit renders it using glyph codes (and we need unichars).

Merge commit '091f2273' into eclair-mr2-plus-aosp

* commit '091f2273':
  add inverse of textToGlyphs(), so we can extract the original text from the browser

display for copy/paste, given that webkit renders it using glyph codes (and we need
unichars).

hange 36311 in external/webkit is dependent on this.

Fixes http://b/2166748

Merge commit '9afd2587'

* commit '9afd2587':
  refresh from skia/trunk

Merge commit '2c497e64' into eclair-mr2-plus-aosp

* commit '2c497e64':
  refresh from skia/trunk

Merge commit '29f65575'

* commit '29f65575':
  refresh from skia/trunk

Merge commit '93d11b5b' into eclair-mr2-plus-aosp

* commit '93d11b5b':
  refresh from skia/trunk