aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'jb-mr1-release' of ↵Steve Kondik2012-11-1821-312/+886
|\ | | | | | | | | | | https://android.googlesource.com/platform/external/skia into mr1-staging Change-Id: I5cf0639d6ad25f58af4d5e0e480ee063148991f8
| * Add Android specific APIRomain Guy2012-10-161-0/+14
| | | | | | | | | | | | | | | | | | Bug #7353771 This API is just a boolean property that tells the hardware renderer whether it should use mipmap levels. Change-Id: I123a334b89b0d64d711bdad43f5e2feb416de8b4
| * Update Skia's handling of vertical text when freetype metrics are available.Derek Sollenberger2012-09-251-2/+51
| | | | | | | | | | | | | | | | This is a cherry-pick of a larger change going into upstream Skia at... https://codereview.appspot.com/6554064/ bug: 7124435 Change-Id: Id8b030afaf493741e133b592a4e08a3fd90ec2f3
| * Reduce tolerance for going into our fast path for gradients.Derek Sollenberger2012-09-211-1/+3
| | | | | | | | | | bug: 6897797 Change-Id: If7bce42f5347bc78f10c55d5041389b983813c2a
| * Increment SkPath's generation id when transform() is calledRomain Guy2012-09-041-1/+6
| | | | | | | | Change-Id: I2f164c30342620e1c0663e133ba671b4a3869b70
| * am 867c7f44: am 6a22037d: Merge "[Skia]: fix TOMBSTONE issue when browsing ↵Jean-Baptiste Queru2012-08-300-0/+0
| |\ | | | | | | | | | | | | | | | | | | JPEG image and exiting Gallery" * commit '867c7f4475b85bbe90b25f99516bd9b36814be01': [Skia]: fix TOMBSTONE issue when browsing JPEG image and exiting Gallery
| | * am 6a22037d: Merge "[Skia]: fix TOMBSTONE issue when browsing JPEG image and ↵Jean-Baptiste Queru2012-08-300-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | exiting Gallery" * commit '6a22037d0738ccf21990a3414c70dffc78cf08e3': [Skia]: fix TOMBSTONE issue when browsing JPEG image and exiting Gallery
| | | * Merge "[Skia]: fix TOMBSTONE issue when browsing JPEG image and exiting Gallery"Jean-Baptiste Queru2012-08-300-0/+0
| | | |\
| | | | * [Skia]: fix TOMBSTONE issue when browsing JPEG image and exiting GalleryZhongjun Chen2012-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When browsing JPEG image and then exiting Gallery, the TOMBSTONE issue occour. This is because JPEG Decode method still access a pointer which has been deleted. This patch can fix it. Change-Id: I3ac3e4b8f37d352a70676abb6d151961e873e459 Author: Zhongjun Chen <zhongjunx.chen@intel.com> Signed-off-by: Zhongjun Chen <zhongjunx.chen@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: 37479
| * | | | am a223e0da: am 2f12560c: Merge "Enable dynamic effect of GIF animating ↵Jean-Baptiste Queru2012-08-301-0/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | images in browser" * commit 'a223e0da1c4693214de7e299e7d4103df917a77f': Enable dynamic effect of GIF animating images in browser
| | * | | am 2f12560c: Merge "Enable dynamic effect of GIF animating images in browser"Jean-Baptiste Queru2012-08-301-0/+4
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '2f12560c46585b0b3649ffc3580ff6e86299102e': Enable dynamic effect of GIF animating images in browser
| | | * | Merge "Enable dynamic effect of GIF animating images in browser"Jean-Baptiste Queru2012-08-301-0/+4
| | | |\ \
| | | | * | 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
| * | | | am 1dccc9f3: am 372648a7: Merge "Fix access to freed memory"Jean-Baptiste Queru2012-08-271-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '1dccc9f3e889a5b702ec201129db689ab64a5eb8': Fix access to freed memory
| | * | | am 372648a7: Merge "Fix access to freed memory"Jean-Baptiste Queru2012-08-271-1/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '372648a70bbb2778edcdad588c8d133a6c55a033': Fix access to freed memory
| | | * | 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
| * | | | Disable "no context for char" log spam.Victoria Lease2012-08-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It looks like Id8c91ae0be6cad8a7ef77a0cd5803676290986c1 upgraded this message from an actual error notification into a full-fledged adb log spammer. Oops! This CL moves it back to the location it should be at, and requires SK_DEBUG to see it even there. Bug: 7038312 Change-Id: Iefc0b001a9874e0f177507d43231e6fdb4a1d92a
| * | | | DO NOT MERGE Support WebP Alpha (Lossless) imagesVikas Arora2012-08-211-12/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android/Skia supports pre-multiplied Alpha. WebP image format supports Alpha via color modes MODE_RGBA & MODE_RGBA_4444 (corresponding ones for premultiplied alpha are MODE_rgbA & MODE_rgbA_4444). The pre-requisite change for this one is the libwebp patch: https://googleplex-android-review.googlesource.com/#/c/219333/ Change-Id: I30b0d8d4b0325eb3c925371ac8f3a9b7d4801639
| * | | | DO NOT MERGE Han PreferenceBilly Hewlett2012-08-2010-232/+407
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Merge "Ensure SkCanvas will have a device by default." into jb-mr1-devDerek Sollenberger2012-08-201-1/+2
| |\ \ \ \
| | * | | | Ensure SkCanvas will have a device by default.Derek Sollenberger2012-08-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 6987261 Change-Id: I8cb5b6da2347a1fa88a13aa3548312a7773831e5
| * | | | | am 5f421caf: (-s ours) am c2ad1992: Merge "Forward-compatibility stubs"Jean-Baptiste Queru2012-08-170-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | | | | | * commit '5f421caf157bf54c2cfd2ded128ede466e761d4d': Forward-compatibility stubs
| | * | | am c2ad1992: Merge "Forward-compatibility stubs"Jean-Baptiste Queru2012-08-175-0/+138
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit 'c2ad1992ce99225f79a05ecaed619ec6b52f7bb1': Forward-compatibility stubs
| | | * | Merge "Forward-compatibility stubs"Jean-Baptiste Queru2012-08-175-0/+138
| | | |\ \ | | | | |/ | | | |/|
| | | | * Forward-compatibility stubsVictoria Lease2012-08-175-0/+138
| | | |/ | | | | | | | | | | | | Change-Id: I9c5bf5ce38827ced91d8912a1fa49adbd14a46b8
| * | | Merge "Fix bug 6888377: crash in GetUnitsPerEm on locale change" into jb-mr1-devRaph Levien2012-07-311-0/+7
| |\ \ \
| | * | | Fix bug 6888377: crash in GetUnitsPerEm on locale changeRaph Levien2012-07-301-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The underlying problem is that no SkScalerContext objects existed at the time shapeFontRun is called immediately after a locale change from en to ja (apparently the dumping of the cache caused all these to be deallocated), so gFTLibrary was null (and the call tio ref_ft_face assumes that it's initialized). There's a pattern for calls which might not necessarily be called from a scaler context (GetAdvancedTypefaceMetrics is one such), to explicitly check for an uninitialized library, and create one for the length of the call if so. This patch changes GetUnitsPerEm to follow this pattern. Change-Id: I19a4b6fa49fad0aeacc04bf971101aacca6bc94f
| * | | | am dccf2260: (-s ours) Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-07-310-0/+0
| |\ \ \ \ | | | |/ / | | |/| | | | | | | * commit 'dccf2260c8edda887454d40f61f06e72d5389139':
| | * | | Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-07-310-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | Change-Id: Ia62ca8b048a34639d11f7838b03c74420b3b3868
| * | \ \ \ Merge "Reduce embolden effect." into jb-mr1-devVictoria Lease2012-07-311-1/+11
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Reduce embolden effect.Victoria Lease2012-07-261-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Certain CJK glyphs become essentially unreadable when emboldened at sizes used by common apps like News/Weather. Reducing embolden strength slightly makes these glyphs much more readable without sacrificing bold/normal weight differentiation. Bug: 6712857 Change-Id: Iec1c478171e33751be1cddbaae6a8ec30bb6cbab
| * | | | | am 5ff3803b: (-s ours) am 1d6fa961: Reduce embolden effect. DO NOT MERGEVictoria Lease2012-07-270-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | | | | | * commit '5ff3803b6d9b61efd86cea72a525cb46e7f8c26e': Reduce embolden effect. DO NOT MERGE
| | * | | am 1d6fa961: Reduce embolden effect. DO NOT MERGEVictoria Lease2012-07-271-1/+11
| | |\ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * commit '1d6fa961d4a4787bf9444e2c0e42591236cfcab2': Reduce embolden effect. DO NOT MERGE
| * | | | Accurately calculate advances in general case. Fixes bug 6833339.Raph Levien2012-07-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The advance values computed by generateAdvance() were inconsistent with those computed by generateMetrics, because the fMatrix22 was being applied in the latter but not former case. Since fMatrix22.xx is 1.0 almost all the time (the exception is only when skew and scale are both applied), failures were rare. This patch is an alternative to ag/#/c/207887, in that they both fix the problem, but in different ways. That patch made fMatrix22.xx equal to 1.0 in almost all cases, while this one gives correct advance values for arbitrary fMatrix22 values. Change-Id: Iedfa36e884e3e3e2f078a5d4edfc82004a54e895
| * | | | Cleanup ref counts for SkCreateTypefaceForScriptBilly Hewlett2012-07-091-10/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After this checkin, SkCreateTypefaceForScript refs each typeface that it creates before it returns it. Additionally, all supported harfbuzz codepoints are added to the unicode mapping array. This patch also fixes a test crash (see bug) Bug:6756432 Change-Id: Ida3276b76e745b817f9e63be54945e411516dd03
| * | | | Merge "Revert "Revert "Use Elegant fonts for Webkit, Compact fonts for ↵Victoria Lease2012-06-219-169/+269
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Textview"""
| | * | | | Revert "Revert "Use Elegant fonts for Webkit, Compact fonts for Textview""Billy Hewlett2012-06-219-169/+269
| | | | | | | | | | | | | | | | | | This reverts commit 81957ccb58db76c172e195dc3e31eba85d3e4ac9
| * | | | | 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
| | | | | | | | | | | | | | | | | | This reverts commit 421654d4bf3ca50e2247a7389851d2e8f4812564
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fonts can be marked with elegant or compact in fallback_fonts.xml. Webkit uses elegant fonts, Textview uses compact fonts (the default), unmarked fonts are used by both. Bug: 6649136 Change-Id: I6ab6173c2efc50eba8fcc488c89dfdd083fb9c06
| * | | | | am 456fc154: (-s ours) am 8c1c7cfa: Cherrypick change to skiaBilly Hewlett2012-06-210-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | | | | | * commit '456fc154cef79072c3ceeae231a91045e9cb0e01': Cherrypick change to skia
| | * | | 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
| * | | | | am c27ee87c: Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | * commit 'c27ee87c8da93b6d609be1be18eaa0f0c7d07e98':
| | * | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: I10b0459ad51c4a2d7d62ad73d2a8fd3e51828f9c
| * | \ \ \ \ am e8fff9d9: (-s ours) am ec1ad08b: DO NOT MERGE Skia solution to fake-bold ↵Victoria Lease2012-06-140-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fallback fonts. * commit 'e8fff9d95ce9fa18d4114558f2b497ef62e240da': DO NOT MERGE Skia solution to fake-bold fallback fonts.
| | * | | | | 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.
| * | | | | | | 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. Bug: 6629786 Change-Id: I4132a232896f72f632caefd79add2f00c36a578a