aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-12-10merge in lmp-mr1-release history after reset to lmp-mr1-devandroid-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1lollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-cts-releaseThe Android Automerger
2014-12-09Cherry pick "Avoid crash on some 64b ARM NEON platforms."android-5.1.1_r5android-5.1.1_r28android-5.1.1_r22android-5.1.1_r17android-5.1.1_r12lollipop-mr1-wfc-releaselollipop-mr1-devBen Murdoch
Bug: 18297786 Original Description: Avoid crash on some 64b ARM NEON platforms. The compiler may choose to use x30 for a local loop counter; ensure it's saved. Patch from kevin.petit@arm.com, verified by benm@google.com. R=djsollen@google.com Committed: https://skia.googlesource.com/skia/+/414867c00463e1405ce2234cf7591b1788d20b9f Change-Id: Ib1c4b33a1cf9b957b01684470e9d719b730b31be
2014-11-27merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger
2014-11-22Merge from Chromium at DEPS revision 39.0.2171.90Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: Ic822d0dcb3576bf60590b10a7e242af23094897d
2014-11-22Merge third_party/skia from https://chromium.googlesource.com/skia.git at ↵Ben Murdoch
e957df076cb9c82161ad88e20b1be80780d3025e This commit was generated by merge_from_chromium.py. Change-Id: I9c6e9d0096fc3fe314600254865c877406606191
2014-11-11Avoid the use of mipmaps to prevent memory leakMike Reed
This is a temporary change only for M39, not intended for the master tree. BUG=420816 patch from issue 712163003 Review URL: https://codereview.chromium.org/691143008
2014-11-11Cherry pick two CLs back to M39 to fix a bugRobert Phillips
Bug fix for cull_line in SkDashPathEffect. Review URL: https://codereview.chromium.org/703783002 Crop the fast path dashed lines to the cull rect Review URL: https://codereview.chromium.org/699623003 BUG=428296 R=bsalomon@google.com Review URL: https://codereview.chromium.org/706013005
2014-11-08merge in lmp-mr1-release history after reset to ↵The Android Automerger
a13fcec27143ac84f98ef27d2a743b23098bf3bd
2014-11-06merge in lmp-mr1-release history after reset to ↵The Android Automerger
a13fcec27143ac84f98ef27d2a743b23098bf3bd
2014-11-05merge in lmp-mr1-release history after reset to ↵The Android Automerger
a13fcec27143ac84f98ef27d2a743b23098bf3bd
2014-11-04merge in lmp-mr1-release history after reset to ↵The Android Automerger
a13fcec27143ac84f98ef27d2a743b23098bf3bd
2014-11-03merge in lmp-mr1-release history after reset to ↵The Android Automerger
a13fcec27143ac84f98ef27d2a743b23098bf3bd
2014-11-02merge in lmp-mr1-release history after reset to ↵The Android Automerger
a13fcec27143ac84f98ef27d2a743b23098bf3bd
2014-11-01merge in lmp-mr1-release history after reset to ↵The Android Automerger
a13fcec27143ac84f98ef27d2a743b23098bf3bd
2014-10-30merge in lmp-mr1-release history after reset to ↵The Android Automerger
a13fcec27143ac84f98ef27d2a743b23098bf3bd
2014-10-29Merge from Chromium at DEPS revision 39.0.2171.44Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: I910b0134e56d6e4b8a1e93b6097fda646aedf11d
2014-10-29Merge third_party/skia from https://chromium.googlesource.com/skia.git at ↵Ben Murdoch
b4f3d69b8e18128598b8f62dd6fc7ae0e761cd57 This commit was generated by merge_from_chromium.py. Change-Id: I517483227ce6d9e12266a47084268d819a7c8efc
2014-10-29merge in lmp-mr1-release history after reset to ↵The Android Automerger
2b8859848078af30b6cc21c1ac3e22ccb8f1592c
2014-10-28merge in lmp-mr1-release history after reset to ↵The Android Automerger
2b8859848078af30b6cc21c1ac3e22ccb8f1592c
2014-10-27Update fontMgr to take list of bcp47 language tags.bungeman
This will enable clients to pass more than one bcp47 tag to ensure that the most appropriate font is selected. BUG=chromium:422180 Review URL: https://codereview.chromium.org/670243002 Cherry-pick: c20386e3937d3d398ac9b35f9c7d997e972ade98 Cherry-pick: 4aa75b798049741f214aac4a9ed959aa46d54d7e Cherry-pick: 5f6094a1eb9bf5bb9fd17ada84a5763de2853eff Approval: https://code.google.com/p/chromium/issues/detail?id=422180#c32
2014-10-27[Cherry pick of b0e89dcc1d8c1c2f9f7ffb45e8609cdb4a68104b to M39.]Stephen White
Fix image filters for PDF backend. Currently, the PDF backend does not support image filters (since PDF does not have that functionality), so it simply removes them. This is causing Chrome print preview to render incorrectly (see bug). The fix here is to fall back to a raster device for image filters, as we used to do in Blink. The resulting bitmap will be drawn to the destination device as a normal main-memory-backed bitmap. Note: this change invalidates the PDF results of all GMs containing image filters (since they'll actually be rendered). BUG=422144 TBR=reed@google.com Review URL: https://codereview.chromium.org/644323006 Review URL: https://codereview.chromium.org/679083004
2014-10-27merge in lmp-mr1-release history after reset to ↵The Android Automerger
2b8859848078af30b6cc21c1ac3e22ccb8f1592c
2014-10-26merge in lmp-mr1-release history after reset to ↵The Android Automerger
2b8859848078af30b6cc21c1ac3e22ccb8f1592c
2014-10-25merge in lmp-mr1-release history after reset to ↵The Android Automerger
2b8859848078af30b6cc21c1ac3e22ccb8f1592c
2014-10-23merge in lmp-mr1-release history after reset to ↵The Android Automerger
2b8859848078af30b6cc21c1ac3e22ccb8f1592c
2014-10-22merge in lmp-mr1-release history after reset to ↵The Android Automerger
2b8859848078af30b6cc21c1ac3e22ccb8f1592c
2014-10-21merge in lmp-mr1-release history after reset to ↵The Android Automerger
2b8859848078af30b6cc21c1ac3e22ccb8f1592c
2014-10-20merge in lmp-mr1-release history after reset to ↵The Android Automerger
507f85ccba3d145499281410fa6f7dec87eea731
2014-10-19merge in lmp-mr1-release history after reset to ↵The Android Automerger
507f85ccba3d145499281410fa6f7dec87eea731
2014-10-18merge in lmp-mr1-release history after reset to ↵The Android Automerger
507f85ccba3d145499281410fa6f7dec87eea731
2014-10-16merge in lmp-mr1-release history after reset to ↵The Android Automerger
507f85ccba3d145499281410fa6f7dec87eea731
2014-10-15merge in lmp-mr1-release history after reset to ↵The Android Automerger
507f85ccba3d145499281410fa6f7dec87eea731
2014-10-14merge in lmp-mr1-release history after reset to ↵The Android Automerger
507f85ccba3d145499281410fa6f7dec87eea731
2014-10-14Merge from Chromium at DEPS revision 39.0.2171.26Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Ia2b7af745eea6d17588d35c3fbb070d7f1254202
2014-10-14Merge third_party/skia from https://chromium.googlesource.com/skia.git at ↵Torne (Richard Coles)
139c136944f3af0cba3a25ac65c642c05fe46ac8 This commit was generated by merge_from_chromium.py. Change-Id: I160d571f2213100d384d79dc312003f1c22b24c5
2014-10-13merge in lmp-mr1-release history after reset to ↵The Android Automerger
507f85ccba3d145499281410fa6f7dec87eea731
2014-10-12merge in lmp-mr1-release history after reset to ↵The Android Automerger
507f85ccba3d145499281410fa6f7dec87eea731
2014-10-11merge in lmp-mr1-release history after reset to ↵The Android Automerger
507f85ccba3d145499281410fa6f7dec87eea731
2014-10-09merge in lmp-mr1-release history after reset to ↵The Android Automerger
507f85ccba3d145499281410fa6f7dec87eea731
2014-10-08merge in lmp-mr1-release history after reset to ↵The Android Automerger
507f85ccba3d145499281410fa6f7dec87eea731
2014-10-07merge in lmp-mr1-release history after reset to ↵The Android Automerger
507f85ccba3d145499281410fa6f7dec87eea731
2014-10-06Fix int16_t for glyphs, const glyphs, and clarify glyph loop.bungeman
Several places in the PDF code are using int16_t for glyphs. With newer NotoSans fonts, all possible glyph ids are being used, so this can lead to problems. The PDF glyphs from text code returns the text for the glyphs if the encoding is for glyphs. However, it returns this using an unsafe const cast which is hiding possible bugs and preventing correct use of const in other places. The way the glyph loop in SkPDFDevice::drawPosText is written uses a '--i' in the loop, which makes it appear this can loop forever. I don't believe it can, but it is an unecessary code folding. We should also at least assert the forward progress correctness here. Review URL: https://codereview.chromium.org/626613002 Cherry-pick: 22edc8310cd57ab02155bfa6b2ddaf830556bcaf Approval: https://code.google.com/p/chromium/issues/detail?id=418939#c26
2014-10-06merge in lmp-mr1-release history after reset to ↵The Android Automerger
507f85ccba3d145499281410fa6f7dec87eea731
2014-10-05merge in lmp-mr1-release history after reset to ↵The Android Automerger
507f85ccba3d145499281410fa6f7dec87eea731
2014-10-04merge in lmp-mr1-release history after reset to ↵The Android Automerger
507f85ccba3d145499281410fa6f7dec87eea731
2014-10-03Merge from Chromium at DEPS revision 38.0.2125.101android-wear-5.1.1_r1android-wear-5.1.0_r1Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: Ia2ead751a0a225fc3671b01b7dfd673c4739f014
2014-10-03Merge third_party/skia from https://chromium.googlesource.com/skia.git at ↵Ben Murdoch
f14866df6ca3ecce221916fa0c061af49385a863 This commit was generated by merge_from_chromium.py. Change-Id: Id0e80060806e4ac602ab352fa673efcdb79a9e2c
2014-10-02merge in lmp-mr1-release history after reset to ↵The Android Automerger
5fa451998a3d50f0a6a5ff7093cd6fcba5f9ddc6
2014-10-01Merge to M39: Don't adjust the bounds after a restore with the restore's ↵Mike Klein
paired saveLayer's paint. Originally landed as: https://skia.googlesource.com/skia/+/8e393bf70ea2aab9ca31f52c15b518436c7b6055 Original review URL: https://codereview.chromium.org/623563002 BUG=418417 Tested: on M39 branch, out/Debug/dm && out/Release/dm && echo ok Review URL: https://codereview.chromium.org/617403002
2014-10-01Change GrContext::copyTexture to go through GrDrawTargetJustin Novosad
BUG=crbug.com/415100 R=bsalomon@google.com, robertphillips@google.com Author: junov@chromium.org Review URL: https://codereview.chromium.org/607993002 Review URL: https://codereview.chromium.org/622643002