aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-7.1.2_r2' into cm-14.1staging/cm-14.1_android-7.1.2_r2Dan Pasanen2017-04-056-65/+57
|\
| * Use fixed size buffer for RLE bmps DO NOT MERGE am: 318e3505ac am: 89f3cdc1be...Leon Scroggins III2017-02-145-64/+56
| |\
| | * Use fixed size buffer for RLE bmps DO NOT MERGE am: 318e3505ac am: 89f3cdc1beLeon Scroggins III2017-02-145-64/+56
| | |\
| | | * Use fixed size buffer for RLE bmps DO NOT MERGE am: 318e3505acLeon Scroggins III2017-02-145-64/+56
| | | |\
| | | | * Use fixed size buffer for RLE bmps DO NOT MERGELeon Scroggins III2017-02-145-64/+56
| | | | |\
| | | | | * Use fixed size buffer for RLE bmps DO NOT MERGELeon Scroggins III2017-02-145-64/+56
| * | | | | Fix out of bounds memory read in GIFMovie.cpp am: 16882f7212 am: d2456e3a12 a...Leon Scroggins III2017-02-071-1/+1
| |\| | | |
| | * | | | Fix out of bounds memory read in GIFMovie.cpp am: 16882f7212 am: d2456e3a12 a...Leon Scroggins III2017-02-071-1/+1
| | |\| | |
| | | * | | Fix out of bounds memory read in GIFMovie.cpp am: 16882f7212 am: d2456e3a12 a...Leon Scroggins III2017-02-071-1/+1
| | | |\| |
| | | | * | Fix out of bounds memory read in GIFMovie.cpp am: 16882f7212 am: d2456e3a12 a...Leon Scroggins III2017-02-071-1/+1
| | | | |\|
| | | | | * Fix out of bounds memory read in GIFMovie.cpp am: 16882f7212 am: d2456e3a12 a...Leon Scroggins III2017-02-071-1/+1
| | | | | |\
| | | | | | * Fix out of bounds memory read in GIFMovie.cpp am: 16882f7212 am: d2456e3a12 a...Leon Scroggins III2017-02-071-1/+1
| | | | | | |\
| | | | | | | * Fix out of bounds memory read in GIFMovie.cpp am: 16882f7212 am: d2456e3a12 a...Leon Scroggins III2017-02-071-1/+1
| | | | | | |/|
| | | | | | | * Fix out of bounds memory read in GIFMovie.cpp am: 16882f7212 am: d2456e3a12 a...Leon Scroggins III2017-02-071-1/+1
| | | | | | |/|
| | | | | | | * Fix out of bounds memory read in GIFMovie.cpp am: 16882f7212 am: d2456e3a12Leon Scroggins III2017-02-071-1/+1
| | | | | | |/|
| | | | | | | * Fix out of bounds memory read in GIFMovie.cpp am: 16882f7212Leon Scroggins III2017-02-071-1/+1
| | | | | | | |\
| | | | | | | | * Fix out of bounds memory read in GIFMovie.cppLeon Scroggins III2017-02-071-1/+1
| | | | | | | |/|
| | | | | | | | * Fix out of bounds memory read in GIFMovie.cppLeon Scroggins III2017-02-031-1/+1
| * | | | | | | | DO NOT MERGE Do not create an SkRawCodec with zero dimensions am: 20de35a0fd ...Leon Scroggins III2017-01-113-13/+11
| |\| | | | | | |
| | * | | | | | | DO NOT MERGE Do not create an SkRawCodec with zero dimensions am: 20de35a0fd ...Leon Scroggins III2017-01-113-13/+11
| |/| | | | | | | | | |/ / / / / /
| | * | | | | | DO NOT MERGE Do not create an SkRawCodec with zero dimensions am: 20de35a0fdLeon Scroggins III2017-01-113-13/+11
| | |\| | | | |
| | | * | | | | DO NOT MERGE Do not create an SkRawCodec with zero dimensionsLeon Scroggins III2017-01-113-13/+11
| | | |\| | | |
| | | | * | | | DO NOT MERGE Do not create an SkRawCodec with zero dimensionsLeon Scroggins III2017-01-113-13/+11
| * | | | | | | Add missing "typename". Rename type in macro.Hans Boehm2016-09-271-4/+6
| |\| | | | | |
| * | | | | | | Make reference counted assignment check for races.Hans Boehm2016-09-271-0/+22
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Fix rewinding bug in SkJpegCodec (cherry picked from Skia) am: 52d00b3be7 am:...Matt Sarett2016-08-290-0/+0
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Fix rewinding bug in SkJpegCodec (cherry picked from Skia)Matt Sarett2016-08-112-5/+35
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge tag 'android-7.1.1_r25' into cm-14.1cm-14.1_oldDan Pasanen2017-03-063-13/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | DO NOT MERGE Do not create an SkRawCodec with zero dimensionsLeon Scroggins III2017-01-203-13/+11
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | skia: Use TARGET_HAVE_QC_PERF to enable QCPERFstaging/cm-14.1-cafrebaseSteve Kondik2017-01-011-1/+1
* | | | | | | | | | | Merge b580a2e6747e7fc5273eed6cedb051d54746ceed on remote branchLinux Build Service Account2016-12-151-0/+24
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge N-MR1 to remote branch.Naveen Kumar2016-12-081-0/+24
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Merge commit 'e9f90a21c05c630062ce790e32a4b21405c631bd' into reomteLalit Kansara2016-12-061-0/+24
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Add missing "typename". Rename type in macro.Hans Boehm2016-09-271-4/+6
| | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Make reference counted assignment check for races.Hans Boehm2016-09-231-0/+22
| | | | |_|/ / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Fix rewinding bug in SkJpegCodec (cherry picked from Skia) am: 52d00b3be7Matt Sarett2016-08-290-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | / / / / / | | | | | |/ / / / / | | | | |/| | | | |
| | | | * | | | | | Fix rewinding bug in SkJpegCodec (cherry picked from Skia)Matt Sarett2016-08-290-0/+0
| | | |/| | | | | | | | | | | |/ / / / | | | | |/| | | |
| | | | * | | | | Fix rewinding bug in SkJpegCodec (cherry picked from Skia)Matt Sarett2016-08-292-5/+35
| | | * | | | | | Fix rewinding bug in SkJpegCodec (cherry picked from Skia)Matt Sarett2016-07-212-5/+35
| | | | |/ / / / | | | |/| | | |
| | | * | | | | merge "SkFontHost_FreeType constructor to correctly release resources." into ...bungeman2016-05-261-21/+37
| | | |\| | | |
| | | * | | | | Simplify LightingFilter in add-free caseChris Craik2016-05-031-0/+4
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge "skia: fix a regression in decoding DNG" into nyc-devJaesung Chung2016-04-202-2/+6
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge "Use libjpeg-turbo for YUV->RGB conversion in jpeg encoder" into nyc-devMatt Sarett2016-04-191-111/+15
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge remote-tracking branch \'upstream/chrome/m50\' for N-release.hcm2016-04-186-32/+59
| | | |\ \ \ \ \ \ \ \
| * | | | | | | | | | | Merge 6f54d8ec055c01e7f1ca5016b3f023dd65b8c71c on remote branchLinux Build Service Account2016-12-060-0/+0
| |\| | | | | | | | | |
| | * | | | | | | | | | Promotion of android-external.lnx.2.0-00007.Linux Build Service Account2016-11-182-1/+36
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fix rewinding bug in SkJpegCodec (cherry picked from Skia)Matt Sarett2016-11-082-1/+36
* | | | | | | | | | | | | Merge c4e73596c318ef1ef8fcd8ad9ecaf619aa5c53d2 on remote branchLinux Build Service Account2016-11-212-1/+36
|\| | | | | | | | | | | | | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Promotion of android-external.lnx.2.0.c1-00002.Linux Build Service Account2016-11-162-1/+36
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Fix rewinding bug in SkJpegCodec (cherry picked from Skia)Matt Sarett2016-11-132-1/+36
| |/ / / / / / / / / /