aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | Fix bug 6888377: crash in GetUnitsPerEm on locale changeRaph Levien2012-07-301-0/+7
| * | | | am dccf2260: (-s ours) Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-07-310-0/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-07-310-0/+0
| | |\ \ \
| * | \ \ \ Merge "Reduce embolden effect." into jb-mr1-devVictoria Lease2012-07-311-1/+11
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Reduce embolden effect.Victoria Lease2012-07-261-1/+11
| * | | | | am 5ff3803b: (-s ours) am 1d6fa961: Reduce embolden effect. DO NOT MERGEVictoria Lease2012-07-270-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | am 1d6fa961: Reduce embolden effect. DO NOT MERGEVictoria Lease2012-07-271-1/+11
| | |\ \ \ | | | |_|/ | | |/| |
| * | | | Accurately calculate advances in general case. Fixes bug 6833339.Raph Levien2012-07-171-2/+2
| * | | | Cleanup ref counts for SkCreateTypefaceForScriptBilly Hewlett2012-07-091-10/+32
| * | | | Merge "Revert "Revert "Use Elegant fonts for Webkit, Compact fonts for Textvi...Victoria Lease2012-06-219-169/+269
| |\ \ \ \
| | * | | | Revert "Revert "Use Elegant fonts for Webkit, Compact fonts for Textview""Billy Hewlett2012-06-219-169/+269
| * | | | | Merge "Revert "Use Elegant fonts for Webkit, Compact fonts for Textview""Billy Hewlett2012-06-219-269/+169
| |\ \ \ \ \ | | |/ / / /
| | * | | | Revert "Use Elegant fonts for Webkit, Compact fonts for Textview"Billy Hewlett2012-06-219-269/+169
| * | | | | Merge "Use Elegant fonts for Webkit, Compact fonts for Textview"Victoria Lease2012-06-219-169/+269
| |\ \ \ \ \ | | |/ / / /
| | * | | | Use Elegant fonts for Webkit, Compact fonts for TextviewBilly Hewlett2012-06-209-169/+269
| * | | | | am 456fc154: (-s ours) am 8c1c7cfa: Cherrypick change to skiaBilly Hewlett2012-06-210-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | am 8c1c7cfa: Cherrypick change to skiaBilly Hewlett2012-06-212-1/+9
| | |\ \ \
| | | * | | Cherrypick change to skiaBilly Hewlett2012-06-202-1/+9
| * | | | | 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
| | |\ \ \ \
| * | \ \ \ \ 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
| | |\ \ \ \ \
| * | | | | | | 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
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ 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
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ 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
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ 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
| | |\ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| * | | | | | | | | | | | | 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
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| * | | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ am c9ef81a1: am c85ca84d: Nvidia\'s patch for reusing bitmap in image region ...Owen Lin2012-05-213-25/+82
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /