aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Enable dynamic effect of GIF animating images in browserbxu10X2012-08-301-0/+4
| | | | | | | | | | | | | 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
* Merge "Fix access to freed memory"Jean-Baptiste Queru2012-08-271-1/+1
|\
| * Fix access to freed memoryNikolay Pisanov2012-08-271-1/+1
|/ | | | | | | Source should be freed after all jpeg operations completed since it is used by these operations. Change-Id: Ieb0741e1d219dc0513133a94d47df86b5f95cf29
* Merge "Forward-compatibility stubs"Jean-Baptiste Queru2012-08-175-0/+138
|\
| * Forward-compatibility stubsVictoria Lease2012-08-175-0/+138
|/ | | | Change-Id: I9c5bf5ce38827ced91d8912a1fa49adbd14a46b8
* am 8c1c7cfa: Cherrypick change to skiaBilly Hewlett2012-06-212-1/+9
|\ | | | | | | | | * commit '8c1c7cfacd82a174c65fcbf839d7037e3692aee8': Cherrypick change to skia
| * Cherrypick change to skiaBilly Hewlett2012-06-202-1/+9
| | | | | | | | Change-Id: I7514b6931a11a0a79ec3abd4068f72998fcdf99d
* | Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
|\ \ | | | | | | | | | Change-Id: I10b0459ad51c4a2d7d62ad73d2a8fd3e51828f9c
| * \ merge in jb-release history after reset to jb-devThe Android Automerger2012-06-140-0/+0
| |\ \
* | \ \ am ec1ad08b: DO NOT MERGE Skia solution to fake-bold fallback fonts.Victoria Lease2012-06-131-3/+15
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'ec1ad08b13b4034af0ae2e65da7803250a7eece3': DO NOT MERGE Skia solution to fake-bold fallback fonts.
| * | | DO NOT MERGE Skia solution to fake-bold fallback fonts.Victoria Lease2012-06-131-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This version of the fake-bold-for-fallback-fonts fix addresses the issue succinctly inside of Skia, with no need for Skia's clients to be aware of the issue. Attempts to draw a bold parent font flag the embolden flag in the associated SkScalerContext while leaving the SkPaint's fake bold flag unmodified. This depends upon change Icdd13f6b, which arranges for FreeType's FontHost to ignore redundant embolden requests. This is a cherry-pick of change I4132a232 from master. Bug: 6629786 Change-Id: I389d6793e5472d664f6ac7b894927dbfd811be12
* | | | am 9b1d0758: Merge "Cherrypick change to skia"Jean-Baptiste Queru2012-06-071-0/+34
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | * commit '9b1d07582a57f0bf58a60f0b8e8f81a5d1c6b867': Cherrypick change to skia
| * | | Merge "Cherrypick change to skia"Jean-Baptiste Queru2012-06-071-0/+34
| |\ \ \
| | * | | Cherrypick change to skiaBilly Hewlett2012-06-071-0/+34
| |/ / / | | | | | | | | | | | | Change-Id: I9845f8d042fb89fe0f4876f0021b9ec486ac3ef5
* | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-070-0/+0
|\ \ \ \ | | |_|/ | |/| | | | | | Change-Id: If3c616f2b23e6af3a3db542593af52d08a70b7ee
| * | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-060-0/+0
| |\ \ \ | | |_|/ | |/| |
* | | | am bd64a4dd: Use FreeType\'s "embolden", but only if face is not already bold.Victoria Lease2012-06-052-7/+11
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'bd64a4dd0d45eb7ea09dd46e2e5f3291655dbc5e': Use FreeType's "embolden", but only if face is not already bold.
| * | | Use FreeType's "embolden", but only if face is not already bold.Victoria Lease2012-05-312-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Reconcile with jb-releaseThe Android Open Source Project2012-05-300-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: I487813624accf824b997001a2d88930b916f1a7b
| * | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-300-0/+0
| |\ \ \ | | |/ / | |/| |
* | | | am f37732cf: Merge "detect all masks, and don\'t use masksuperblitter with ↵Derek Sollenberger2012-05-301-2/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | those." into jb-dev * commit 'f37732cf5b2f45e434ef1374224b870f1a0f2ca6': detect all masks, and don't use masksuperblitter with those.
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a cherry-pick of Skia r3364. bug: 6522740 Change-Id: I9f9360a0fd5d8bfd936072f0f9bae0709768a1b6
* | | | | Reconcile with nakasi-factoryrom-releaseThe Android Open Source Project2012-05-240-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: Ieef3e00a660125acc348dd5c4392ffa4b6fba2c3
| * \ \ \ \ merge in nakasi-factoryrom-release history after reset to jb-devThe Android Automerger2012-05-220-0/+0
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
* | | | | | Reconcile with jb-releaseThe Android Open Source Project2012-05-220-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | Change-Id: Ib508cbb004388631b20650d575b2829b481fb989
| * | | | | 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
| | | |\ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / /
| | | | | |
| \ \ \ \ \
*-. \ \ \ \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-180-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | / / / | | | |/ / / | | |/| | | Change-Id: Ica7c000a9aa45215dbefec538d8221d9d8134236
| | * | | | 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 943e1fde: Add support for reusing bitmap in webp format.Owen Lin2012-05-174-75/+140
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | * commit '943e1fde4c6ecf0eb8998cd86012caa341a02ccf': Add support for reusing bitmap in webp format.
| * | | | | Add support for reusing bitmap in webp format.Owen Lin2012-05-174-75/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also relax the constraint of the requested region. Now, we can get a region that is partially outsides the image. bug:5884845 Change-Id: Ibf455d176653ef1cf36924d685df1920d23cb542
* | | | | | am c85ca84d: Nvidia\'s patch for reusing bitmap in image region decoding.Owen Lin2012-05-173-25/+82
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'c85ca84d9f8bd5fe91b4315481858d01757ee500': Nvidia's patch for reusing bitmap in image region decoding.
| * | | | | Nvidia's patch for reusing bitmap in image region decoding.Owen Lin2012-05-173-25/+82
| |/ / / / | | | | | | | | | | | | | | | | | | | | bug: 5884845 Change-Id: Id4c13ceece618da510ed35b8fa4a69c8e1b028dd
* | | | | am 17e8e7f0: Disable the incorrect culling of vertical text.Derek Sollenberger2012-05-161-3/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '17e8e7f090bf84986b3fc2c9822daa83c8719ecc': Disable the incorrect culling of vertical text.
| * | | | Disable the incorrect culling of vertical text.Derek Sollenberger2012-05-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | bug:6242553 Change-Id: Ied1865b667c21d0a59586ec8b36db276f892ccbc
* | | | | am 41b64c06: Merge "Cleanup pixel ref mutexes in Skia" into jb-devDerek Sollenberger2012-05-168-29/+101
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '41b64c065a09cf5957f2929e471d04fc7ca9656f': Cleanup pixel ref mutexes in Skia
| * | | | Merge "Cleanup pixel ref mutexes in Skia" into jb-devDerek Sollenberger2012-05-168-29/+101
| |\ \ \ \
| | * | | | Cleanup pixel ref mutexes in SkiaDerek Sollenberger2012-05-148-29/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mutexes in pixelrefs were done very sloppily initially. The code (a) assumes all pixelref subclasses want a mutex to guard their lock/unlock virtuals, and (b) most subclasses use the same mutex for *all* of their instances, even when there is no explicit need to guard modifying one instances with another. When we try drawing bitmaps from multiple threads, we are seeing a lot of slow- down from these mutexes. This CL has two changes to try to speed things up. 1. Add setPreLocked(), for pixelrefs who never need the onLockPixels virtual to be called. This speeds up those subclasses in multithreaded environs as it avoids the mutex lock all together (e.g. SkMallocPixelRef). 2. Add setMutex() to allow a subclass to change the mutex choice. ashmem wants this, since its unflattening constructor cannot pass down the null, it needs to cleanup afterwards. see https://codereview.appspot.com/6199075/ bug: 6469917 Change-Id: I81a7cfa0b2ead5a42059697eafa58de1e7a87da2
| | | | | |
| \ \ \ \ \
*-. \ \ \ \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-160-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | / / | | | |_|/ / | | |/| | | Change-Id: I1894c61b87d17afb56f564b36fda3b87a6b3f5a4
| | * | | | merge in nakasi-factoryrom-release history after reset to jb-devThe Android Automerger2012-05-150-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| | |
| * | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-150-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-140-0/+0
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Apply ARM patches from NVidia for improved drawing performance.Derek Sollenberger2012-05-102-5/+556
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-100-0/+0
| | | |\ \
| | | | * \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-040-0/+0
| | | | |\ \
| | | | | * \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-020-0/+0
| | | | | |\ \
| | | | | | * \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-010-0/+0
| | | | | | |\ \