GitLab

Change-Id: Ia1cbb6b274e1b3739704de9dd997e6d5dc5185af

* commit '358eae71':
  Skia Merge (revision 3312)

This CL also includes changes made to Android's copy of
Skia in their J release branch.

Change-Id: Ib2baecf48004951a3ad4a1574cdc38790c814cbc

Change-Id: I19c1919cae24a875671c37777c32b356d3141a1d

Skia's serialize methods are not intended for backwards compatibility,
but the browser used it to implement saved pages. As a result the
revision of Skia used for ICS (r1562) is not compatible with the
revision of Skia used in JB (r3000+). This CL attempts to make pages
saved in ICS render in JB while still allowing JB pages to be saved
and displayed.

bug: 6025365
Change-Id: I9983517b46d2dedf31c6d90f48f6cf00ec042bc2

This is required to optimize texture generation in display lists.

Change-Id: I7291e3af85771bfa74190b718d45e61555c7087d

The original CL was missing a negation in an if statement and
had to be reverted. This CL reapplies the change with the
necessary correction.

This reverts commit aafd212a.

bug: 5860912
Change-Id: I68654747229ebeabb34a427397728d4815e68bca

This reverts commit dd7047bd.

This reverts commit dd7047bd.

Change-Id: I01ebeeaf58a3fabf3b9891249d1c43f3f0ed3875

bug: 5860912
Change-Id: Ic456b5bbaf2a33a903ccd942622143313fc1f936

bug: 6011971
Change-Id: Ic9e9088dcc2fe3c8d675f64605223e2def0a6e18

fPreferQualityOverSpeed was not initialized, which resulted in
some garbage value and caused unexpected animation flicker when skia
was compiled with gcc-4.6.

Change-Id: I51cd091cbb119832fb1592ebc63be0ae039a7cba

Change-Id: I3b4536dedc12ad3de40aa2f6c357423bf33bce72

* commit '1cab2921':
  Skia merge (revision 3022)

This CL has companion changes to account for API updates in...
 (1) frameworks/base
 (2) external/webkit

Change-Id: Ibb989e76e8bd24313849f9631dbef42cdef9eb7d

* commit 'e2d01455':

* commit '90e9d287':

Change-Id: I65f63f2d5a8821761507dfc2e924aa9741e2debd

- make getBaseGlyphCount() "const"

Change-Id: Ia1945448b7df537ff7d30f35b666646389c8ffae

This is equivalent to the change made upstream in Skia (r2961).

bug: 5800195
Change-Id: Iafaffd61b65aa0d7c3cae158bb82cc5a6d6e3b78

bug: 5524273
Change-Id: Ia777e2fb62623b30b5d0ea40bbaaf4f1f6ff6327

* commit 'd7176fd5':

Upstreamed to Skia: http://codereview.appspot.com/5467058/

bug: 5473038
Change-Id: I1abfc2092dc4fb2aeee34e4ba07b06217955023e

Change-Id: I852d3241764ab36b57dff8407a01c6fecca822be

Change-Id: Ie33aa6b1f03109ba09b50dc5e04d5930d947d809