| 4e4a89dab47d74874d6a79c4b34d89ffbfb386af |
|
14-Aug-2014 |
Derek Sollenberger <djsollen@google.com> |
Merge changes from Skia's m37 branch into lmp-dev.
This merge includes the following CLs...
0d78ac2 Set maximum output size for scaled-image-cache images
0c1c911 Adding 64 bit checks
f2d87ba Get additional DW font metrics when available.
Bug: 17024392
Change-Id: I7956f50e5b95b1e012cf56614b12f1d834b423c1
/external/skia/dm/Android.mk
|
| fd33437fecbd8d252d53d61b98b270ade608b172 |
|
20-Jun-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Merge "Move BenchTimer to tools as Timer" into master-skia
https://skia.googlesource.com/skia/+/9ac68ee
Change-Id: I7dc24b601cc1e7bbbc1129b710adc7ff4ec2174b
|
| ab13a9fbecb1a02a2ef660d60cf171d344321922 |
|
20-Jun-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Merge "Revert of Move BenchTimer to tools as Timer (https://codereview.chromium.org/344213003/)" into master-skia
https://skia.googlesource.com/skia/+/9e64b78
Change-Id: I0d5ca3b3f94bb665dc9ac5eecb0b3d41a5afdf54
|
| 0ec0eac8419433256295c74dd2214502408f18a2 |
|
20-Jun-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Merge "Move BenchTimer to tools as Timer" into master-skia
https://skia.googlesource.com/skia/+/4ed7528
Change-Id: Ic2d1a8c7357bc2b693384423587f99bab72397b3
|
| 33f3cb871d26a73e25237257dcd2b128802e0169 |
|
19-Jun-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Merge "Remove Sk prefix from some bench classes." into master-skia
https://skia.googlesource.com/skia/+/f168b86
Change-Id: If62cff6a577fa8c2482b8cc7926af22125d96981
|
| 03d9deec706cd92f8f6524bdabc788a8df50ddf4 |
|
18-Jun-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Merge "Refactor how we handle resources path in Tests." into master-skia
https://skia.googlesource.com/skia/+/bcbc178
Change-Id: Idecea6249a2a1874080c9eaee9a57709fdb0fcbe
|
| 1dc1ba0639572b75b46770f496d18ec003d5b874 |
|
18-Jun-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Merge "Add basic stacktrace handler using libunwind." into master-skia
https://skia.googlesource.com/skia/+/30e6e2a
Change-Id: I845b3fafadc2842c38996c154bf7dbe17859d809
|
| 6ef50e6b9588ddb58852fda770874a360cd417c3 |
|
18-Jun-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Merge "In Android framework, make tools depend on jsoncpp" into master-skia
https://skia.googlesource.com/skia/+/f01a6c3
Change-Id: I821177944866bf1aaee703a38fb4dc6f1dd79495
|
| 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
|
| b6faff609c1428c3c69def9de750f6caf3273d79 |
|
12-Jun-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Merge "Cleanup: Delete sk_tools::make_filepath() in favor of SkOSPath::SkPathJoin()." into master-skia
https://skia.googlesource.com/skia/+/da4ed32
Change-Id: I6b237a1ae3e2109bcdfcec79c92bcfbf9296cabb
|
| 77e5291ca6903c9e9351c53d358a41ee181a12ce |
|
11-Jun-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Merge "Texture compression unit tests along with a couple of bug fixes" into master-skia
https://skia.googlesource.com/skia/+/2b310e4
Change-Id: I96938abbfe517aa357439f2570081c9783e08a4e
|
| a86595034260e4d24c0ae23bf3c33b9f90580a65 |
|
10-Jun-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Merge "GM/bench for text draws with various parameters and clip rects." into master-skia
https://skia.googlesource.com/skia/+/7c5c9da
Change-Id: Id2461a266120b3496f5655e6beb59726f50eeca5
|
| 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
|
| 9e143897ca864c4b577887b26250584ad1e2a75f |
|
06-Jun-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Merge "Initial KTX encoder" into master-skia
https://skia.googlesource.com/skia/+/c250d2e
Change-Id: Ic51e46f0eb6a1ac4bd9cfabf25c9e7c2828eee38
|
| a9637127438a0c795273e7892a0a6e897286b3cf |
|
05-Jun-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Merge "Add bench for rectanizers" into master-skia
https://skia.googlesource.com/skia/+/c2fce56
Change-Id: I68ed79afed16027837390ebc25d0f9fb048802ad
|
| a51c5483043e2abaf16b86e492cf1ccd78ae2995 |
|
05-Jun-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Merge "Two new benches for ETC1 bitmaps." into master-skia
https://skia.googlesource.com/skia/+/9a3cdbb
Change-Id: I61fd2efd429d0e756c65f37907bc2bb73e5fc2cd
|
| ab312cb7e11a396b04e93f042b198763bdd04e5e |
|
04-Jun-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Merge "Add non power of two gm for ETC1 bitmap" into master-skia
https://skia.googlesource.com/skia/+/2dc337c
Change-Id: Ib8e3cd42167df59861b34dff6a5975cd3aea09e0
|
| 6a890e7034bcf44a7dd6697e6970f814e8852300 |
|
04-Jun-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Merge "Android: remove -lcutils dependency" into master-skia
https://skia.googlesource.com/skia/+/bec3634
Change-Id: I078b513c9037b748d98a424ad45625985bbdd7e1
|
| b019efb721be6771c7a544d2f9c5553b5f5618b3 |
|
03-Jun-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Merge "DM: add pdf" into master-skia
https://skia.googlesource.com/skia/+/30bf3e2
Change-Id: I7d976222f74b79e50d55f1176b5e798e1216a693
|
| f56b9c160fe9eba8bfa1779a4ee54b0082a278b3 |
|
30-May-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Merge "Test font created from paint" into master-skia
https://skia.googlesource.com/skia/+/7ae034d
Change-Id: I6f79db659d1ea5eb92907a0c626dd309d7a37697
|
| 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
|
| 03a64be66b0c7a30c1b7bb07be400e865d33d0df |
|
28-May-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Merge Skia at "f449156 from Wed, 28 May 2014 17:30:02 +0000"
https://skia.googlesource.com/skia/+/f449156bd00815eae1f1daea436f08068ef0f01c
Change-Id: I8dbffa17a86582e6e30d665b4c8791b92ab581fa
|
| bf0333300c974a5618226859c1a0bf4b80e627db |
|
27-May-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Merge Skia at "f3b1eb4 from Tue, 27 May 2014 21:12:42 +0000"
https://skia.googlesource.com/skia/+/f3b1eb4ea262e48c93db8f0975e16341596cd8ec
Change-Id: Ib596c31c8a20a07b37c8956eae8a3766fa9e72c4
|
| 346b2d9f25c76e38a996bc03ae5ae7690d05f508 |
|
27-May-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Merge Skia at "44f4129 from Tue, 27 May 2014 20:54:04 +0000"
https://skia.googlesource.com/skia/+/44f41293ac94530d08fca2ce8484a7248e7a5e97
Change-Id: I089f5b24bdd2c0d4bfdf886ae35f76906e2b820c
|
| 862c0b8e58cff43625de612415fad23731b6820d |
|
22-May-2014 |
Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> |
Manual merge Skia into Android.
Change-Id: I66b251aa66696b46f3eca878083392d62f217ef0
|
| 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
|