aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-03-22merge in mnc-dr1.5-release history after reset to mnc-dr1.5-devandroid-6.0.1_r24marshmallow-dr1.5-releaseThe Android Automerger
2016-03-17merge in mnc-dr1.5-release history after reset to mnc-dr1.5-devThe Android Automerger
2016-03-01Update SK_CRASH to default to abort(). DO NOT MERGEandroid-6.0.1_r68android-6.0.1_r67android-6.0.1_r62android-6.0.1_r54android-6.0.1_r53android-6.0.1_r45android-6.0.1_r25marshmallow-dr1.6-releaseDerek Sollenberger
Bug: 26593930 Change-Id: I091a6668b7f72d8ecfefe0fe8ad2f3d101b36b7b
2015-10-13am e6574c69: (-s ours) am 53d34763: am a1d8ac0a: Purge non-NEON ARM code. DO ↵android-6.0.1_r9android-6.0.1_r8android-6.0.1_r7android-6.0.1_r5android-6.0.1_r4android-6.0.1_r3android-6.0.1_r22android-6.0.1_r21android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r41marshmallow-mr1-devmarshmallow-dr1.5-devmtklein
NOT MERGE * commit 'e6574c69d974ed0ca4bf392fcf7854ada466eae7': Purge non-NEON ARM code. DO NOT MERGE
2015-10-13am 53d34763: am a1d8ac0a: Purge non-NEON ARM code. DO NOT MERGEmtklein
* commit '53d347637edffad39cef105991aa22e9720dd27c': Purge non-NEON ARM code. DO NOT MERGE
2015-10-13am a1d8ac0a: Purge non-NEON ARM code. DO NOT MERGEmtklein
* commit 'a1d8ac0ac0af44d74fc082838936ec265216ab60': Purge non-NEON ARM code. DO NOT MERGE
2015-10-09Purge non-NEON ARM code. DO NOT MERGEmtklein
As I begin to wade in here, it's nice to remove as much code as possible. BUG=skia:4117 Review URL: https://codereview.chromium.org/1277953002 ======================================================================= Cherry-pick of https://skia.googlesource.com/skia/+/e683e810 Speculative fix for b/23648740. Remove the function that crashes. BUG:23648740 Change-Id: Ie4d681976bc1e39ed4f78d63d30259c9e35aea07
2015-09-22Purge non-NEON ARM code DO NOT MERGEmtklein
As I begin to wade in here, it's nice to remove as much code as possible. BUG=skia:4117 Review URL: https://codereview.chromium.org/1277953002 ======================================================================= Cherry-pick of https://skia.googlesource.com/skia/+/e683e810 Speculative fix for b/23648740. Remove the function that crashes. BUG:23648740 Change-Id: Ie4d681976bc1e39ed4f78d63d30259c9e35aea07
2015-07-14Disable SkColorShader optimization for Android Frameworkandroid-cts-6.0_r2android-cts-6.0_r1android-6.0.0_r6android-6.0.0_r5android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1marshmallow-dr-releasemarshmallow-dr-devmarshmallow-devlinaro-android-6.0Chris Craik
bug:22390304 Change-Id: Ibf8cefc82948043d8241b27b2e2dabf4dc6829d5
2015-06-26Cherry-pick changes to fix rendering artifacts on curvescaryclark
Bug: 21900179 don't square error term twice BUG=skia:3877 Review URL: https://codereview.chromium.org/1163843003 another double square BUG=skia:3877 Review URL: https://codereview.chromium.org/1152623005
2015-06-15Cherry-pick changes from Skia's M44 branchsenorblanco
BUG: 21108081 Use high precision vertex attributes. BUG:skia=3545,3771 Review URL: https://codereview.chromium.org/1145273002 Add adb_wait_for_device script BUG=skia:3718 Review URL: https://codereview.chromium.org/1149163003 SkPDF: with opaque draws, treat SRC mode as SRC_OVER BUG=chromium:473572 Review URL: https://codereview.chromium.org/1159763004 Better comments in SkXfermodeInterpretation Review URL: https://codereview.chromium.org/1159493003 Change-Id: I1ecf6e8e44994fb2acfebe33f77d2b43638089e7
2015-05-27am b6e18701: (-s ours) am 159f22e8: am 92e4a90e: (-s ours) am 17e38ec9: DO ↵djsollen
NOT MERGE Prevent integer wrap around for malloc size when creating a SkRegion * commit 'b6e18701a85015d6ccc77e50ed55d091068dc565': DO NOT MERGE Prevent integer wrap around for malloc size when creating a SkRegion
2015-05-27am 402d30ff: (-s ours) am 21abce44: am f7d70b78: (-s ours) am 60ed36df: ↵Leon Scroggins
Revert "DO NOT MERGE: Prevent integer wrap around for malloc size when creating a SkRegion" * commit '402d30ff52518b06db8998bbce8ef138e7112e6e': Revert "DO NOT MERGE: Prevent integer wrap around for malloc size when creating a SkRegion"
2015-05-27am b3d4676e: (-s ours) am 6ed1c0d9: am 7b6865e9: (-s ours) am d26ad41b: DO ↵Leon Scroggins III
NOT MERGE: Prevent integer wrap around for malloc size when creating a SkRegion * commit 'b3d4676e1f4470c090b063fe8d16e45b6d6081b5': DO NOT MERGE: Prevent integer wrap around for malloc size when creating a SkRegion
2015-05-27am 159f22e8: am 92e4a90e: (-s ours) am 17e38ec9: DO NOT MERGE Prevent ↵djsollen
integer wrap around for malloc size when creating a SkRegion * commit '159f22e83dd74d08b39bdd5ad1cd1db46bd6ad1d': DO NOT MERGE Prevent integer wrap around for malloc size when creating a SkRegion
2015-05-27am 21abce44: am f7d70b78: (-s ours) am 60ed36df: Revert "DO NOT MERGE: ↵Leon Scroggins
Prevent integer wrap around for malloc size when creating a SkRegion" * commit '21abce44194648ee0e1f9bdc2b5e68aa2a87545e': Revert "DO NOT MERGE: Prevent integer wrap around for malloc size when creating a SkRegion"
2015-05-27am 6ed1c0d9: am 7b6865e9: (-s ours) am d26ad41b: DO NOT MERGE: Prevent ↵Leon Scroggins III
integer wrap around for malloc size when creating a SkRegion * commit '6ed1c0d9947636a403319b4d386354de0c0738c5': DO NOT MERGE: Prevent integer wrap around for malloc size when creating a SkRegion
2015-05-27am 92e4a90e: (-s ours) am 17e38ec9: DO NOT MERGE Prevent integer wrap around ↵djsollen
for malloc size when creating a SkRegion * commit '92e4a90e9d49e81c37f689b5dbd1f2f09d8db1c7': DO NOT MERGE Prevent integer wrap around for malloc size when creating a SkRegion
2015-05-27am f7d70b78: (-s ours) am 60ed36df: Revert "DO NOT MERGE: Prevent integer ↵Leon Scroggins
wrap around for malloc size when creating a SkRegion" * commit 'f7d70b78303f4d930a222bbab4b2eaa6c966d3e5': Revert "DO NOT MERGE: Prevent integer wrap around for malloc size when creating a SkRegion"
2015-05-27am 7b6865e9: (-s ours) am d26ad41b: DO NOT MERGE: Prevent integer wrap ↵Leon Scroggins III
around for malloc size when creating a SkRegion * commit '7b6865e9b5bcccd2e046f64d8b8fba8c9c045a23': DO NOT MERGE: Prevent integer wrap around for malloc size when creating a SkRegion
2015-05-27am 17e38ec9: DO NOT MERGE Prevent integer wrap around for malloc size when ↵djsollen
creating a SkRegion * commit '17e38ec9b8698d73539095c52ded2c89651436a2': DO NOT MERGE Prevent integer wrap around for malloc size when creating a SkRegion
2015-05-27am 60ed36df: Revert "DO NOT MERGE: Prevent integer wrap around for malloc ↵Leon Scroggins
size when creating a SkRegion" * commit '60ed36dfef57fc77159096db59a2bc9b233d23f0': Revert "DO NOT MERGE: Prevent integer wrap around for malloc size when creating a SkRegion"
2015-05-27am d26ad41b: DO NOT MERGE: Prevent integer wrap around for malloc size when ↵Leon Scroggins III
creating a SkRegion * commit 'd26ad41b866449e685d9e6df7e56148b527ace77': DO NOT MERGE: Prevent integer wrap around for malloc size when creating a SkRegion
2015-05-27DO NOT MERGE Prevent integer wrap around for malloc size when creating a ↵djsollen
SkRegion Review URL: https://codereview.chromium.org/1143603003 Uses sk_64_mul instead of Sk64 bug:20883006 (cherry picked from commit 181f49c7acb67ad009f6deceb3b5cc0a45220ab4) Change-Id: If93c6b957ea2f31b882cc272268700e415f724c5
2015-05-27Revert "DO NOT MERGE: Prevent integer wrap around for malloc size when ↵Leon Scroggins
creating a SkRegion" This reverts commit d26ad41b866449e685d9e6df7e56148b527ace77. lmp-dev no longer has Sk64.h Change-Id: Ifffc2615d6c0ff83b839734ce8f54a9e26f4e06d
2015-05-27DO NOT MERGE: Prevent integer wrap around for malloc size when creating a ↵Leon Scroggins III
SkRegion Review URL: https://codereview.chromium.org/1143603003 bug:20883006 cherry picked from commit 181f49c7acb67ad009f6deceb3b5cc0a45220ab4 There are some modifications due to the fact that sk_64_mul does not yet exist. Instead, use Sk64. Change-Id: I0472c2b93bdf5f3bf291aaabe11a32e78497dcda
2015-05-21Prevent integer wrap around for malloc size when creating a SkRegiondjsollen
Review URL: https://codereview.chromium.org/1143603003 bug:20883006 Change-Id: I0472c2b93bdf5f3bf291aaabe11a32e78497dcda
2015-05-18Merge Skia's chrome/m44 branch into mnc-dev.Derek Sollenberger
bug:21108081 Change-Id: I2c8a4c8183d8449fe6e1c53fc69381b5c7a2e1aa
2015-05-15Merge "Revert of Font variations. (patchset #26 id:500001 of ↵Skia_Android Canary Bot
https://codereview.chromium.org/1027373002/)" into master-skia https://skia.googlesource.com/skia/+/465706820d0d373f76ab4831c286115ee0d86b7a Change-Id: I45c451de2407723669fdc9b9a3ca8c851d03e56e
2015-05-15Revert of Font variations. (patchset #26 id:500001 of ↵robertphillips
https://codereview.chromium.org/1027373002/) Reason for revert: Appears to be breaking Linux ARM bots: FAILED: /usr/local/google/home/mosaic-role/slave/repo_clients/chromium_tot/chromium/src/../../prebuilt/toolchain/armv7a/bin/armv7a-cros-linux-gnueabi-g++ ... -o obj/third_party/skia/src/ports/skia_library.SkFontHost_FreeType.o ../../third_party/skia/src/ports/SkFontHost_FreeType.cpp:37:31: fatal error: freetype/ftmm.h: No such file or directory #include FT_MULTIPLE_MASTERS_H ^ compilation terminated. Original issue's description: > Font variations. > > Multiple Master and TrueType fonts support variation axes. > This implements back-end support for axes on platforms which > support it. > > Committed: https://skia.googlesource.com/skia/+/05773ed30920c0214d1433c07cf6360a05476c97 > > Committed: https://skia.googlesource.com/skia/+/3489ee0f4fa34f124f9de090d12bdc2107d52aa9 TBR=reed@google.com,mtklein@google.com,djsollen@google.com,halcanary@google.com,bungeman@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/1139123008
2015-05-15Merge "Revert of antialias matrix-image-filter to get smooth diagonals ↵Skia_Android Canary Bot
(patchset #6 id:80002 of https://codereview.chromium.org/1134743003/)" into master-skia https://skia.googlesource.com/skia/+/daa57bfd4204f5a7d304c580bcf5ad99d0121e1f Change-Id: Ie50d2ebf0cfe1608cb134d3114bb57868ef8fe11
2015-05-15Revert of antialias matrix-image-filter to get smooth diagonals (patchset #6 ↵reed
id:80002 of https://codereview.chromium.org/1134743003/) Reason for revert: likely affect layouttests, so need to add a guard Original issue's description: > antialias matrix-image-filter to get smooth diagonals > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/fa33f5a6b770130acdc55f2ffe19dd545665726a TBR=senorblanco@google.com,robertphillips@google.com,bsalomon@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1128823010
2015-05-15Merge "Sk4px: Difference and Exclusion" into master-skiaSkia_Android Canary Bot
https://skia.googlesource.com/skia/+/0135a41e095a433414e21e37b277dab7dcbec373 Change-Id: If2bf13e3df0c18af31f4076dcd07e7469a935f20
2015-05-15Sk4px: Difference and Exclusionmtklein
This will cause minor (off-by-one) diffs due to a little lost precision: colortype_xfermodes mixed_xfermodes xfermodes2 xfermodeimagefilter xfermodes3 xfermodes Desktop: Xfermode_Difference_aa 9.77ms -> 7.32ms 0.75x Xfermode_Exclusion_aa 8.49ms -> 6.21ms 0.73x Xfermode_Difference 17ms -> 7.54ms 0.44x Xfermode_Exclusion 13.5ms -> 5.09ms 0.38x N7: Xfermode_Difference_aa 32.2ms -> 27.6ms 0.86x Xfermode_Difference 43.9ms -> 32ms 0.73x Xfermode_Exclusion_aa 40.5ms -> 26.7ms 0.66x Xfermode_Exclusion 71.5ms -> 23.9ms 0.33x This wraps up the xfermodes implemented in Sk4f. BUG=skia: Review URL: https://codereview.chromium.org/1141213002
2015-05-15Merge "antialias matrix-image-filter to get smooth diagonals" into master-skiaSkia_Android Canary Bot
https://skia.googlesource.com/skia/+/fa33f5a6b770130acdc55f2ffe19dd545665726a Change-Id: I6dbd1d7e2120d5c942105bd07c00bab37da58eea
2015-05-15antialias matrix-image-filter to get smooth diagonalsreed
BUG=skia: Review URL: https://codereview.chromium.org/1134743003
2015-05-15Merge "Update SVGDevice for RRect and drawPoints" into master-skiaSkia_Android Canary Bot
https://skia.googlesource.com/skia/+/5f68c348403b03b1c53732df0980e55c19ce5685 Change-Id: Iba1b8b932b7b6d3feddd0d4c8b7659927484fc23
2015-05-15Update SVGDevice for RRect and drawPointsreed
BUG=skia: Review URL: https://codereview.chromium.org/1127933003
2015-05-15Merge "remove localmatrix from GrGeometryProcessor base class" into master-skiaSkia_Android Canary Bot
https://skia.googlesource.com/skia/+/e3ababe44315452cd33b96a18ce316ede09ff3c3 Change-Id: I2219753479acf8a2bb12594768366c62453419f9
2015-05-15remove localmatrix from GrGeometryProcessor base classjoshualitt
BUG=skia: Review URL: https://codereview.chromium.org/1131513005
2015-05-15Merge "Make the c and ac scripts work with sh and without bin in PATH" into ↵Skia_Android Canary Bot
master-skia https://skia.googlesource.com/skia/+/c77f6af7c3ca08c94b882ccb2fbd61e6bae7ea42 Change-Id: Icc54e618c77a285b3b8990cabc83776661fd1039
2015-05-15Make the c and ac scripts work with sh and without bin in PATHkkinnunen
Make the bin/c and bin/ac scripts work with sh. The scripts are run with /bin/sh shebang, which fails atleast on ubuntu 12.04 /bin/sh. The sh in Ubuntu 12.04 is dash. The fixes are according to the suggestions in http://mywiki.wooledge.org/Bashism Also run "compare" script with explicit ./bin/ path to support people who do not have skia/bin in PATH. Review URL: https://codereview.chromium.org/1139033005
2015-05-14Set OpenGLRenderer light center separately from initial setupAlan Viverette
Bug: 16523629 Change-Id: I7245913750c362ae9dbe28975117c36e498fd781
2015-05-15Merge "add Min to SkNi, specialized for u8 and u16 on SSE and NEON" into ↵Skia_Android Canary Bot
master-skia https://skia.googlesource.com/skia/+/27e517ae533775889c98c65fa2f07b98357ecbc2 Change-Id: I9aee187f5a704b400beadfef4c062ab6601cd637
2015-05-14add Min to SkNi, specialized for u8 and u16 on SSE and NEONmtklein
0x8001 / 0x7fff don't seem to work, but we were close: 0x8000 does. I plan to use this to implement the Difference xfermode, and it seems generally handy. BUG=skia: Review URL: https://codereview.chromium.org/1133933004
2015-05-14Merge "Add a test for decoding a gif with sampleSize 4." into master-skiaSkia_Android Canary Bot
https://skia.googlesource.com/skia/+/9d214295e47405019d1494182a5182a92a22f0a6 Change-Id: I319df3a8e2b220b5601a830dee401d91766a7e13
2015-05-14Add a test for decoding a gif with sampleSize 4.scroggo
Prior to https://codereview.chromium.org/1085253002/, this would crash. Only happens with interlaced gif images with an odd height. (Maybe there are more restrictions?) Test image provided by zoran.jovanovic@sonymobile.com for checking in. Add include before includes. Review URL: https://codereview.chromium.org/1091053002
2015-05-14Merge "Remove high ref count tracker from GrFakeRefObj" into master-skiaSkia_Android Canary Bot
https://skia.googlesource.com/skia/+/87a773c5b197964cb0ae67dc8bb402d7557be6ca Change-Id: I29d927a734032ea1a3ad4e90702ee340ba2fa5f1
2015-05-14Remove high ref count tracker from GrFakeRefObjbsalomon
TBR=robertphillips@google.com Review URL: https://codereview.chromium.org/1139803003
2015-05-14Merge "fix path op builder" into master-skiaSkia_Android Canary Bot
https://skia.googlesource.com/skia/+/fba9da78acf8853f0074d0518411bafc827f3771 Change-Id: I09836520bf08352974d92e810cdb7a82ef4e176a
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 18:00:41 +0000