aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am c27ee87c: Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
|\
| * Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
| |\
| | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-140-0/+0
| | |\
* | | \ am e8fff9d9: (-s ours) am ec1ad08b: DO NOT MERGE Skia solution to fake-bold f...Victoria Lease2012-06-140-0/+0
|\ \ \ \ | |/ / /
| * | | am ec1ad08b: DO NOT MERGE Skia solution to fake-bold fallback fonts.Victoria Lease2012-06-131-3/+15
| |\ \ \ | | |/ /
| | * | DO NOT MERGE Skia solution to fake-bold fallback fonts.Victoria Lease2012-06-131-3/+15
* | | | Skia solution to fake-bold fallback fonts.Victoria Lease2012-06-131-3/+15
* | | | Merge "Prepare Skia-Webp decoder for Alpha and lossless."Pascal Massimino2012-06-071-55/+45
|\ \ \ \
| * | | | Prepare Skia-Webp decoder for Alpha and lossless.Vikas Arora2012-06-071-55/+45
* | | | | am 1316efa2: (-s ours) am 9b1d0758: Merge "Cherrypick change to skia"Jean-Baptiste Queru2012-06-070-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 9b1d0758: Merge "Cherrypick change to skia"Jean-Baptiste Queru2012-06-071-0/+34
| |\ \ \ \
| | * \ \ \ Merge "Cherrypick change to skia"Jean-Baptiste Queru2012-06-071-0/+34
| | |\ \ \ \
| | | * | | | Cherrypick change to skiaBilly Hewlett2012-06-071-0/+34
| | |/ / / /
* | | | | | Merge "Fix hardcoded font path. Allow adding new font path thru Skia changes....Billy Hewlett2012-06-075-0/+208
|\ \ \ \ \ \
| * | | | | | Fix hardcoded font path. Allow adding new font path thru Skia changes.Billy Hewlett2012-06-045-0/+208
| | |_|/ / / | |/| | | |
* | | | | | am 95e19b22: Reconcile with jb-releaseThe Android Open Source Project2012-06-070-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-070-0/+0
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-060-0/+0
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
* | | | | | am 1b0ebcb6: am bd64a4dd: Use FreeType\'s "embolden", but only if face is not...Victoria Lease2012-06-052-7/+11
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |
| * | | | am bd64a4dd: Use FreeType\'s "embolden", but only if face is not already bold.Victoria Lease2012-06-052-7/+11
| |\ \ \ \ | | |/ / /
| | * | | Use FreeType's "embolden", but only if face is not already bold.Victoria Lease2012-05-312-7/+11
* | | | | am a1c8d491: Reconcile with jb-releaseThe Android Open Source Project2012-05-300-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Reconcile with jb-releaseThe Android Open Source Project2012-05-300-0/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-300-0/+0
| | |\ \ \ | | | |/ / | | |/| |
* | | | | am dbc2ccff: am f37732cf: Merge "detect all masks, and don\'t use masksuperbl...Derek Sollenberger2012-05-301-2/+4
|\ \ \ \ \ | |/ / / /
| * | | | am f37732cf: Merge "detect all masks, and don\'t use masksuperblitter with th...Derek Sollenberger2012-05-301-2/+4
| |\ \ \ \ | | |/ / /
| | * | | Merge "detect all masks, and don't use masksuperblitter with those." into jb-devDerek Sollenberger2012-05-301-2/+4
| | |\ \ \
| | | * | | detect all masks, and don't use masksuperblitter with those.Derek Sollenberger2012-05-291-2/+4
* | | | | | am 9aae69c6: Reconcile with nakasi-factoryrom-releaseThe Android Open Source Project2012-05-240-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Reconcile with nakasi-factoryrom-releaseThe Android Open Source Project2012-05-240-0/+0
| |\ \ \ \ \
| | * \ \ \ \ merge in nakasi-factoryrom-release history after reset to jb-devThe Android Automerger2012-05-220-0/+0
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
* | | | | | | am 04eca90f: Reconcile with jb-releaseThe Android Open Source Project2012-05-220-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Reconcile with jb-releaseThe Android Open Source Project2012-05-220-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-200-0/+0
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-190-0/+0
| | | |\ \ \ \
| | | | * \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-190-0/+0
| | | | |\ \ \ \ | | | |/ / / / / | | |/| / / / / | | | |/ / / /
* | | | | | | am d4c19447: Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-210-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| | | | | | |
| | \ \ \ \ \
| *-. \ \ \ \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-180-0/+0
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | / / / | | | | |/ / / | | | |/| | |
| | | * | | | merge in nakasi-factoryrom-release history after reset to jb-devThe Android Automerger2012-05-180-0/+0
| | | |\ \ \ \ | | |/ / / / /
| | * | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-170-0/+0
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
* | | | | | | am bffb617b: am 943e1fde: Add support for reusing bitmap in webp format.Owen Lin2012-05-214-75/+140
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 943e1fde: Add support for reusing bitmap in webp format.Owen Lin2012-05-174-75/+140
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Add support for reusing bitmap in webp format.Owen Lin2012-05-174-75/+140
* | | | | | | am c9ef81a1: am c85ca84d: Nvidia\'s patch for reusing bitmap in image region ...Owen Lin2012-05-213-25/+82
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am c85ca84d: Nvidia\'s patch for reusing bitmap in image region decoding.Owen Lin2012-05-173-25/+82
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Nvidia's patch for reusing bitmap in image region decoding.Owen Lin2012-05-173-25/+82
| | |/ / / /
* | | | | | am 084ac69a: am 17e8e7f0: Disable the incorrect culling of vertical text.Derek Sollenberger2012-05-171-3/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 17e8e7f0: Disable the incorrect culling of vertical text.Derek Sollenberger2012-05-161-3/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | Disable the incorrect culling of vertical text.Derek Sollenberger2012-05-161-3/+3
* | | | | | am aa6b5030: am 41b64c06: Merge "Cleanup pixel ref mutexes in Skia" into jb-devDerek Sollenberger2012-05-168-29/+101
|\ \ \ \ \ \ | |/ / / / /