History log of /external/skia/Android.mk
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
ea0c3d4919fbf2af04a01a80f6b4510b460e1701 27-Aug-2014 Derek Sollenberger <djsollen@google.com> DO NOT MERGE. Disable bitmap decoders for GPU specific formats

This is a cherry-pick of the following Skia changes
https://codereview.chromium.org/510913003/
https://codereview.chromium.org/517663002/

bug:17302312
Change-Id: Iec5ad490e1b5eab1b5f3c902b22487d7d52cb92e
/external/skia/Android.mk
5f21f4357bb6b6f3daaab6b69c1862621aef136f 21-Aug-2014 Derek Sollenberger <djsollen@google.com> Merge "enable ffp-contract on arm64 builds" into lmp-dev
56f00464de35fdc714fddd20b37c385621304d38 19-Aug-2014 Dehao Chen <dehao@google.com> Use -O2 during FDO instrument/optimize builds.
Bug: 16205175

Change-Id: I06d51346f20cab57a38217934db78c194437aa9d
/external/skia/Android.mk
258aaff33bbf402bd48f57f6e4b163a6afaa2371 21-Aug-2014 Derek Sollenberger <djsollen@google.com> enable ffp-contract on arm64 builds

bug: 17175893
Change-Id: I4c5595b8b1c43ed50d57ac24e9b33220715441be
/external/skia/Android.mk
d9bff96e7785b872e2dc701256e3ac7d7b563b30 30-Jul-2014 Derek Sollenberger <djsollen@google.com> Enable skia_bench_pictures for use by the fdo optimizer. DO NOT MERGE.

Change-Id: I1b50d090fce7ca18abef2afaf361e6bc6bca526f
/external/skia/Android.mk
1d1f4336f31dedd67c41fe46bc1f962e63c7177e 29-Jul-2014 Dehao Chen <dehao@google.com> Add FDO support to libskia.

Change-Id: Ic6442cb1d9ee12e98e0722e95f99be5dca824eba
/external/skia/Android.mk
55ef0c9196cc5a9c9e137250fcaa76e112014b17 07-Jul-2014 Leon Scroggins III <scroggo@google.com> Merge m37 version of Skia into master.

Merge commit 'f7ffe320ffab6c0c15d0f78e02838a737993f8d5' into merge37
1332c94fb72d1a0972296b777a1eb14d6bc7928f 19-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Simple GPU based dithering:" into master-skia

https://skia.googlesource.com/skia/+/f461a8f

Change-Id: Idf56b718ed22044d206264b4b8bd48d70f7ca9d1
4a17693d1eb63b6e1ce2d6934a9a14f82bdbf77a 19-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Cache the GrEffect used for text rendering in GrBitmapTextContext." into master-skia

https://skia.googlesource.com/skia/+/8b2fac4

Change-Id: Iab20a591d4ae9b35d4639008fa82b264579e2134
69cb2fbae35ceded5fb466d006ddadecee37a5d6 19-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "[PDF] Fix font embedding restrictions." into master-skia

https://skia.googlesource.com/skia/+/0f9bad0

Change-Id: I7e81fd92ca560b71eac4f047c0bab1b980b6e9e4
f924faa674b52137d8028d0697e51600eabbeb26 18-Jun-2014 Derek Sollenberger <djsollen@google.com> Merge master-skia into master.

Merge commit '51ce11d0022418f7a6f5c0515821ab0d4f4c9d3a' from master-skia
7f713ca4044f442c32a3a360bd7ba2a5ff68b1e6 18-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Revert of Add SSE4 optimization of S32A_Opaque_Blitrow (https://codereview.chromium.org/289473009/)" into master-skia

https://skia.googlesource.com/skia/+/db6346a

Change-Id: I9798b800dded181a7b926cac7917423c02296b9e
0cb12c143b442de53bd0112cf7ad6c77a18e0a80 17-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Add EXPERIMENTAL_beginRecording() for SkRecord-based recording." into master-skia

https://skia.googlesource.com/skia/+/887f397

Change-Id: Icfd224e82066b1f71d77b38629ac6d60568ac63c
a8dbe3f21c692b274486d03e7e44b4d19a0ea06b 17-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Silence warnings about using offsetof on near-POD structs." into master-skia

https://skia.googlesource.com/skia/+/24ad096

Change-Id: If7bd992905da096c98e415c3da88949ca4069d9d
ea01fb660a036f391a2d42a2a6cd7d1bf223b56c 17-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Add SSE4 optimization of S32A_Opaque_Blitrow" into master-skia

https://skia.googlesource.com/skia/+/b5c281e

Change-Id: I5acb48bb7b92d05d1d8e9a44fb26a297091b7c63
ba343cbc20d53a15affcfd1aa363e553681ddd9c 11-Jun-2014 Leon Scroggins III <scroggo@google.com> Merge master-skia into master.

Bring external/skia up to ToT Skia.
1c283a95e1677cf0d4f8cf29d4e2213d64c6a7f6 11-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "MIPS: added optimization for functions from SkBlitRow." into master-skia

https://skia.googlesource.com/skia/+/632a454

Change-Id: I46c7f7fae9f2866e17dc70ef4d27c0333060b296
df52f140007d4699beae15d73e58aa8e1e471965 11-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Move Dashing filterPath to a dashing utils file" into master-skia

https://skia.googlesource.com/skia/+/a22ea18

Change-Id: Ic9f6a3fe8aa711c7dfa2d2be59d834c9ab1bc169
60989fa271efde551e0473f80c9fe2678e6eea2e 10-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Add texture compression utility" into master-skia

https://skia.googlesource.com/skia/+/ae61440

Change-Id: Idb68c121d7894215f05c6080cce8adcdff2dbf92
9503b8fb5bd302be3ae2ad9fc96b2cc91724a24f 09-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Generate path names on the client side" into master-skia

https://skia.googlesource.com/skia/+/5119234

Change-Id: Ida526ebeebc9f3fd3292bdd694179dae3574e383
2490608e9ea82d065b4d3fc05aa51d581b3ab748 06-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "MIPS: modified gypi files to support build" into master-skia

https://skia.googlesource.com/skia/+/aaf1df6

Change-Id: I164867daccb0efc7cf48ae7d514adb73cb7493b0
02eebabf6a8961724debfafce94186f198c385f1 05-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "reland "rebaseline_server: download actual-results.json files from GCS instead of SVN"" into master-skia

https://skia.googlesource.com/skia/+/b144271

Change-Id: If27ee855632331d946e70daf51193069bebd14f4
b2a3994938e1cd5697cceca1e46ada103080ed91 05-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Revert of Add SSE4 optimization of S32A_Opaque_Blitrow (https://codereview.chromium.org/289473009/)" into master-skia

https://skia.googlesource.com/skia/+/71804cc

Change-Id: Ie78a37e31f8b4be776194a1bfd205ca6274adcc0
949040ae00c62dc20bab37484243434c16329ddf 05-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "remove ashmem from skia" into master-skia

https://skia.googlesource.com/skia/+/5ec3d21

Change-Id: I59b5672b2441b1baf8024a9ef48c5222c6ae13e4
e8974e442eb7d2fe0b6ec677d964f43c07c3323b 05-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Add SSE4 optimization of S32A_Opaque_Blitrow" into master-skia

https://skia.googlesource.com/skia/+/e2527b1

Change-Id: I01c467c2a5758055a85a32f859ed5ce4233ccf0c
a0bca752bcab8ccabf9eefa065b267874b6d4563 04-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Remove SkImageRef and related functionality." into master-skia

https://skia.googlesource.com/skia/+/479bb60

Change-Id: Ia454d17e23a7597b5099b8712edd34234e430f6d
54fef3bd791c9841c803e9b3aed04270a4eb353d 04-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Revert of Move Dashing filterPath to a dashing utils file (https://codereview.chromium.org/314623004/)" into master-skia

https://skia.googlesource.com/skia/+/90b8caf

Change-Id: Ia6a4b3f12453719903d00988aefb732097e1f9bc
cd395de47824d587533050e62810f9ae750bedb1 04-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Move Dashing filterPath to a dashing utils file" into master-skia

https://skia.googlesource.com/skia/+/576dcdc

Change-Id: I94f095c069cd03060ee7f67c5af6199eeb2a00db
2f71b3930dee4dda504f6a22f4268a01e80bb3a6 03-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Initial KTX file decoder" into master-skia

https://skia.googlesource.com/skia/+/99ffe24

Change-Id: Ic15bb7d26342ed31316404183f6dfdf3b6102855
990a512eabc28e2da917b64434695ddb8eb9aeb3 03-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "ARM Skia NEON patches - 38 - arm64 8888 blitters" into master-skia

https://skia.googlesource.com/skia/+/866b95d

Change-Id: I0c0da29e73bb280589c52c5a8cf1b5615df9f52b
86167613a70e4fe2e77bf19bcddfeccafc9f0f7f 03-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Remove legacy picture recording" into master-skia

https://skia.googlesource.com/skia/+/dcf9ab1

Change-Id: Iac7a9088b8f7197e5eb581754324c880afc6ea99
86e78a9140bebc97b0713ee87d1a8b5fb1b4511d 02-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Remove legacy Picture-recording flags from Android build" into master-skia

https://skia.googlesource.com/skia/+/a2551ff

Change-Id: I92c6dbae3f4789364473a2f60f1eff1caf314f2d
721298237b7f2486d00da57878c048c1d6032662 30-May-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Fix the rendering error of SkDraw::drawVertices in gpu path for solid color." into master-skia

https://skia.googlesource.com/skia/+/559a883

Change-Id: I39b35a531de12750f75b02807fa263b5da8fec62
c3e2d38d87a38aa29ca678a3f34bf4a39ef01e1a 29-May-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "move SkImageGenerator.cpp from src/images to src/core" into master-skia

https://skia.googlesource.com/skia/+/5744bbe

Change-Id: I833435e4f6448bda9613d29c71e32067775f7776
dd9fdd91285c6e71431bafc11d0d7b5bcabb203f 29-May-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Add testing for Rectanizer-derived classes" into master-skia

https://skia.googlesource.com/skia/+/ad854bf

Change-Id: If4417333964928df4184bcbc44803891d061df1d
92c9338e52b040dd21bfb87ce46e661050073505 29-May-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Revert "Revert of add colortable support to imagegenerator (https://codereview.chromium.org/304443003/)"" into master-skia

https://skia.googlesource.com/skia/+/00f8d6c

Change-Id: Ibc81e90565bae1c5374ed9d7838969ada08ea687
4378cd44aab72f3e9db274146e10053d67831c46 28-May-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge Skia at "924205a from Wed, 28 May 2014 16:16:08 +0000"

https://skia.googlesource.com/skia/+/924205aaf2e0c3c65dda13e0eaccde3e7b2a5c40

Change-Id: If51884b7e2065f10fcfad71134106d23f987a9bb
7075fed639ffdbc07102155392bdaff2b4603954 28-May-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge Skia at "b263985 from Wed, 28 May 2014 16:01:55 +0000"

https://skia.googlesource.com/skia/+/b263985850a7a74ccd5fda2abb057b04f7254e41

Change-Id: Ia315f65c6177fa7e7b40d70e6cbf917cf2f1f6f6
521dc193a91d72ecf6325e77287a7e9e4c635f3d 27-May-2014 Derek Sollenberger <djsollen@google.com> Merge Skia at revision 14859.

Change-Id: Ic24f969092585e5e23c98c9d866427d5362a3065
e225ff2715335cdec917c05ae5d7072759692257 27-May-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge Skia at "64f6d154511fc840e9a2db1f17699fd5799f7917 from Tue, 27 May 2014 15:55:35 +0000"

Change-Id: Iaf5a1365dbf5108653b9e7296438c9f20f632ba6
862c0b8e58cff43625de612415fad23731b6820d 22-May-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Manual merge Skia into Android.

Change-Id: I66b251aa66696b46f3eca878083392d62f217ef0
748e48f68b5f46b2f38ab5bb57fe8a90ac0b1657 22-May-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge Skia at "ab08437e39b3d1f52d45d04730c03391f22c20f7 from Thu, 22 May 2014 13:42:34 +0000"

Change-Id: I31e15ad797331cc594f6b9760075207e9197bdd4
2ddc4538ab4332593abc70c98e16a5bb2279087b 22-May-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge Skia at "83f23d87f1d67e6e73873e1ef7cda621c43703a0 from Thu, 22 May 2014 12:27:41 +0000"

Change-Id: Ifad7dabbbef49635d978b604b9870c834ba3a8d1
e7e3e36f97304bc0e66e33706e7dcac7dced28c8 22-May-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge Skia at "3339ac54a5ed75f2872ab16e9052a8b9ff3564bf from Thu, 22 May 2014 02:55:59 +0000"

Change-Id: Ided0413e302c2e0579438695edfe4ecd13b85a80
b48e25d98c110f7285ac39ccbe9c4a076303c099 21-May-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge Skia at "4b8f8022550daa7458ed3de207d1300917d4a8cb from Wed, 21 May 2014 19:56:46 +0000"

Change-Id: I0426338ff1eb72682ddb325ca4571bd92ac0d926
005a98d93d9735e07e59250441a28034f54efd53 20-May-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge Skia at "6a106ce251bd531ab6792d72ab50770149b3675e from Tue, 20 May 2014 19:02:55 +0000"

Change-Id: I796f4052c886f1f054062d54ea422e561042fd13
375799a10d6a576abf74009db532f7c404936cae 19-May-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge Skia at "f9246e209873426f19d7245173a575623580bb84 from Fri, 16 May 2014 16:03:57 +0000"

Change-Id: I1f4fff69cfb5bc59265f42f4b886c149c53b0354
f9246e209873426f19d7245173a575623580bb84 16-May-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge Skia at r14761

Change-Id: Iad6655f881e4f8bbd889e10542b2f11cef34444e
b139f5e1a9a1526c8e1c53433f312d5668c6f740 16-May-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge Skia at r14760

Change-Id: I354ca96277e10ecc80b27613d4846419fad6040d
0690191558dae492ae419d142ffe17d5b0e60fb3 15-May-2014 Leon Scroggins III <scroggo@google.com> Merge Skia at revision 14729.
b4ada9a7288e3c73036eea690d7e34780b3543bf 14-May-2014 Leon Scroggins III <scroggo@google.com> Merge Skia r14592 (Chrome M36).

Conflicts:
include/core/SkUserConfig.h
include/effects/SkBlurMaskFilter.h
src/effects/SkBlurDrawLooper.cpp
src/effects/SkBlurMask.cpp
src/effects/SkBlurMask.h
src/effects/SkBlurMaskFilter.cpp
src/opts/opts_check_x86.cpp

Change-Id: Id57fd4f9450940e345cc541854d62fc9ae723771
64558c2d8d492edcafb5332d4493b843abf32400 12-May-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge Skia at r14691

Change-Id: I8442dad131d4777f5dfc851252bc4fe71f5652c9
72bcea28d11368d52195eb2cdc544de21f09b5a0 08-May-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge Skia at r14649

Change-Id: Ie09ba85b80a8f696a6452151054d85f3c9ad60ad
56d77e83964872e3a702b36c52bb60ca9a2ccb3c 08-May-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge Skia at r14638

Change-Id: I385a14d5a19a5be5c3ee154180405c80310c25e9
06c1746169da6f4da94c0e34fd8bfed26ebb8850 08-May-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge Skia at r14633

Change-Id: Ia7bd748673d8b7ad748794977a417e5194d906b7
02c743b5c03f7bd049a2363f31cdebdd44b7a363 06-May-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge Skia at r14598

Change-Id: I77d18ed6a836e99ed949782d656ca4fb14a9e5ca
a0f3bac7de8e4d820e1a830fa461c2630fab0fb1 02-May-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge Skia at r14553

Change-Id: Ifa9e301bc1beea954b4c90dc77fd2df8d37a3639
2719e91ac8f09a9dd5ef146ac0230dd5a29b3e2a 30-Apr-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge Skia at r14464

Change-Id: I56fb7e743d797f954ebfbc9c3e5de9d94b363e07
131caf0b5c32fb07fb28e179080f60334d2f1b2d 29-Apr-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge Skia at r14444

Change-Id: I6d583506523825cd787f3d3761806eb79fe5d589
58b38c2d473883bbc7f7c8a080560fe117cdfef6 29-Apr-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge Skia at r14430

Change-Id: Id34bf0a8fe8a0faae87c620542ddaa9f37121d7a
b270d0585e88eb60c90226b2fe1a01dfb2e1a97f 19-Apr-2014 Leon Scroggins III <scroggo@google.com> Merge upstream Skia at r14263

Conflicts:
src/effects/gradients/SkLinearGradient.cpp

Change-Id: Ida85a7a7b15d7dfb6bd7abf76e08ad73633cb2ec
d3b58486e97a677f8da2bb4b73690a4af37368d7 16-Apr-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge upstream Skia at r14227.

In addition, this CL merges all of Skia, including files that are not
needed by Android. This greatly simplifies the Skia merging process.

Conflicts:
gyp/common_conditions.gypi
src/effects/gradients/SkLinearGradient.cpp

Change-Id: I7a40eb2b2a6901a1934c868479a7a0ff0c3276d9
de975c31e1e0b5a1d962ef40f563b04b8f225c03 09-Apr-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge upstream Skia at r14110

Change-Id: I221ae9f2c968ed56762a9f896dcfadafb0f5fa2d
ee7b190269e9f247344a61bdde45caa17ad41a51 09-Apr-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge upstream Skia at r14106

Change-Id: If34808cc1a6bdc8812dbca68881292aefd5e6a02
e752303ceb34384ab59e52e390a84357d588da71 08-Apr-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge upstream Skia at r14100.

Conflicts:
src/ports/SkFontHost_FreeType.cpp

Change-Id: Id53a58f30e6314f746daeb10cb12c994de971a58
326afd4ac1469c7e42399a511ef0256e13ec6ba3 04-Apr-2014 Leon Scroggins III <scroggo@google.com> Merge upstream Skia at r13977.

Merge remote-tracking branch 'goog/master-skia' into merge

Conflicts:
Android.mk
include/core/SkUserConfig.h
src/ports/SkFontHost_FreeType.cpp

Change-Id: Ie7af1a1336d336f3a33ef425959c21639b8226ab
8f34190104d139c64598c334709aacff723c4fc9 28-Mar-2014 Leon Scroggins <scroggo@google.com> Merge upstream Skia at r13977.

Includes cherry-picks from:
https://code.google.com/p/skia/source/detail?r=14009
https://code.google.com/p/skia/source/detail?r=14014

Android.mk and SkUserConfig.h have been generated by
gyp_to_android.py.

SkUserConfig.h was additionally updated to include defines
which are necessary but not generated by gyp_to_android.

SkTemplates.h has been further modified to exclude the use
of numeric_limits.

Merge remote-tracking branch 'upstream/master' into merge

Conflicts:
src/images/SkImageRef.cpp

SkImageRef conflicts because
https://code.google.com/p/skia/source/detail?r=13503 (the correct fix)
was committed to Skia upstream, but it depended on APIs not yet in
Android's version of Skia. So Android got
change id I245eea4f05f402ca24849d5d2fe354c69526d03d. This merge takes
Skia r13503 (plus later fixes).

Requires changes to frameworks/base (I5cdcea827ebff587df0bbddc0965e3e0fbf48002)
and cts (Ia6864326bd582587227ab404dbacb409d7f08016).

Change-Id: I816129d49c0118453222916f3c818eccac33663d
16a266718aab125b2f9192802f70a51369528c7a 27-Mar-2014 Leon Scroggins <scroggo@google.com> Add back in Android.mk lines for arm64.

These were lost in the merge to M34.

Change-Id: I2393b119bca89b7909b9d7051494093a82eef3bb
/external/skia/Android.mk
41d04a183692a9422ae7ef174d2ce37599840d3e 27-Mar-2014 Leon Scroggins <scroggo@google.com> Update Skia to Chromium revision M34.

Requires a change to frameworks/base.

Merge remote-tracking branch 'goog/master-skia' into M34

Conflicts:
Android.mk
include/core/SkUserConfig.h

Change-Id: Ic3cf846b74d6f10ec30c477b50fd774cc30ad52c
609e6f98f0e0fb7fa17c1c70a4765edc829c8d50 27-Feb-2014 Leon Scroggins <scroggo@google.com> Merge M34 Skia (13441) into Android.

Also includes a cherry-pick of
https://codereview.chromium.org/169753004/

Merge commit 'a7692a9ac6cb8a0bbe6bbdfc83f86014a7dc265e' into m34

Conflicts:
gyp/tools.gyp
include/core/SkFixed.h
include/core/SkThread_platform.h
include/core/SkUserConfig.h
src/core/SkImageInfo.cpp
src/core/SkMallocPixelRef.cpp
src/core/SkMatrix.cpp
src/effects/SkColorMatrix.cpp
src/ports/SkFontHost_FreeType.cpp
src/ports/SkFontHost_FreeType_common.cpp
tools/PictureRenderer.cpp

Change-Id: I3f2fccbea7dce15066e1beb0d874bafed3047f33
59cdc4970b2def0b7c8e02babfb0ca4f552e7e81 03-Mar-2014 Narayan Kamath <narayan@google.com> Fix 64 bit build in libskia.

This is an extension of change 52c5f4f6aacf7d26b2e
on aosp master. The list of _none files has grown
internally.

Change-Id: Id52a1a5fa9d92be5c18fe0f36957a0c52fbf4c1b
/external/skia/Android.mk
166f7e072e0baa20764297893b807e6331b4d540 28-Feb-2014 Narayan Kamath <narayan@google.com> am d8688ab7: Merge "Get skia building for arm64"

* commit 'd8688ab7b3be63cd4cfd6b7f90107a6f030c568e':
Get skia building for arm64
52c5f4f6aacf7d26b2e65802df10774ed08f5226 28-Feb-2014 Narayan Kamath <narayan@google.com> Get skia building for arm64

Uses the same architecture agnostic code as mips, x86 and x86_64.
Required to get frameworks/base building in 64 bit mode.

Change-Id: I94a0c764ce113671324ca04ee1650539d844bda3
/external/skia/Android.mk
bf91087472914eb6338f0dbfa1ec367999632b0c 27-Feb-2014 Derek Sollenberger <djsollen@google.com> Fix skia public includes to export pathops needed by the framework

Change-Id: I738a681482b0bca2375a3147eded1ecbf6a555f2
/external/skia/Android.mk
07e57470866a8296df191eb017580ddcaf5626df 25-Feb-2014 Derek Sollenberger <djsollen@google.com> fix non-ARM platforms who are missing and optimization proc

Change-Id: I60f1fc31cd1ba173dcb7ce1c014ea3e8459cc09d
/external/skia/Android.mk
11da2b6147cd94e57bd056525352c4a4613cd8ea 25-Feb-2014 Derek Sollenberger <djsollen@google.com> Fix build file error when building for non-NEON ARM devices

Change-Id: I6db73668d54e88d682362c1b2aa2460f6440477c
/external/skia/Android.mk
1cadd3c11c7d87f410bcaf0f229a89eca7a3a121 24-Feb-2014 Derek Sollenberger <djsollen@google.com> Merge remote-tracking branch 'goog/m33' into master

Conflicts:
Android.mk
include/utils/SkFrontBufferedStream.h
src/images/SkImageDecoder_libpng.cpp
src/ports/SkFontHost_FreeType.cpp
src/utils/SkDeferredCanvas.cpp
src/utils/SkFrontBufferedStream.cpp
src/utils/SkPictureUtils.cpp

Change-Id: Iae45e9cff346667ca9c4b406622bc467f04e7410
a7a11cdc20a9e19cca1b5a557228285f2b2809b8 18-Feb-2014 Colin Cross <ccross@android.com> resolved conflicts for merge of 2016fa82 to master

Change-Id: Icf96f9ced3a4ee9c31ff82afe03f4e9e0d3db52b
3afbeaa292d0d74a9ebe612004320321ae662c89 05-Feb-2014 Colin Cross <ccross@android.com> skia: convert makefiles to support multilib build

Convert makefiles to allow for building two architectures at the
same time.

Change-Id: I92c40cef64afcdc4efd897dc9122f48dfed8458c
/external/skia/Android.mk
4247f8004242685665e9050471bd08156e601843 14-Feb-2014 Derek Sollenberger <djsollen@google.com> Revert "compile SSE related files to enable SIMD support for Intel Architecture to improve performance."

This reverts commit 44b977c2b7d4c8607cb4e51d89737d20e5dd70c5.

Change-Id: Ie088ea5327b4861f5625139f94203f435dc1fb0d
/external/skia/Android.mk
44b977c2b7d4c8607cb4e51d89737d20e5dd70c5 14-Jan-2014 Yunchao He <yunchao.he@intel.com> compile SSE related files to enable SIMD support for Intel Architecture to improve performance.

Test data shows that:
For 8888 config, ~30 bench cases got 50+% performance improvement,
~70 cases got 20+% improvement, 130+ cases got 5+% improvement.
For GPU config, 40+ cases got 5% ~ 58% performance improvement.
For 565 config, 20+ cases got 5% ~ 52% performance improvement.

Some bench cases(in total 10+ cases for GPU, 565, 8888) are unstable.
Also, the data of these cases is much smaller than the data of many
other cases. It means that they are easy to be impacted by some random factors.
Except these unstable 10+ cases, no bench case show regression(>5%).

Signed-off-by: Yunchao He <yunchao.he@intel.com>

Change-Id: I19b727d46f1926e89e864064f2455621b7f9c7b3
/external/skia/Android.mk
f397b21b691b7ea535dc764590704946cfff7899 17-Jan-2014 Derek Sollenberger <djsollen@google.com> Merge Skia r12682 into Android.

Conflicts:
include/core/SkDraw.h
include/pdf/SkPDFDevice.h
include/utils/SkCanvasStateUtils.h
include/utils/SkFrontBufferedStream.h
src/core/SkDevice.cpp
src/core/SkDeviceLooper.cpp
src/core/SkDeviceLooper.h
src/core/SkRRect.cpp
src/doc/SkDocument_PDF.cpp
src/effects/SkBlurMaskFilter.cpp
src/fonts/SkFontMgr_fontconfig.cpp
src/gpu/GrAAHairLinePathRenderer.cpp
src/gpu/GrAAHairLinePathRenderer.h
src/gpu/GrTextContext.cpp
src/images/SkImageDecoder_libpng.cpp
src/images/SkScaledBitmapSampler.cpp
src/images/SkScaledBitmapSampler.h
src/pdf/SkPDFDevice.cpp
src/pdf/SkPDFDeviceFlattener.cpp
src/ports/SkFontConfigInterface_android.cpp
src/ports/SkFontHost_FreeType.cpp
src/ports/SkFontHost_FreeType_common.cpp
src/utils/SkCanvasStack.cpp
src/utils/SkCanvasStack.h
src/utils/SkCanvasStateUtils.cpp
src/utils/SkDeferredCanvas.cpp
src/utils/SkFrontBufferedStream.cpp
src/utils/SkPictureUtils.cpp

Change-Id: Ice86d9769ed99f804932d8839acfdea695cb6d28
93315ecae68a156070abfe20c3ece33e64a0840b 07-Dec-2013 Kristian Monsen <kristianm@google.com> Hide warnings for skia

Can be handled upstream if needed.

Change-Id: I25d4ab459b1158c3f7f0f8129561cf9495b60fca
/external/skia/Android.mk
d0b8daaf46d99c648de274196ab7cf903a5d488b 10-Dec-2013 Derek Sollenberger <djsollen@google.com> Revert "Use FORTIFY_SOURCE=2 now that Skia has been updated to support it."

This reverts commit 2326bc6fe250b4830168c1e74f50cadf53e5b37d.

This also fixes a boot error on debug devices.

Change-Id: I66069ca7131df807e594b86909a48f8f1713e116
/external/skia/Android.mk
2326bc6fe250b4830168c1e74f50cadf53e5b37d 09-Dec-2013 Derek Sollenberger <djsollen@google.com> Use FORTIFY_SOURCE=2 now that Skia has been updated to support it.

Change-Id: Ic03df71bc99e9719a68ee5cf7dba2bb948291704
/external/skia/Android.mk
0d480609683ee645fda3ecf64208dad73164cab9 21-Nov-2013 Derek Sollenberger <djsollen@google.com> fix compiler error where SK_SCALAR_IS_FLOAT is not defined.

Change-Id: I83345342a6b83478e94a489e0d98316ebce859cb
/external/skia/Android.mk
14e97bb1ef42971eb1e196540ef200d76b8fe3db 18-Nov-2013 Derek Sollenberger <djsollen@google.com> Merge Skia r12108 into android

Conflicts:
include/pdf/SkPDFDevice.h
include/utils/SkCanvasStateUtils.h
include/utils/SkFrontBufferedStream.h
src/core/SkDevice.cpp
src/core/SkDeviceLooper.cpp
src/core/SkDeviceLooper.h
src/doc/SkDocument_PDF.cpp
src/gpu/GrAAHairLinePathRenderer.cpp
src/gpu/GrAAHairLinePathRenderer.h
src/gpu/GrTextContext.cpp
src/images/SkImageDecoder_libpng.cpp
src/images/SkScaledBitmapSampler.cpp
src/images/SkScaledBitmapSampler.h
src/pdf/SkPDFDevice.cpp
src/pdf/SkPDFDeviceFlattener.cpp
src/ports/SkFontConfigInterface_android.cpp
src/ports/SkFontHost_FreeType.cpp
src/utils/SkCanvasStack.h
src/utils/SkCanvasStateUtils.cpp
src/utils/SkDeferredCanvas.cpp
src/utils/SkFrontBufferedStream.cpp
tests/CanvasStateTest.cpp

Change-Id: Ia38ee21ae98fd5455c551becd7e1884c334f5df1
dfe4338ec07d3cb9e1572a802d290b3163fddaad 25-Oct-2013 Leon Scroggins III <scroggo@google.com> Merge perspective feature for PDF.

From Skia's repo:

http://code.google.com/p/skia/source/detail?r=11751
Add SkPDFDeviceFlatenner which extends SkPDFDevice to add support
to flatten the path and the text when we have perspective. prepare
to deprecate SkPDFDevice constructor, and route gm and render_pdfs
to use SkDocument::Create pdf interface instead. - controlled by a
flag add comments where we are supposed to flatten other features
(paint, shaders, ... )

https://code.google.com/p/skia/source/detail?r=11822
Implement perspective for bitmaps in pdf.

https://code.google.com/p/skia/source/detail?r=11937
PDF: support perspective in simple shaders. (this version does not
work well with tilling)

BUG:11384071

Change-Id: I48ea88d231231215349f155d972c6b9e1e127c71
/external/skia/Android.mk
29c49123ac2aa7cea20c4a6aba13e3515fca875c 18-Sep-2013 Derek Sollenberger <djsollen@google.com> Update Skia to use sftnly for character subsetting support for PDF

bug: 10314402
Change-Id: I31ed88fd072f0dbb23f20f383d410d55f7bcd202
/external/skia/Android.mk
cc7508b2ab7e56d42c1c4b75dff028286d3d3341 11-Sep-2013 Leon Scroggins III <scroggo@google.com> Fixes in support of framework changes.

Two Skia changes required for
https://googleplex-android-review.git.corp.google.com/#/c/357301/:

https://codereview.chromium.org/23464068/:
Use the default resync_to_restart in jpeg.

Our version requires rewinding the stream, which is not always
supported. Instead, depend on jpeg's default version.

This is required because the new framework code assumes that an
image stream will never be rewound unless it's at the beginning.

https://codereview.chromium.org/23717055/:
Add a buffered SkStream class.

This is used by Android to buffer an input stream which may not
otherwise be able to rewind.

Add a test for the new class.

This change allows us to buffer natively, and to only buffer the
beginning of the stream, which is all that is needed by the image
decoders.

BUG:8432093
BUG:6493544
BUG:10725383

Change-Id: I39fb1346866066693e14b6bcab1c398b9befa296
/external/skia/Android.mk
15a0b019703e4472e1cf5e7ac5e7753ef320a5b2 05-Sep-2013 Derek Sollenberger <djsollen@google.com> Merge "Create a semi-stable API for capturing the state of an SkCanvas and reconstructing that state across different versions of Skia." into klp-dev
fa0ab893eb60a41aac6945ab26d2b3a7e38443c4 29-Aug-2013 Derek Sollenberger <djsollen@google.com> Create a semi-stable API for capturing the state of an SkCanvas and reconstructing that state across different versions of Skia.

cherry-pick of https://skia.googlecode.com/svn/trunk@11013
cherry-pick of https://skia.googlecode.com/svn/trunk@11081

bug:10152369
Change-Id: I7821cf6efe856d5da0ba9c9ddda7a7ad392492e2
/external/skia/Android.mk
bd353162926d4e7adf5b4345552be4bf62f5397a 04-Sep-2013 Derek Sollenberger <djsollen@google.com> Merge skia changes from the skia chrome/m30_1599 branch.

This captures revisions r10947 to r11077 (inclusive). However, some
PDF changes have already been cherry-picked so they will not show
up in this CL.

bug: 10285384
Change-Id: I5648963a4f2c4f36cdfbf316052176264cf643a6
/external/skia/Android.mk
404e5726adadda5aedc12705f662aa471981ec3f 27-Aug-2013 Leon Scroggins III <scroggo@google.com> Remove decoders' dependence on getLength.

Skia's decoders were calling getLength, which is not always
a reasonable call to make. This CL cherry-picks three changes
from Skia which remove the dependency.

cherry-pick of https://skia.googlecode.com/svn/trunk@10848
cherry-pick of https://skia.googlecode.com/svn/trunk@10849
cherry-pick of https://skia.googlecode.com/svn/trunk@10850
(Also modified Android.mk to include SkStreamHelpers.)

BUG:8432093

Change-Id: I271077eeaaf3fa11487ae30c188acd764fc494a6
/external/skia/Android.mk
1c38bb9ea8c4c8f5227c3e25e86faddfbf824524 14-Aug-2013 Leon Scroggins III <scroggo@google.com> Merge Skia r10680 into Android.

Conflicts:
include/core/SkUserConfig.h
src/images/SkImageDecoder_libjpeg.cpp

Change-Id: I40e031f0abcd0d1e064b25f071bfc5f1b3c55e91
24330191f85778b7989c7528e801b55d66032793 13-Aug-2013 Mike Klein <mtklein@google.com> Build Skia with Thumb2 instead of ARM.

This change cuts libskia.so from 2.3MB to 1.5MB with no loss in
performance.

We've recently cleared away the issues that were preventing Skia from
building with Thumb2, and our performance tests showed it was at worst
neutral on a Nexus S, and slightly positive on a Nexus 4. Skia has been
building and testing with Thumb2 for two uneventful weeks now, and Clank
has apparently been doing it for forever.

bug: 9914906
Change-Id: I4f9ed568214b31b148516db60f8f6c7a8e349389
/external/skia/Android.mk
f8eb2b4560b47f38a7d0aa401bebddb03d571506 08-Aug-2013 Torne (Richard Coles) <torne@google.com> Add the debug canvas to the built files.

Chromium expects to be able to use the skia debug canvas; add it to the
list of files built along with its dependencies.

Change-Id: I43e890f0440a9b4b77ac025f5f0461fad801490f
/external/skia/Android.mk
3e461ec17949cc857d1bfa99450d966ce3c702c8 08-Aug-2013 Torne (Richard Coles) <torne@google.com> Update skia compiler defines.

Add GR_GL_PER_GL_FUNC_CALLBACK=1 as Chromium requires it, and move
GR_GL_USE_NEW_SHADER_SOURCE_SIGNATURE=1 into the headers instead of the
command line so that it's visible by code including skia headers.

Change-Id: Ia6ccb487e60359322e35648e53a7f5a659ddcd41
/external/skia/Android.mk
0cfa53d69f121ba65ae8466971f54c38081afe44 31-Jul-2013 Derek Sollenberger <djsollen@google.com> Merge Skia r10377 into Android.

This CL also includes a cherry-pick of r10483 to fix
errors in the JPEG region decoder.

Conflicts:
include/core/SkUserConfig.h
src/images/SkImageDecoder.cpp
src/images/SkImageDecoder_libbmp.cpp
src/images/SkImageDecoder_libgif.cpp
src/images/SkImageDecoder_libico.cpp
src/images/SkImageDecoder_libjpeg.cpp
src/images/SkImageDecoder_libpng.cpp
src/images/SkImageDecoder_libwebp.cpp
src/images/SkImageDecoder_wbmp.cpp
src/ports/FontHostConfiguration_android.cpp
src/ports/FontHostConfiguration_android.h
src/ports/SkFontConfigInterface_android.cpp

Change-Id: I415ba6cfbb7ee41f4c8c5c01ec1bcc32345568d2
5e6f301ec7ec33e6f8395a264ef08fa7b70014ad 27-Jun-2013 Victoria Lease <violets@google.com> Use shared libft2.

Bug: 9603326
Change-Id: Ibbe29d780dd24c08a4165360e7b6d6231063e8a7
/external/skia/Android.mk
7f1beae4f6689f886da0653ac66e0943d565fcd8 27-Jun-2013 Stephen Hines <srhines@google.com> Merge "Switch to shared libpng dependency."
0b217352c176b39edb74e67d4f505fd18d7e8d2f 27-Jun-2013 Derek Sollenberger <djsollen@google.com> Merge "Remove legacy_skia library from the build."
f0f7710af3155c8bbd566c32249e72a968459c78 27-Jun-2013 Derek Sollenberger <djsollen@google.com> Remove legacy_skia library from the build.

We no longer support saved page playback from the original
android browser so this library is not required.

Change-Id: I51d68366512372b5196098b2d5d7dde5ee7522db
/external/skia/Android.mk
b74c0670da8a3599e098c92fe14851110096b41f 27-Jun-2013 Stephen Hines <srhines@google.com> Switch to shared libpng dependency.

Bug: 9593270
Change-Id: I54e913a39b1991dd4a37b270ea2749ed2ed41129
/external/skia/Android.mk
d11144f6e3d530a44e7315e54f58757a8ebcf604 24-Jun-2013 Romain Guy <romainguy@google.com> Change the order of image decoders

Image decoders are now tested in the following order:
PNG
JPEG
GIF
WEBP
ICO
(W)BMP

Change-Id: I0cb1e24bc53f09f1b681f73d098438a742cd6205
/external/skia/Android.mk
709751d09b850b0cd95d447e1161af797013608a 12-Jun-2013 Svetoslav Ganov <svetoslavganov@google.com> Merge "Print - canvas to PDF"
d7a7a1489200c3bcb14ecfb7a2f74d5c47cb6053 07-May-2013 Torne (Richard Coles) <torne@google.com> Add Skia files needed by Chromium to build.

The Chromium-powered WebView requires SkNullCanvas, SkSurface_Gpu and
SkImage_Gpu to link against the system skia. The sources already exist
so just add them to the build.

Change-Id: Idaf83280280c922bfb17a9a2a5149dd48a6955a9
/external/skia/Android.mk
4e8a2cdd3deed2880569de57ac2090aa7a6910cc 04-May-2013 Svetoslav Ganov <svetoslavganov@google.com> Print - canvas to PDF

Include the PDF related Skia classes to the binary.

Change-Id: Ida2b788d8f313e9215ebe8e02b4e2f2a43ef2bc5
/external/skia/Android.mk
e7e8691b08f0cf2292ff470ada84e03ded358075 28-May-2013 Derek Sollenberger <djsollen@google.com> Merge Skia r9286 into android.

Conflicts:
include/core/SkFontHost.h
include/core/SkPaint.h
include/core/SkScalar.h
include/ports/SkTypeface_android.h
src/core/SkPaint.cpp
src/core/SkScalerContext.cpp
src/core/SkScalerContext.h

bug: 8719528
Change-Id: Icf2f43cfaacc6f0a0fa1965b2c1f4d2b957e9982
a193295eff3c2271cd17e77ac5cc169d67f64d2b 01-May-2013 Nick Kralevich <nnk@google.com> am d4e621de: resolved conflicts for merge of 52454e14 to jb-mr2-dev-plus-aosp

* commit 'd4e621de189a48cbaeed7848eb9c8c80b1276170':
skia: Don't use -D_FORTIFY_SOURCE=2
d4e621de189a48cbaeed7848eb9c8c80b1276170 01-May-2013 Nick Kralevich <nnk@google.com> resolved conflicts for merge of 52454e14 to jb-mr2-dev-plus-aosp

Change-Id: I519864f11ad11aa44601b55dbf4bc7e2ae566b18
c8879d1477a05db6d79cf5be9661ac8248c7064d 30-Apr-2013 Nick Kralevich <nnk@google.com> skia: Don't use -D_FORTIFY_SOURCE=2

SkString uses a dynamic growing mechanism for storing strings.
This dynamic mechanism confuses GCC, which thinks it's operating
with a single character. This causes crashes when we use
Android's -D_FORTIFY_SOURCE=2 extensions.

Consider the following code:

SkLanguage SkLanguage::getParent() const {
SkASSERT(fInfo != NULL);
const char* tag = fInfo->fTag.c_str();
SkASSERT(tag != NULL);

// strip off the rightmost "-.*"
char* parentTagEnd = strrchr(tag, '-');
[DELETED]
}

fInfo->fTag is a SkString, which is declared as:

class SkString {
public:
[DELETED]
size_t size() const { return (size_t) fRec->fLength; }
const char* c_str() const { return fRec->data(); }
char operator[](size_t n) const { return this->c_str()[n]; }
[DELETED]
private:
struct Rec {
public:
size_t fLength;
int32_t fRefCnt;
char fBeginningOfData;

char* data() { return &fBeginningOfData; }
const char* data() const { return &fBeginningOfData; }
};
Rec* fRec;
[DELETED]
};

When "fInfo->fTag.c_str();" is executed in "SkLanguage::getParent()", it
returns a pointer to fBeginningOfData, which is a single char. The compiler
believes that "tag" always points to an element of size 1. When Android's
strrchr() fortify extensions are called, we trigger an abort, because
strrchr() detects an attempt to read beyond the one character
fBeginningOfData.

Change-Id: Ibe957544b5114c14018630a8f42213bf3dd806e3
/external/skia/Android.mk
3cdbbd65a9b8d4095ef4585f31ff4e06d951b50f 25-Apr-2013 Derek Sollenberger <djsollen@google.com> Move emoji support out of libskia and into libwebcore.

These emoji files are only used by libwebcore and are not part of
the core Skia library. This CL should only be committed after
the companion CL has been submitted to external/webkit.

bug: 8719528
Change-Id: I27ce95f5c6f51c967d9f370d576321b2d6fd2c41
/external/skia/Android.mk
207da17618b0aaf14868279781dc6a3a948721fe 10-Apr-2013 Ying Wang <wangying@google.com> am eb323f3d: Add liblog

* commit 'eb323f3df1f2d2d2ac7c368f2e4584ca197c738d':
Add liblog
eb323f3df1f2d2d2ac7c368f2e4584ca197c738d 10-Apr-2013 Ying Wang <wangying@google.com> Add liblog

Bug: 8580410
Change-Id: I2de6a0b69b31ed33a14c9b9bcbbe09845a28ac8c
/external/skia/Android.mk
e366d4de0dd7a24ec0c4de077006ce4dd61379cf 09-Apr-2013 Torne (Richard Coles) <torne@google.com> Fix exported include directories.

Use correct variable name for the list of exported directories.

Change-Id: Ic39cdb5cb9ec2c8d0a93b33601a4b679e22f4241
/external/skia/Android.mk
dde23ce372d3ac1beb27c82ad5814cc744b843d8 03-Apr-2013 Derek Sollenberger <djsollen@google.com> Merge Skia r8352 into Android

Change-Id: Id9945639617af9802b3d16a5f8485469125e8545
18fe1b8303d434641c203cc6690f2d8539e4c4fc 08-Feb-2013 Jesse Hall <jessehall@google.com> Android now has the new glShaderSource signature

Change-Id: I45836219fc0e97607d83d458de9babb44f4c7534
/external/skia/Android.mk
60a9b8e11b10563167107cebafd1cc25d825d7b1 04-Feb-2013 Derek Sollenberger <djsollen@google.com> Merge Skia @7527

Conflicts resolved in:
include/gpu/GrBackendEffectFactory.h
src/core/SkPaint.cpp
src/effects/gradients/SkLinearGradient.cpp
src/ports/FontHostConfiguration_android.cpp

Change-Id: I5ad1f8f99f8fdbc26c5f98861701dd0c1cee82fa
08081fbbf2aaed53584de08df7895966f4cc7ec7 22-Jan-2013 Derek Sollenberger <djsollen@google.com> am 0203c47d: Introduces new shared library that will be used to playback SkPictures.

* commit '0203c47d888ed327c5df7d2233fc9ccb707d9725':
Introduces new shared library that will be used to playback SkPictures.
0203c47d888ed327c5df7d2233fc9ccb707d9725 16-Jan-2013 Derek Sollenberger <djsollen@google.com> Introduces new shared library that will be used to playback SkPictures.

This is a specific library only needed on devices that must be capable
of playing back SkPicture files recorded with a previous version of
Skia than what is currently on the system.

bug: 8019756
Change-Id: I0c1b8c8d74fd4df64b86c2e2eb534bd85841d81c
/external/skia/Android.mk
1d0f5a1e3b467fc2211e2a94b3806770b228b6e0 19-Dec-2012 Derek Sollenberger <djsollen@google.com> Merge Skia @6890

Change-Id: I12ae1c7ebdb566addf3d2783c8405793e842df8a
6699e7ea2e981dccc2f3c41b5dcf1c860b11558d 06-Dec-2012 Jean-Baptiste Queru <jbq@google.com> Merge skia @5967

Change-Id: I8c637470b52c8277a781111c2ac2d1dcce7d84fa
2f7c075a731da5b1ca95509ed657082ac7e2229b 30-Aug-2012 Jean-Baptiste Queru <jbq@google.com> am a223e0da: am 2f12560c: Merge "Enable dynamic effect of GIF animating images in browser"

* commit 'a223e0da1c4693214de7e299e7d4103df917a77f':
Enable dynamic effect of GIF animating images in browser
42490b99d3a6053501fed7f38f36c5ac4644f631 06-Jan-2012 bxu10X <bxu10X@intel.com> Enable dynamic effect of GIF animating images in browser

The ANDROID_LARGE_MEMORY_DEVICE flag is not set for x86 platforms but it
is required to get animated GIF working. 256MB is considered "large".

Change-Id: I2ed6d1668702e6b422e6d585eb8cd06f064ccc32
Author: Bin Xu <bxu10X@intel.com>
Signed-off-by: Bin Xu <bxu10X@intel.com>
Singed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 19205
/external/skia/Android.mk
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/Android.mk
fd3c420022d5f842fe8be5c21300e0d01463a5ad 17-Aug-2012 Victoria Lease <violets@android.com> Forward-compatibility stubs

Change-Id: I9c5bf5ce38827ced91d8912a1fa49adbd14a46b8
/external/skia/Android.mk
0c3afa6fd3b1f6a541e7bdabcde121ff98851376 07-Jun-2012 Billy Hewlett <billyh@google.com> Merge "Fix hardcoded font path. Allow adding new font path thru Skia changes. Bug: 6609231 Change-Id: Ie37ada42e7e78ab78318f3ed76eb627bffaddb1a"
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/Android.mk
bd64a4dd0d45eb7ea09dd46e2e5f3291655dbc5e 30-May-2012 Victoria Lease <violets@google.com> Use FreeType's "embolden", but only if face is not already bold.

A side-effect of not knowing the actual SkTypeface used to draw text
until render-time is that we cannot make decisions based upon the
face's proper font metrics. As a result, attempts to draw bold text
will fail when a fallback font with normal weight is selected. With
this, we can feel free to enable fake bold mode even if the primary
font is bold, as the extraneous fake bold bit will just get ignored
at render-time if the actual font used to draw the text is bold.

Bug: 6522642
Change-Id: Icdd13f6bd36a85ba374b6ed7a08b596d4c31e86f
/external/skia/Android.mk
c7cd3e0c090c34b165ff6d1113bdc13f4b917b9b 09-May-2012 Derek Sollenberger <djsollen@google.com> Apply ARM patches from NVidia for improved drawing performance.

Add S32A_Opaque_BlitRow32 with TEST_SRC_ALPHA
Add optimization for 32bit blits on neon
Optimize S32A_D565 pixel loop, non-NEON CPUs

bug: 6467331
Change-Id: I3e0b0a8f711bf2ed97b480b81232a52f6f94dbe3
/external/skia/Android.mk
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/Android.mk
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/Android.mk
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/Android.mk
4c1b54bf6aea8259873106d4974e757aee70b3fc 24-Jun-2011 Jean-Baptiste Queru <jbq@google.com> Merge 3c1b974a and a4f65ce7

Change-Id: I536026aab833367350b595b41911e9888cff2e3a
a059123d8eb75302b13a7fd831478413d124d618 22-Jun-2011 Vikas Arora <vikasa@google.com> Add WebP Encoder support to SkImageEncoder.

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
/external/skia/Android.mk
273db0f7b457b771a273eff40c4a459fcccee651 14-Jun-2011 Derek Sollenberger <djsollen@google.com> Merge "Create a GrGLDefaultInterface for Android."
0b15698a8c76bb8abc1b555c1d91892669b4118f 06-Jun-2011 Derek Sollenberger <djsollen@google.com> Skia Merge (revision 1510)

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
/external/skia/Android.mk
ccbb72b5e5240d9119ce42bdbb8f6877994b7de8 20-May-2011 Leon Scroggins <scroggo@google.com> Create a GrGLDefaultInterface for Android.

Change-Id: I012146e7769aafd35f624325501a0ee97b0cad18
/external/skia/Android.mk
35e2e62b55598210f6999fc2ea26ff8f41446ffe 16-May-2011 Derek Sollenberger <djsollen@google.com> Skia Merge (revision 1327)

Change-Id: I46f41274d07a3d7bac4728f8841c7f5e89dc9181
/external/skia/Android.mk
87b8e645865f9633f410c02252a0fd3feb18f09b 14-Apr-2011 Derek Sollenberger <djsollen@google.com> Skia Merge (revision 1116)

There is a companion change in external/webkit

Change-Id: I1c4110e7520bbef3f4e5f9551adb7ec79ac1e3ed
/external/skia/Android.mk
137a4ca42423bbb6d683067ea544c9a48f18f06c 17-Mar-2011 Derek Sollenberger <djsollen@google.com> Skia Merge (revision 950)

This merge will allow us to now import the sample app
infrastructure in skia to do on device measurements.

Change-Id: Idcab6b1524f371521717cde61a6e98a12d897e6b
/external/skia/Android.mk
74620984a3d6d6d9ca2e564a487a00b987a9eb33 17-Mar-2011 Derek Sollenberger <djsollen@google.com> Build the golden master tests for skia.

Change-Id: I6cb3b47a36f8c334c7bfb77af6ea957bd2d78cf5
/external/skia/Android.mk
ea865e804a942e6de638828167d4422c5b44538a 15-Mar-2011 Derek Sollenberger <djsollen@google.com> Merge "Skia Merge (revision 922)"
70c511db32497911529a75652f53b295a5f75917 14-Mar-2011 Iliyan Malchev <malchev@google.com> external/skia: remove LOCAL_PRELINK_MODULE

Change-Id: Ice2f93f6a2c910c9e4b14b5de4de083e8de9f335
Signed-off-by: Iliyan Malchev <malchev@google.com>
/external/skia/Android.mk
05b6b4d746867a9fb02e14edfe1bf3685abeb813 14-Mar-2011 Derek Sollenberger <djsollen@google.com> Skia Merge (revision 922)

Change-Id: I7ed57d10905d8bad6486a4d7410165eec1cc2b4f
/external/skia/Android.mk
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/Android.mk
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/Android.mk
8432fc7b32e4de877bb86b38c050b944bed53f14 22-Dec-2010 Eric Hassold <hassold@google.com> Add support for WebP format in Skia

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
/external/skia/Android.mk
bb98807a9a02751ed2fcc98376f323ad93e15fa4 03-Sep-2010 Wei-Ta Chen <weita@google.com> Rename SkLargeBitmap to SkBitmapRegionDecoder (the previous renaming was reverted).

The change is identical to https://android-git.corp.google.com/g/#change,64714 .

Change-Id: If0136fcc96bcdab323607b701e2ef69ddf42f63d
/external/skia/Android.mk
5c51fb3a5a68fbed0ece985c6a0eb5c56a96a27f 08-Sep-2010 Wei-Ta Chen <weita@google.com> Revert "Rename SkLargeBitmap to SkBitmapRegionDecoder."

This reverts commit 2d8e78250676546c549082dc988e7262ab1bb154.
/external/skia/Android.mk
2d8e78250676546c549082dc988e7262ab1bb154 03-Sep-2010 Wei-Ta Chen <weita@google.com> Rename SkLargeBitmap to SkBitmapRegionDecoder.

Change-Id: I093aea3d5e3e89c75b5086ede2b8bb30d8ceed95
/external/skia/Android.mk
97fa2e455b2040c99c5b6f3e3d2ad6c9b4062081 12-Jul-2010 Joseph Wen <josephwen@google.com> Do JPEG tile-based decoding.

Change-Id: I795129d55a0a7da90b4d604a902066868933d2a9
/external/skia/Android.mk
f393f015a3bd0709645b8f464ee41c82fc7624e2 06-May-2010 Dan Bornstein <danfuzz@android.com> For issue #2651381, allow library prelinking.

Change-Id: Id386c3cf549c5856de1c0c0a91665b20e59672e0
/external/skia/Android.mk
215473cea1702d8acc0316da3e5a9bf4ce0130ef 09-Mar-2010 Mike Reed <reed@google.com> disable neon-opt for 32A->565 + alpha blend since it doesn't correctly treat
src-alpha == 0 as a no-op.

update unittests to measure this

Change-Id: If4d61ac5f7ff3d7fc27cbc3f242dbdf7ff4e76be
http://b/issue?id=2333376
/external/skia/Android.mk
88a72757cc27cfb6413b659b9ec531ab8ba33aa2 04-Mar-2010 Mike Reed <reed@google.com> update jpeg ram limits for large and small RAM class devices

http://b/issue?id=2401896

Before the fix, the image referenced in the bug would take 30+ seconds to load on a large device,
and would crash a small device. On the small device, there was no RAM cap set, since the property
we queried for does not exist there. On the large device, the properties value was too small, so
I hard-code a larger one that seems to work better.
/external/skia/Android.mk
c387e939e9e8fdce566feeb8b8f37e3f2e01cd50 12-Feb-2010 Mike Reed <reed@google.com> add SkLayer (from webkit)
/external/skia/Android.mk
2c1275107148cb95b0497cadeeb43e31d5063929 02-Dec-2009 Wei-Ta Chen <weita@google.com> 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.
/external/skia/Android.mk
e82b0f78fdc83c8eaac0ec5afcddf0a723aaf1c5 06-Jan-2010 Wei-Ta Chen <weita@google.com> Decouple libjpeg from libskia.

There are two other related changes under review:
1) Build libjpeg to a shared library
2) Add libjpeg to the prelink map
/external/skia/Android.mk
8e048c19870a898cecdde3b3c0d2d512e6f372c0 20-Nov-2009 Mike Reed <reed@google.com> new edgelist builder that chops segments into clip-sized coordinates, to avoid overflows

The change is conditional at the moment inside SkScan_Path.cpp, USE_NEW_BUILDER.

This chopping is meant to only pass in reasonable floats to the edgelist, so that we never
overflow when converting to fixed-point. It also has the side-effect of speeding up edges
to the left/right of the clip, since those become vertical lines, which are faster to
walk over than the original curve segment.

Future optimizations: throw away segments to the right of the clip, and tweak the edgelist
walker to not require an explicit matching right-edge for the current run.
/external/skia/Android.mk
27b953159488bb519b49751497a62eb837b9a881 30-Oct-2009 Mike Reed <reed@google.com> am 9521ac9c: add table maskfilter

Merge commit '9521ac9c669ee93f2e8ebfb4549ec64b57fe3559' into eclair-mr2

* commit '9521ac9c669ee93f2e8ebfb4549ec64b57fe3559':
add table maskfilter
9521ac9c669ee93f2e8ebfb4549ec64b57fe3559 29-Oct-2009 Mike Reed <reed@google.com> add table maskfilter

http://b/issue?id=2210685
/external/skia/Android.mk
3798ac8a1beee1c03d45bde7cf810353829d5f93 28-Oct-2009 Mike Reed <reed@google.com> add boundary patch utils
/external/skia/Android.mk
4b68387a31e4e60a35c6bfd8f532a6b30303e1ff 29-Sep-2009 Mike Reed <reed@google.com> disable neon for perspective nofilter indices

It is computing out-of-range indices. When I debug it, I'll renable it with the fix.
/external/skia/Android.mk
d0195f840fa964da51f7a1192b432954794e660c 23-Sep-2009 Mike Reed <reed@google.com> refresh from skia, with blitrow_d32 bottlenecks for neon optimizations
/external/skia/Android.mk
e32706edd70b0f847fe4d124a195cd2927dc8021 14-Sep-2009 Mike Reed <reed@google.com> add SkSize.h
add golden-master (gm) test app
/external/skia/Android.mk
7cc0a6ac7b817b217dd614cba96fc533b32d505d 04-Aug-2009 Mike Reed <reed@google.com> enable arm flags in makefile and by including cpu-features.h
/external/skia/Android.mk
aef24e041e1ec6bc910ff1dce404831c1dcfecc6 03-Aug-2009 Mike Reed <reed@google.com> add arm/neon optimizations for bitmap sampling
original code submitted by ARM LIMITED 2009
/external/skia/Android.mk
2f37fb3e294f62ec68d075d5a59efbde244c4e43 31-Jul-2009 Marco Nelissen <marcone@google.com> Fix simulator build.
/external/skia/Android.mk
96e6157bf8ddd0ab1ee75d3bf56d1443d3571d45 30-Jul-2009 Mike Reed <reed@google.com> add opts directory to hold arm/neon specific functions
vector out to those from our blitrow factory
/external/skia/Android.mk
b1fd0813e0219e9f536ee5f43e988d10f4e147e6 17-Jul-2009 Mike Reed <reed@google.com> remove build conditional for mipmaps
/external/skia/Android.mk
60441ca59855d5289dd533aea1a40eb898b8a745 16-Jul-2009 Mike Reed <reed@google.com> add fast-case for bitmap shaders
first stage of neon optimizations
/external/skia/Android.mk
bc22683e2ed4aa3439c6edd3dc1e261c399c023e 10-Jul-2009 Mike Reed <reed@google.com> rename libsgl/libcorecg to libskia
/external/skia/Android.mk
9c762df18b8a4dae9969cb79eb3b1f53a749f5eb 08-Jul-2009 Mike Reed <reed@google.com> conditionally set SK_SOFTWARE_FLOAT only if we're not building armv7-a, so we can take full
advantage of hw floats on v7 class devices.
/external/skia/Android.mk
7d7b3cfdc1683207ff600eb39dbf81be53289a94 25-Jun-2009 Wei-Ta Chen <weita@google.com> am 323fc5f6: Fix a broken sim-eng build because of lacking of arm arch check.

Merge commit '323fc5f6b797daedeb80cf137de1f7abb1ce6ff3'

* commit '323fc5f6b797daedeb80cf137de1f7abb1ce6ff3':
Fix a broken sim-eng build because of lacking of arm arch check.
323fc5f6b797daedeb80cf137de1f7abb1ce6ff3 24-Jun-2009 Wei-Ta Chen <weita@google.com> Fix a broken sim-eng build because of lacking of arm arch check.
/external/skia/Android.mk
16eccd8371e7a2b8303aea210c1eb58a45b40604 25-Jun-2009 Wei-Ta Chen <weita@google.com> am 9255d4e0: Bypass source-overing if the alpha value of a source color equals to 255, i.e., no need to add previous destination color values.

Merge commit '9255d4e019df455c662b01c7030b5d9ec2376695'

* commit '9255d4e019df455c662b01c7030b5d9ec2376695':
Bypass source-overing if the alpha value of a source color equals to
9255d4e019df455c662b01c7030b5d9ec2376695 24-Jun-2009 Wei-Ta Chen <weita@google.com> Bypass source-overing if the alpha value of a source color equals to
255, i.e., no need to add previous destination color values.

My experimental results showed that the percentage of calls
to SkSrcOver32To16() falling into the bypass path in the following
processes are around:
1. system_server: 72%
2. acore: 80%
3. camera: 57%
4. browser: 66%
/external/skia/Android.mk
9f0b433bdd1680cd1d371c19d7e0ffde8fb2c484 22-Jun-2009 Mike Reed <reed@google.com> pull from trunk
move (and extended) xfermode enum into SkXfermode.h
fix recursion bug in stroking
minor utility code changes for new unittests
/external/skia/Android.mk
dab163f0b2658c2dba48839e72f81d3d8ee0ae8b 29-May-2009 Mike Reed <reed@google.com> refresh from skia/trunk
- add canvas entry-point for shapes
- add SDL support to GL port
- rowbytes computation fixes in bitmaps
/external/skia/Android.mk
f95abb54afa5469c53d3ac899ecbce8a386471c1 13-Apr-2009 Mike Reed <reed@google.com> Pull latest changes from skia/trunk:

SkColorPriv.h - change alpha macro to favor keep opaque destinations opaque
SkFontHost.h - new apis for accessing font tables
SkPostConfig.h - more #ifdef protections around windows.h
SkFontHost_tables.cpp added
Various updates to unit tests
/external/skia/Android.mk
049e2d4a53b95b3640d8ff158cd82729eecc6134 03-Apr-2009 Mike Reed <> AI 144454: pull from demetrius:
- use float wrappers for floorf() and pow()
- fix obsolete type reference uint16
- move android backend for SkDebugf into /ports file

Automated import of CL 144454
/external/skia/Android.mk
af527e02dce280c269d751322e9f60aac8cb97da 19-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake_rel/...@140373
/external/skia/Android.mk
0910916c0f7b951ee55c4b7c6358295b9bca0565 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
/external/skia/Android.mk
6eb364108744656fcd23a96a478aa772cd4e85bc 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
/external/skia/Android.mk
3f1a2840ec02c62cd19a80fef696accc9474c9d3 19-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@132276
/external/skia/Android.mk