History log of /external/skia/bench/Android.mk
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
c8cae184262251418ca3f8a70952805980121d0c 18-May-2015 Derek Sollenberger <djsollen@google.com> Merge Skia's chrome/m44 branch into mnc-dev.

bug:21108081
Change-Id: I2c8a4c8183d8449fe6e1c53fc69381b5c7a2e1aa
b5461688895723cee1ef42d95975bad4a2cdd700 15-May-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Revert of Font variations. (patchset #26 id:500001 of https://codereview.chromium.org/1027373002/)" into master-skia

https://skia.googlesource.com/skia/+/465706820d0d373f76ab4831c286115ee0d86b7a

Change-Id: I45c451de2407723669fdc9b9a3ca8c851d03e56e
634676d68ba10ac87764dbbb60c657e377b5f716 14-May-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Font variations." into master-skia

https://skia.googlesource.com/skia/+/3489ee0f4fa34f124f9de090d12bdc2107d52aa9

Change-Id: I18fc2fb230739d8e68811fd4e2b5c8fd4ac7b6ac
b0220eb9a1bd8d9f0906f1614cf450226fc66944 13-May-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Revert of Font variations. (patchset #21 id:400001 of https://codereview.chromium.org/1027373002/)" into master-skia

https://skia.googlesource.com/skia/+/5ae1312c9faa25531c07e591b4dff6804020f121

Change-Id: I516c57652ebe4fdd3bab4623ae4aa2459c2b5c5e
fc2ae3257a9f1c3d869f5b289fd49d6d9525a106 13-May-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Font variations." into master-skia

https://skia.googlesource.com/skia/+/05773ed30920c0214d1433c07cf6360a05476c97

Change-Id: I1298628cfd0649a7059520995f64ce1ef00ccc66
911bf3e163caa8c177b90f0d3cd12543c7f63d7f 11-May-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Fix blur on large glyphs in runs < SkGlyphCache::max" into master-skia

https://skia.googlesource.com/skia/+/1107e901c9dac3098e2915213f171ff62d007aa7

Change-Id: I4d3ac6ce545f19db41d7758315620cf2496b361c
c183bf449289dd47678409c48106c3f0c68a5ff8 11-May-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "fix for cached textblobs look garbled" into master-skia

https://skia.googlesource.com/skia/+/e4cee1f283c435618343f0c7b298207d5a9a3e1c

Change-Id: I0973d692f4fd731620368c905fcebccd35319e52
8e9c09e7969f9d2ba6c80c947caee8e6195f7b50 06-May-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Add a control benchmark." into master-skia

https://skia.googlesource.com/skia/+/44d43d8d6e4f9321c9001f269ff433bd06aa81e1

Change-Id: I5b45506a9ffb529dc5c3ae0edc6229af4a1a4409
c6e7fdbb3ddfd02a43d606dd50cb9c8c655479e6 04-May-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "remove redundant/deprecated TwoPointRadial gradiet -- use TwoPointConical" into master-skia

https://skia.googlesource.com/skia/+/71a6cbfc585959738dc0b375603696ca7f60605f

Change-Id: I27e811a9e056f405aaa2f078e2795f0bbf494439
5571cc98d603b1cc1d9a23111698164f7632efb7 01-May-2015 Ying Wang <wangying@google.com> Delete use of $(shell) in Android.mks.

It's terribly wrong to call $(shell) to copy over files in Android.mks,
because the $(shell) is run everytime you run make.
Instead we can create symlinks with DATA in the path, required by
the testing infrastruture.

Change-Id: Ibcfa93874ce2d83a1fd3c07eddaccf4cc2ca6a5e
/external/skia/bench/Android.mk
e2ca3d102f168313589bf014fab2284a47cfe1c4 02-May-2015 Ying Wang <wangying@google.com> Revert "Delete use of $(shell) in Android.mks."

This reverts commit 41b824135d89e879b5430bdc0cea1c3d8fd37498.

Change-Id: Ida00a72a2d93858cbb4fd0b3d047bd41fd5e90d5
/external/skia/bench/Android.mk
41b824135d89e879b5430bdc0cea1c3d8fd37498 01-May-2015 Ying Wang <wangying@google.com> Delete use of $(shell) in Android.mks.

It's terribly wrong to call $(shell) to copy over files in Android.mks,
because the $(shell) is run everytime you run make.
Instead we can create symlinks with DATA in the path, required by
the testing infrastruture.

Change-Id: Iff6d4ff63726dd4eb9cd04e0256f28f0f83f388a
/external/skia/bench/Android.mk
68547892a6c7028c7f3c2678c4f94351d1390737 28-Apr-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Add new GM/bench for line-only convex paths" into master-skia

https://skia.googlesource.com/skia/+/7272935744670aebf82699c2f91aaff3cd4c3172

Change-Id: I5ce72c0578441bf62742b9b84309e0d22167ea47
ae37f22c0f115df384ced1ece4fff9bd53033d9f 27-Apr-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Change to add zoom animations to nanobench" into master-skia

https://skia.googlesource.com/skia/+/261c3ad7fde95748da92550735decc949dc73bf2

Change-Id: I1b2154261368e9026349c261f0fff94ea9092d9a
2d78022a5d51c6ef03badc77515ddd705ec1b68a 22-Apr-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Add GM to test non-AA pixel snapping for points, lines, rects." into master-skia

https://skia.googlesource.com/skia/+/87cbcf3f86a58cacab2e576ebc0e29399a1d48b3

Change-Id: I907995c053957a5ff534ad97db7f1deffde9f370
07cbd48dae03bd5ec1c510b893d9897eba16bfb3 20-Apr-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "add GM to test imagefilters + xfermodes" into master-skia

https://skia.googlesource.com/skia/+/7e4186accea094276c9f3c65c64e63ffc59aa644

Change-Id: I444d511cfc6b88a9e5f3d0bdcc40adb7e7e8dce5
5212dd2367983b52098a72152c4301130d5575e3 17-Apr-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "adding new gm to rotate, translate, and scale textblobs" into master-skia

https://skia.googlesource.com/skia/+/523ed6c0c1ac9029be315542258e02ba9854365c

Change-Id: Ibf509fe2e71b4e2068467bf5d7865dd57cc5646d
6b44bb4d0a05eb6f2c929a845e3462228ccf6e1b 17-Apr-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "add a GM to demo the blend bug" into master-skia

https://skia.googlesource.com/skia/+/4afe21e864bebab22ff83aeaa04b5e11fe5698a2

Change-Id: I5891bc2ecfda60f8dfd24572febbde05beb8f0ce
320e53c475269674b414415811a69c92f691f6b6 17-Apr-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Revert of Revert of remove unused (by clients) SkPathUtils (patchset #1 id:1 of https://codereview.chromium.org/1060703003/)" into master-skia

https://skia.googlesource.com/skia/+/ca1a22ee534f0fcabed7fa06cbf3ea5068b489da

Change-Id: Ia9474ae4e998d3e843001f738fe25c835daddb26
359c5f6789f8fb4ceeb14d9a915356c29b95a5e9 16-Apr-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Revert of remove unused (by clients) SkPathUtils (patchset #1 id:1 of https://codereview.chromium.org/1088383003/)" into master-skia

https://skia.googlesource.com/skia/+/bdb0bf5f8858043878d8a4fa8130c6c87bef3fd4

Change-Id: Ie1b4cfd3f5a715a16b61748f71f7e0e502d19c2c
74c5d3ebeb9c137c13a9760fb98c3bcb831fc42a 16-Apr-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Add GM that tests bmp filter qualities with repeat mode" into master-skia

https://skia.googlesource.com/skia/+/8cf1d9548740e3ab7617cb920db4086b4d75a365

Change-Id: I16b1bdc383a5e4fcff0db388e44a9e76fad63fee
3f01ba2cd7ba3e6bd45682643c2a494ac907689d 16-Apr-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "remove unused (by clients) SkPathUtils" into master-skia

https://skia.googlesource.com/skia/+/aab35d91b8b80acd1902594bbf542083fdfa4bb7

Change-Id: I16f448322797ae6f08314e9e5c9246663d93692b
3a193196e73a10b306f24ede8959587ef07f38c1 15-Apr-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Don't draw if SkShader::asNewFragmentProcessor fails." into master-skia

https://skia.googlesource.com/skia/+/bed83a66f5fa5821a3a08da32157a6155960b15e

Change-Id: I7e8bb1f65671f316102f9e2562c484b4fa072ac6
60484d07905fc79236923d39bcfe3ed61432f6ae 14-Apr-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Start canonicalizing color for all A8 textblobs" into master-skia

https://skia.googlesource.com/skia/+/9e36c1a9306f052331550dab4728b9875127bfb5

Change-Id: I9471f465e1397aca09e3a3925121554bbb6c697d
9c193866717fba177451041b60a06d2422eab430 14-Apr-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Add GM to exercise high quality anisotropic scaling" into master-skia

https://skia.googlesource.com/skia/+/f5ac972207228e288ff084ff4a94dd7f89c4ba72

Change-Id: Id52d8b8801f9cbd5d6966dcd0aea9cdaa739570a
b038658c2fd353a5a44a5d7db04ad0937ffc3fee 14-Apr-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "GM: add fadefilter gm" into master-skia

https://skia.googlesource.com/skia/+/86e5ab633865be3336ca266bd60131832cd8ab28

Change-Id: I216281e4bf3c9e9fde7cb9dc18855455733aa972
5a1f90d0e9b249c0402a7054ac0bfb0661bff0e6 10-Apr-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Adding draw looper gm for textblobs" into master-skia

https://skia.googlesource.com/skia/+/d0b5c33fda86a5fe91007b7875a28e8fa8ff70c8

Change-Id: I08292a340b20893c2ccf4a85cb6fe9478140e4cc
6e1f9ac05aaa413437b6bdff81fe75ee400f38d1 09-Apr-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Add GM to repro crbug.com/472795" into master-skia

https://skia.googlesource.com/skia/+/e275fdf812b1dc09beaa3b14570eb0b641a07e6a

Change-Id: I4ba0d14a78f9633d38d3cda1463eb27a3b44d541
93401e426322542a10fc0fd3101218cedbba1627 03-Apr-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Add a bench to measure SkPictureRecorder constant overhead." into master-skia

https://skia.googlesource.com/skia/+/649e0451708b72d467e3a0ea4a71720699330c12

Change-Id: I2d648c8f357028a2c2d368829e11cfa4014f2222
baeb7aa07a5cb8aeba052c70a9fdcd2708fc49db 03-Apr-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "BUG=skia:" into master-skia

https://skia.googlesource.com/skia/+/eef5b3eb12d5aaf55f43762110af250c79cb0a45

Change-Id: Ib726bc4eac34c5ff17692ae74f394f59b54ecbce
b3de689b3ae8055e27cf1097a7498b4b03af57d8 02-Apr-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Add constant color GrFP." into master-skia

https://skia.googlesource.com/skia/+/c9c3e62b4ef6ec288549a0ad1d252986d7f0889d

Change-Id: I28bef86f08105528392b7d4eb164ba54582c7b3c
2a9d2714794d1c48ddb43a9d8c8046dee2c62bd1 02-Apr-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Revert of Add constant color GrFP. (patchset #10 id:180001 of https://codereview.chromium.org/978713002/)" into master-skia

https://skia.googlesource.com/skia/+/599ea40cec8da11da7ad7c37a2ff0ef4797dbd4a

Change-Id: I263a99a1f2ce8092585ce5f534e02afa3014cd5d
5cceebf5b6936693d6e48264d32049e127366ea1 01-Apr-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Add constant color GrFP." into master-skia

https://skia.googlesource.com/skia/+/dfbbec436cbcacc3270d4b28357c8393e67d6494

Change-Id: Iaa1a70ba0a116b6ba3e66c602f1781f258482522
9923348e6853099b1a46b2c59282a090b7d54f13 01-Apr-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Add timing SkCodec to nanobench." into master-skia

https://skia.googlesource.com/skia/+/60869a42a133942f852dd0f1696444c2a5c9ad83

Change-Id: Ieb4d11fe40cad2dca5a5fd48aa55ccd85b7ff865
d9704c94e8663c76965ff28b31898e9b3aa2f02f 27-Mar-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Move HWUI boilerplate into utils/android" into master-skia

https://skia.googlesource.com/skia/+/573ae01295241c156ff8548ded283d44864d22d2

Change-Id: Idb59a07d1ddbb27645badde553e7dafc6c32bbc0
30439df6f5b1fb18ebaa4832486ce387dc25b13f 26-Mar-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Android HWUI backend Nanobench" into master-skia

https://skia.googlesource.com/skia/+/d968a6f29e92230ee118ec9cdfff0329bf83d602

Change-Id: I15e3f84568f3ef22c76b346b17ed31a21dd9390a
a4e9d80b0f43e9045ec3f5f37e440939b2364c02 20-Mar-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "PDF: remove last use of SkPDFImage" into master-skia

https://skia.googlesource.com/skia/+/db0dcc7436375e5d59c27f9011f09b64de407c9d

Change-Id: I4f6adc9adfc276dd511264a8d2ddfe45ee0fd264
56cc1996ba378875957076d111e21eeda8fce481 20-Mar-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Revert of PDF: remove last use of SkPDFImage (patchset #5 id:120001 of https://codereview.chromium.org/950633003/)" into master-skia

https://skia.googlesource.com/skia/+/1b600d3446b3d236bfa06cf116ec41960bea6ac8

Change-Id: I5fb3ecc8d284063a01f6f7fdb02cce2cf410141b
9cd52d8f9f978736b77de03697281dd60fdf7e91 20-Mar-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "PDF: remove last use of SkPDFImage" into master-skia

https://skia.googlesource.com/skia/+/86ad8d643624a55b02e529100bbe4e2940115fa1

Change-Id: I6a1e1b78736fd910d6692375bc264efedc7db163
ad93cad059d8794c07ed4a6d6148d20e2a1c726b 20-Mar-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Add a new GM to show problems with shear/rotate CTM w/ image filters." into master-skia

https://skia.googlesource.com/skia/+/d4bb991df84357ad77b7858ae6c5dd00347b7ba6

Change-Id: If663376a7776b1112a98f643166d5a5aa8831f59
4b40b036ce73acb36637394cc1534a207b3c960a 06-Mar-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "We had zero coverage for SkDrawFilter. This new GM draws two rectangles. If SkDrawFilter is working, they will not match (have different colors and one will be blurred). If SkDrawFilter is broken, they will match." into master-skia

https://skia.googlesource.com/skia/+/cdf34cdfb930a876910cffd96f080fce55f003bd

Change-Id: Ie91cd1efddfdae3ab7b656b40b9833751a8227fe
00d9c57697477bb3e68d3b1dc2fb203b9e519caa 03-Mar-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Add SkCodec, including PNG implementation." into master-skia

https://skia.googlesource.com/skia/+/f24f2247c25b842327e12c70e44efe4cc1b28dfa

Change-Id: Ie581ceb533e1438b5fb71d7e97c4012dc505b03f
e14ed7929f9467dadc032816cb20896948269996 02-Mar-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Revert of Add SkCodec, including PNG implementation. (patchset #24 id:460001 of https://codereview.chromium.org/930283002/)" into master-skia

https://skia.googlesource.com/skia/+/ee1a726aed980016a9371ffa4768e0844c360eb2

Change-Id: I2f87091b49edf8dcae5f1056de83cc1ead63ca7f
80aa99e074bda2a31114036d0695443f44ac96ec 02-Mar-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Add SkCodec, including PNG implementation." into master-skia

https://skia.googlesource.com/skia/+/ca358852b4fed656d11107b2aaf28318a4518b49

Change-Id: Iebe7db9cce2236e550848a8ba24331a01a3a461b
5bf15dfb74a51122fa9736f7c0503704f80b47a2 26-Feb-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Tessellating GPU path renderer." into master-skia

https://skia.googlesource.com/skia/+/d6ed19cc751463285491a538bc7bf154cc7e6d8c

Change-Id: I5bf1671f6defe9065b5ed714ec766f5ac2db2b36
2ec9fe1d03340b6844fc1e210a14d44fc365f16c 23-Feb-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Ensure that skia's test resources are properly packaged on Android" into master-skia

https://skia.googlesource.com/skia/+/f056bd1e01078c02b35d00c22d55ef52b017ef7f

Change-Id: I2942e9d2635a58b1957dd6cae99387d94a166ebf
6eea525c09fc9c034e2ec3475bd131f1f0ef3885 23-Feb-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Sketch SkPMFloat" into master-skia

https://skia.googlesource.com/skia/+/a2f4be76a9d453f1fdfd55b0cec6a683f23ffe0f

Change-Id: Ib582e4e2f132c81dfe4a37052c03a40ce9792749
b8c43af01d21a546fcc04c769c8515fc44ff5010 23-Feb-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Revert of Sketch SkPMFloat (patchset #15 id:270001 of https://codereview.chromium.org/936633002/)" into master-skia

https://skia.googlesource.com/skia/+/088302756bde25083d6712b18dcd24644d4dcdbb

Change-Id: I539cc87005b6b4277b2f113357ce1dd08145a752
6d67f91a13d8f579bb4f21f3cf4fa01ec0deb0c0 23-Feb-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Sketch SkPMFloat" into master-skia

https://skia.googlesource.com/skia/+/50d2b3114b3e59dc84811881591bf25b2c1ecb9f

Change-Id: Ibd9e8fa2bab194b34eb4251ef9a4ca76dc405516
990209a6be46a3c3d3d5c3ee9fa89edc298b318a 19-Feb-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "gm to illustrate mipmap layer choice" into master-skia

https://skia.googlesource.com/skia/+/c8e4765b8e72f6792bd739ce871f2f1e9f878d10

Change-Id: Ibff8400545c90e26afe53997cbddf00aba25b2fc
21ab4733fe8cdfb6889a80926baf84615e647ae1 19-Feb-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "gm to test hairlines which fill RenderTarget" into master-skia

https://skia.googlesource.com/skia/+/6364807151ddf51c4197603aa185b3336f325357

Change-Id: I732d4934038e1b84d3ab78a7027a35639570b342
bcdafaef9ce5fe493ae0cc85b7737a6a08aa8f8d 18-Feb-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "PDF: Add (low-memory) SkPDFBitmap class" into master-skia

https://skia.googlesource.com/skia/+/1b5c604d9d344537941b11b136348edfc39f236c

Change-Id: Ie8db6c2da01c6260af23938c0ce580b3b4e6b0a7
8d1a7d46d79b0912d4a069ed98fb39a46cdd1db9 13-Feb-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Adding new benchmark to test image decoding performance." into master-skia

https://skia.googlesource.com/skia/+/95f192d19938b98a45dd1fa4112d965f60d10516

Change-Id: Ib95ca8273093577b3a326f6f9e4dfe58145cf7ba
65f8122e5d63dc557e4870981fd14df925806f69 12-Feb-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Generated makefile now includes people to contact." into master-skia

https://skia.googlesource.com/skia/+/9d7ceca35064b71e13e498da7e641e69b97bf4cf

Change-Id: I455e467f07e8e0feea30b7c55b9895bb67bd3402
e5b6e9f3b514df610ce72f6ee2fea8d4840381c9 10-Feb-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Only define SK_CRASH_HANDLER in crash_handler." into master-skia

https://skia.googlesource.com/skia/+/ac928f27ab632784d6b9572901201caa2908caa5

Change-Id: I46352877acf9efc91f217b4d606c57e0a19c1442
ec7940b6c27528064690eccef7768c51dd841f69 09-Feb-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Revert of nanobench: lazily decode bitmaps in .skps. (patchset #1 id:1 of https://codereview.chromium.org/743613005/)" into master-skia

https://skia.googlesource.com/skia/+/57f27bdcbd328491a121918b4ab9301fbcdec642

Change-Id: Ib74845e6a5af6822fdc383c584d3bcfe14fa58b8
84c8ee653a3ca9a0576e77f8f2b15997df2fd236 09-Feb-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "nanobench: lazily decode bitmaps in .skps." into master-skia

https://skia.googlesource.com/skia/+/1b6b626f9bc0deebe4fe2e63f422d6b122419205

Change-Id: I05cb86a7b6638f6058da04035ee6133df9242b84
708ae682180ede61a3fb38adbafb8577bfced859 06-Feb-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "add bench for very big paths" into master-skia

https://skia.googlesource.com/skia/+/37a473697136a57138bf069121ebdcc8652f10d4

Change-Id: I752197ec1ca84af75409175ee23d81eb1b25a0d1
d9d0aab2f9767dd56658e2cf05d5e385755eba7f 05-Feb-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Build in C++11 mode on Unix-like bots." into master-skia

https://skia.googlesource.com/skia/+/f3cdce79103558c4136cc6e8b04d50a0b0f04eb4

Change-Id: Icc07e6027f0a3a750de7bdbb82fe6f7451827b9f
83565867e7ea3f5c2823283768df39c9ff5bcc10 04-Feb-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Revert of Build in C++11 mode on Unix-like bots. (patchset #4 id:60001 of https://codereview.chromium.org/868233008/)" into master-skia

https://skia.googlesource.com/skia/+/b9d4d279cd381392e69c6638457055264696f7eb

Change-Id: Ia41d33c2583958f7326a2725afd81a08410ee235
37379b924d20d9bfb698b32313c7195a607c3a39 04-Feb-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Build in C++11 mode on Unix-like bots." into master-skia

https://skia.googlesource.com/skia/+/779e49602a9c8f4d2799504822e01bcafbcaa534

Change-Id: I20e0eaf4ea1c02ea96771e2334da7effd1f02978
43747afd7448e2f09149a993c84006b2b01f838c 29-Jan-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "add new gm for SkPath::addArc()" into master-skia

https://skia.googlesource.com/skia/+/19d8f9f17373bcf7d352b77e72a6a46568ee8a8b

Change-Id: I7640afa61e1466c21aab5eac144bdbd29a6e6af5
a2fd49b0660cd5c4b613544f34644f4a516517b1 28-Jan-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "dstread gm" into master-skia

https://skia.googlesource.com/skia/+/5ce33c17afb9f10e8faf6907f030268d97fdf1d8

Change-Id: I23d6085d59ee7ff4607de5c81d462900d82ea849
68300d75eac417aa0ad58c3f4b7f91885030b44b 28-Jan-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Revert of GrBatchPrototype (patchset #32 id:630001 of https://codereview.chromium.org/845103005/)" into master-skia

https://skia.googlesource.com/skia/+/c2893c5e3870d7e9a37ca146e7da88fba54977d5

Change-Id: I473306aedd995ba4db9fcef9f75a7c89764c4388
ce0ef21123c55d0f519a72dd985c76134189884c 28-Jan-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "GrBatchPrototype" into master-skia

https://skia.googlesource.com/skia/+/d5a7db4a867c7e6ccf8451a053d987b470099198

Change-Id: I1e9ba929003e2ae90c8504de56c15b95187adf2b
7406daccfaa8bf07924728eb2c23e1702b4fac37 27-Jan-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Setup Android framework builds to use the appropriate shared lib defines." into master-skia

https://skia.googlesource.com/skia/+/f379ad3429b61eb1d86e916767258340df372538

Change-Id: Iec2100be868786de610d49f183b205c29cedeb36
343765efd6e4646ba31476aa48018de013b29b51 27-Jan-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Revert of GrBatchPrototype (patchset #30 id:570001 of https://codereview.chromium.org/845103005/)" into master-skia

https://skia.googlesource.com/skia/+/ca0a1799ffdceb4ccd998468566f39abac2f0b55

Change-Id: I2aa7b265bc226f86f114e599ced66b9d1afed3b1
3f78679d3c02d00d5b634407409718114362e401 26-Jan-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "GrBatchPrototype" into master-skia

https://skia.googlesource.com/skia/+/d15e4e45374275c045572b304c229237c4a82be4

Change-Id: I70c5af5f2e92947f28bbf9fce3fa02b1cfb2b270
595dd6e9e980a2b18f116a772f85e526f9a96093 26-Jan-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "s/sk_tools::DrawCheckerboard/sk_tool_utils::draw_checkerboard/" into master-skia

https://skia.googlesource.com/skia/+/b0cce2c1d37d4bf5b89da6c70062209ac4e0e643

Change-Id: Ia676adc601768f49ad031b3010685e43855df718
3ba26392f280715d006fccbf33654dcf84e38e5a 26-Jan-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "add bench for building mipmaps" into master-skia

https://skia.googlesource.com/skia/+/96638d1db4c710e6fb72c4c286547800a63fb3df

Change-Id: I2e6febb77c34c37a5b945ceb5949e4492d349d47
8cfa43bf73ec57f3873d3b5d4cf61e4760ffcdbc 26-Jan-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Factor out checkerboard function in gm and sampleapp into tools." into master-skia

https://skia.googlesource.com/skia/+/878fa0204bc246ec5fbaca4aa3c81aaefccc30a1

Change-Id: I006372f3cb15c982e8758f71c7532c957c4ebe80
8871cde9fb27fa29828b44338d4bd8195fa424a6 26-Jan-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Collapse consecutive SkTableColorFilters" into master-skia

https://skia.googlesource.com/skia/+/c12b74dc413ef024b13e0ed478491c4b1bafe6b1

Change-Id: I5189fb717684b0f48eb31dc2a88eccc2ded17a24
9664ac059acf9d0c40e9316c26b15392b0e9b186 26-Jan-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Fold alpha to the inner savelayer in savelayer-savelayer-restore patterns" into master-skia

https://skia.googlesource.com/skia/+/dc0f408a961b6ce4e7631e06031bbfe1d8d7bcec

Change-Id: I709951380118db43fdfa53709ef773e1805f7382
525a8d6f49c5633c90a67320ee9ca931a25d69f1 14-Jan-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Add repro GM for GPU clipped-AA vs. non-AA drawRect discrepancy" into master-skia

https://skia.googlesource.com/skia/+/028b98a08072bd1764936e47c54fa2da5cf92744

Change-Id: I816a5fa34acd80a351b112dc3122ed7a19077bcc
539ae8ed4f95287e3a8a7302de6b65c70247a98a 13-Jan-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Revert of Fix GPU clipped-AA vs. non-AA drawRect discrepancy (patchset #2 id:20001 of https://codereview.chromium.org/839883003/)" into master-skia

https://skia.googlesource.com/skia/+/125ee60ed3e510b1b9cbbaae8efdef2df5542ac1

Change-Id: I7470e75038c010a585edb2a53d38e5ee210ad252
17012ab74e96d8fda04e9b96199947f6b178c889 13-Jan-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Fix GPU clipped-AA vs. non-AA drawRect discrepancy" into master-skia

https://skia.googlesource.com/skia/+/933a03fecb65c83f81cf65d5cf9870c69aa379ff

Change-Id: I1880495d35ac0953cd0fe71c923148333aa865f6
a7bdb2869e5b661756a2886a36300a2108c75895 07-Jan-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Add Alpha fade GM." into master-skia

https://skia.googlesource.com/skia/+/a7976be1dda98047251fd527990df562a47dda55

Change-Id: Iaf23a82e1520f8bc27882de8beb4004431b123b6
8f6a0b77104899434e3fa29281c868322a508e3e 05-Jan-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Revert of Revert of enable conics gm (patchset #1 id:1 of https://codereview.chromium.org/811863006/)" into master-skia

https://skia.googlesource.com/skia/+/40c85e41b8be96f47f03a34bb2938696037afad4

Change-Id: I8414c10b8d4bb57e28235e5d464ed5096297cc10
109ad0269e10265ae28b8249c8a068cccbdc5372 05-Jan-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Revert of enable conics gm (patchset #3 id:40001 of https://codereview.chromium.org/835593002/)" into master-skia

https://skia.googlesource.com/skia/+/ede901c7a2e21a44552b8c1436d9521ce33f4de5

Change-Id: I71729b34b03ae9db4b561bb33437f7711c10c476
03a5b29a59406b763029e318c6a6cc85a15af4e5 05-Jan-2015 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "enable conics gm" into master-skia

https://skia.googlesource.com/skia/+/03119ba4f815bc2c2774a9349ca8278ab1695072

Change-Id: I3dd5d7747bc1a9b2f1f006abcb7675d22a6fcb26
e19c3609ca95458b22cfbd919d767c381e6fa003 29-Dec-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Add device space skshader GM to test kDevice_GrCoordSet" into master-skia

https://skia.googlesource.com/skia/+/b0ae649b7ebda86ef53bf913798b809d500973ed

Change-Id: I1ab959642ddd0ebd3c4aafc82c43658d4bd20659
bfef19ace9d9c4cc8aa534b9478892875c05a478 17-Dec-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Add new complexclip3 gm." into master-skia

https://skia.googlesource.com/skia/+/df795036fdff68d0c3e1d53d50e1e3777df88668

Change-Id: I8a6ba91af18fe28ffaed1fb90460abd25ba9b7d9
0fd04a4029bc51d5162a15a6700077b1588dd74f 10-Dec-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Change how SkDebugf is sent to stdout on Android." into master-skia

https://skia.googlesource.com/skia/+/6cfce1b7b4ad546b02823a1a0bbbda2c17b688f5

Change-Id: I621ece5f34c8312a73f11e1e7b58e78c9c1bbef2
d893568235ccac16406d446e1f98a19488c6faae 10-Dec-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Remove SkCanvas::drawBitmapMatrix()" into master-skia

https://skia.googlesource.com/skia/+/c54d8db4d169ea5f2af2a9a2349df007bd428475

Change-Id: I7a9834fe88dd1b7de35bd82b84a3752443b8206c
461a46b5b893c423e24edabdd4690dfa09cfff10 10-Dec-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Add bench to measure blur rects performance" into master-skia

https://skia.googlesource.com/skia/+/e18a530afdd879f2f8df8f07a63a19a37e2e12a6

Change-Id: I8f98216a66af0466a42871d54accd0df3858793a
1660b675805e41520abff2a44b432745f1cee47a 09-Dec-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Use texture size to determine precision of texture coord varyings." into master-skia

https://skia.googlesource.com/skia/+/17168df7798d0d12684f18df0556dc19e65b32e6

Change-Id: I073952f3fc04e4ce2cb8a3fc7e6d137e5a0bcddd
0a2307a29fadea4b7875884bc702f94f14103b32 08-Dec-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Add new GM (filterfastbounds)" into master-skia

https://skia.googlesource.com/skia/+/9a264107fbffd9d029fb74e4dea6bc57beb22254

Change-Id: Ic5ebb7f1382e833ea26d9b308ca3df18bfa5f8b9
404b7f54fbe8dec3c69e8e6e814c76fe037bd923 05-Dec-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Fix include for GrPortderDuffXferProcessor.cpp TBR=bsalomon@google.com" into master-skia

https://skia.googlesource.com/skia/+/ced90108b763b1eb3bd7f78b5614d4643b577a24

Change-Id: Ifdaabce95886a7d444da95adb86b5384ec15624d
d6ffa3db8de333590e276bf8e5e0d5a8f86c47da 05-Dec-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Move GrPorterDuffXferProcessor to include/gpu/effects." into master-skia

https://skia.googlesource.com/skia/+/8bf2bd335f39afc29d7829ad11aa440945c2d37a

Change-Id: I16b33143b982c62486b261f41faf73587a3fa754
4737fc54f0d64ec4ee04e194fd39835643520945 02-Dec-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "work in progress" into master-skia

https://skia.googlesource.com/skia/+/84bc52ad26e69c01a694a9d724944507acb64d38

Change-Id: I070175bf8fe2fb91af8cb1282fe6a00d1fb3e1e6
a6a6d5920a39c077fb68956ade02c7916f78fe71 02-Dec-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Remove PDF JPEG shortcut, since it fails on grayscale JPEGs." into master-skia

https://skia.googlesource.com/skia/+/d476a176b774c387b242fa8fb2a9296d722c34aa

Change-Id: I2ae2cb8c323f3df1c0cfbaff776fd880b4ba4b68
ba90bd667c488670e4358b3e1d5d19c673b18138 25-Nov-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Revert of nanobench: lazily decode bitmaps in .skps. (patchset #1 id:1 of https://codereview.chromium.org/743613005/)" into master-skia

https://skia.googlesource.com/skia/+/535776eb28ce867cc173f982d8b652fb4361c0c4

Change-Id: I387adb9e66b42e4509c0a10df90a0e059fccd9d1
bacccef68f0c311244968152e0f270e076fc373b 25-Nov-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "nanobench: lazily decode bitmaps in .skps." into master-skia

https://skia.googlesource.com/skia/+/7e225bdb1f00ae4aed524ff8d0a61df3d3abb109

Change-Id: I13a498508dc5c0a6faebf4c7d1853c23e0def7a9
0a6e458008e6bc6de6711f511179edfaac8a41c2 25-Nov-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "more c" into master-skia

https://skia.googlesource.com/skia/+/afa278e250034186497722b1bc49ced885770249

Change-Id: I76bc94499bf07eb4bd57108fb6b4363774b26c12
53c656e2a3bbebc74b5978e0d2755d4422ba97af 21-Nov-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Revert of Add -ftrapv to debug builds. (patchset #1 id:1 of https://codereview.chromium.org/702893003/)" into master-skia

https://skia.googlesource.com/skia/+/c0591ca026144230f08b0c8d2c9b8f47e039fca4

Change-Id: I06715bf6c3546ad443da69b8c26d6da6d179f1a1
01a78d7768108e7313dec9fb6c0d7f0369140ee3 21-Nov-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Add -ftrapv to debug builds." into master-skia

https://skia.googlesource.com/skia/+/ebacb6127a952910f43a59460af43427d93df46c

Change-Id: Ie8d9d35f91d2b5b18926a64f8e4c3352a1debcac
2d3c6bd8a1302eca8eb1bb090d88bd074b0c9385 13-Nov-2014 Skia_Android Canary Bot <182615506979@project.gserviceaccount.com> Merge "Cleanup GrContextFactory and make it's subclasses private" into master-skia

https://skia.googlesource.com/skia/+/e4545210c950f98d9fa20f51bc1be6c5591534bd

Change-Id: Id7b3df09a4b4c04f0692bfbe66af69236f38f8b7
fc8b44beb067b32825b722f1dc598a4f24322a40 13-Nov-2014 Skia_Android Canary Bot <182615506979@project.gserviceaccount.com> Merge "Revert of Make nanobench and dm be usable from Chromium build (patchset #5 id:80001 of https://codereview.chromium.org/657373002/)" into master-skia

https://skia.googlesource.com/skia/+/3b27adef0a52f6d321fdee7412ef69e7a7284bcc

Change-Id: Ie4db5128cc329416f91a349346bc70e31768226a
3ea9d68372b568c06d931e31e722fc5e0bc4fba1 13-Nov-2014 Skia_Android Canary Bot <182615506979@project.gserviceaccount.com> Merge "Make nanobench and dm be usable from Chromium build" into master-skia

https://skia.googlesource.com/skia/+/c092d3bdab5f723576cc0346cea3ee282a9cb444

Change-Id: I0c078072713ff65e5645df4562426739ef321521
bbf2e25dd5fe662531a34a3b59521744e9203ce5 12-Nov-2014 Skia_Android Canary Bot <182615506979@project.gserviceaccount.com> Merge "Reland "Move from libstlport to libc++ for Android framework builds" (patchset #1 id:1 of https://codereview.chromium.org/718793003/)" into master-skia

https://skia.googlesource.com/skia/+/8338a9a855cf5e5127dcb62e48d5036b1ad2f29b

Change-Id: I1035801c8e8d8fccd7a4f264306cfbe894199532
64d5909983c42bffc237f748e4297122f2d8ad0c 11-Nov-2014 Skia_Android Canary Bot <182615506979@project.gserviceaccount.com> Merge "Revert of Move from libstlport to libc++ for Android framework builds (patchset #1 id:1 of https://codereview.chromium.org/714113002/)" into master-skia

https://skia.googlesource.com/skia/+/3c3fe7ce4893204eb8bcf885e8a1d539763bca5d

Change-Id: Iba9cbb9d86a118fa8f5532113677ba7332c4ea57
a7b80a58b86bac605d7e4cf4d79996b0e69cc5b7 11-Nov-2014 Skia_Android Canary Bot <182615506979@project.gserviceaccount.com> Merge "Move from libstlport to libc++ for Android framework builds" into master-skia

https://skia.googlesource.com/skia/+/ce259510a738fab05a0d456440104f5aba1c9d72

Change-Id: I7a5d48e0ed3f6cb37a69a270f3619f84ace4fa0e
88dcc698c39adeef82b2236395ee1dea1c13d380 07-Nov-2014 Skia_Android Canary Bot <182615506979@project.gserviceaccount.com> Merge "for X in {Dec,BigDec,Scalar}, SkWStream::write"X"AsText no longer mallocs" into master-skia

https://skia.googlesource.com/skia/+/f0de423f0930c7ab2b4d722fd23ce68533363443

Change-Id: Id3a587bb8a5e7a5875814542a72561a61335898f
5b35bd2cb930e292d09d26809b95a0ee87323d5d 04-Nov-2014 Skia_Android Canary Bot <182615506979@project.gserviceaccount.com> Merge "PictureRecordBench's benchmarks are no longer relevant with SkRecord." into master-skia

https://skia.googlesource.com/skia/+/a30b2ee0da169b00fb10d1a45b8e36441e16ce26

Change-Id: Ibfb5355aff235af373c397c1a05db90544d53f2f
e9c1c3f393903e4db11091253ada9f4ffbe36f36 31-Oct-2014 Skia_Android Canary Bot <182615506979@project.gserviceaccount.com> Merge "Use Color Processor for color bitmap text draws on gpu." into master-skia

https://skia.googlesource.com/skia/+/ed3af6648ffe1044d6fb3f6deac53711cb1280c8

Change-Id: Id3adab63151e94f39b707058e2edf9a80d80d137
fda44fd811cd16c51ce0938eb60bd643eb931904 27-Oct-2014 Skia_Android Canary Bot <182615506979@project.gserviceaccount.com> Merge "Fix the way we patch up the matrix for scaled images that aren't clamp/clamp" into master-skia

https://skia.googlesource.com/skia/+/535e3b2025d3244c2ca48982d14d1d31f1d23c1f

Change-Id: I533da800832a929e62a2102dbf5abbcb2befba07
b06335e20aa59e779765e84608a5e73a8338c59f 26-Oct-2014 Skia_Android Canary Bot <182615506979@project.gserviceaccount.com> Merge "add gm: colorwheel" into master-skia

https://skia.googlesource.com/skia/+/30b83d45a3af444e6868c638d86442c2ea3e20c6

Change-Id: Ibf76e312fe44514001176046a0be7bf8793b1efe
efff7cdf00cd6fe0f15f207c4fc06581d7375459 24-Oct-2014 Skia_Android Canary Bot <182615506979@project.gserviceaccount.com> Merge "move c api into include" into master-skia

https://skia.googlesource.com/skia/+/e332396d2fabb84894c816ff3999cf1c6262fd9d

Change-Id: I45d5e48c9f8c53b1602d2aeb9248ec58f16a1381
7b206f643bd5d431acf4523512cef3c1ffac5e9c 13-Oct-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Revert of No threadsafe statics. (patchset #1 id:1 of https://codereview.chromium.org/654663002/)" into master-skia

https://skia.googlesource.com/skia/+/380d7d733953081b476fa04bf9e0093b85d0b1c4

Change-Id: Ie48d13c41e4adfa3667a7459225c5b2e47dff204
2a14f79ce1d2d4ad4785b4b01435da4f90f0aedb 13-Oct-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "No threadsafe statics." into master-skia

https://skia.googlesource.com/skia/+/cad5d3e264535c919b80e1e2a85407307961f221

Change-Id: Icb005902f68507965b5635570abc472035fa2186
68e35d8c22eabc95475bae7a04da68a6ca5c5af8 13-Oct-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Enable color emoji GM on Android" into master-skia

https://skia.googlesource.com/skia/+/0880686d9586e719fed5eb157919c3cdb1f0a450

Change-Id: I27730e2fabf4e553a436227cbafaf135972d6d6c
14db0062786a5bf9b8e79c36c400bb51d9369af5 10-Oct-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "cleanup and optimize rect intersect routines" into master-skia

https://skia.googlesource.com/skia/+/1119c870651ccd34c0acb8fb2cdfad2c07d3116c

Change-Id: I46d52b66d27234965ca03b94fac8e82b829847ff
c44dfebf6f58dc0b0d70fd9d22f4123ba7b1dcf6 09-Oct-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Draw more accurate thick-stroked Beziers (disabled)" into master-skia

https://skia.googlesource.com/skia/+/feff7d2d7719f52c7ea52db156003e609002bf04

Change-Id: Ib3c6eea54be2f2ab08d013361a4743865b022e55
2ee69c2bc76a511e25ddaf43ab5a4de811032a67 09-Oct-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Adding 3D lut color filter" into master-skia

https://skia.googlesource.com/skia/+/ce686270f533b9d741ef85661ef9d78517a01b86

Change-Id: I2ebe124d56cad42d378ad1ea2127fbfcf529e8f0
f016fba210b5f6db673235d395bfa01b194ae07a 30-Sep-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Strip old backend recording down to essentials" into master-skia

https://skia.googlesource.com/skia/+/46616af

Change-Id: Iadf0ae729b93d66b97bac56a8b30587b49af32cc
2d2597eea566a3121df9ecbbac9db2476e24fc22 22-Sep-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Introduce Props to surface (patchset #27 id:520001 of https://codereview.chromium.org/551463004/)"" into master-skia

https://skia.googlesource.com/skia/+/4a8126e

Change-Id: Id6016967f64ec6ffe68317f2e2c981b1e1750744
e447dda3d68627dec13adb463223cc4a2c34ef17 21-Sep-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Revert of introduce Props to surface (patchset #27 id:520001 of https://codereview.chromium.org/551463004/)" into master-skia

https://skia.googlesource.com/skia/+/29c857d

Change-Id: I18eb3b0244c70e5e6e75882d78efa332e19afaa4
3ba495724925d5c923f5c8f84eaa62c5ac389b9b 21-Sep-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "introduce Props to surface (work in progress)" into master-skia

https://skia.googlesource.com/skia/+/3716fd0

Change-Id: I2422147d147479e52c2acaf48af35647956efc4f
04c45cb74fceb799bc884194dca1801b063d4fb4 19-Sep-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "SkTextBlob shader space workaround." into master-skia

https://skia.googlesource.com/skia/+/8483326

Change-Id: I0f80d20aab8dad13572d6ddcff1556e3b29c7d47
b3ce8a59b68e3e7a1645e5c0c0930c937a07913a 17-Sep-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "hide deviceproperties, prepare the way for surfaceprops" into master-skia

https://skia.googlesource.com/skia/+/e010f1c

Change-Id: I19819d694460bdd6641db6e70327ba8f43b92d77
fde52845c0da484041b01b560b33f580b4989666 17-Sep-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Revert of nanobench: lazily decode bitmaps from SKPs (patchset #1 id:1 of https://codereview.chromium.org/572933006/)" into master-skia

https://skia.googlesource.com/skia/+/963504b

Change-Id: I4c4e7224362a416c7cb45238ad402007ec3c9e19
e558504143ec59abfa767e559d1c0bd1d3eaa959 16-Sep-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "nanobench: lazily decode bitmaps from SKPs" into master-skia

https://skia.googlesource.com/skia/+/d664c21

Change-Id: I30da7b0e326c055c79f26d74fe736dbccd62f3d7
bfe150392fe70c35104472deb8f533827ea8622f 16-Sep-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Fix scaling issue with distance field text." into master-skia

https://skia.googlesource.com/skia/+/9564ce6

Change-Id: Ifa2743155166d7affafab133ce9080285dc8e570
b5e5da412d649fb53938c948329e8271725b25d6 16-Sep-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Nested picture nanobench" into master-skia

https://skia.googlesource.com/skia/+/4416267

Change-Id: I4600fd74f8d5be5ec2f4a155c5d4a9c47eeab476
f7fb60dfafe328257239006a471bcf5e0ccb0185 13-Sep-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Revert of Add a test that uses C++11 features as a compiler canary. (patchset #2 id:20001 of https://codereview.chromium.org/568913002/)" into master-skia

https://skia.googlesource.com/skia/+/94c4151

Change-Id: I3b9e729b598c87ab8b9c26f7b67902dfdc27dc6e
a0f0bca3713c8b4fae219c29e18e0439ef39800c 13-Sep-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Add a test that uses C++11 features as a compiler canary." into master-skia

https://skia.googlesource.com/skia/+/86e01df

Change-Id: I5f8ebb31f16199d3bac8b041cc575d512a4262db
c2da57043eb01cacc6970a6d1559d9e46dd2ff58 10-Sep-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Measure picture recording speed in nanobench." into master-skia

https://skia.googlesource.com/skia/+/fd731ce

Change-Id: I50c54ff721bcfe1481b1bb1b27badd5da2ad5c33
18f1f0c16cca8d6f1e95b5199a9ff65809e4e5be 10-Sep-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "make set3DMask virtual, so we can safely notify the shadercontext" into master-skia

https://skia.googlesource.com/skia/+/cc0e311

Change-Id: I499ecd0dacc18cf547bdd57ec20e4654846e79cd
efd78bcdf4509f39e42f3c2cdd4b1e5beec31212 10-Sep-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Outset the stroke width when computing the bounds for drawing a stroked rect, or 1 if it's a hairline" into master-skia

https://skia.googlesource.com/skia/+/b3eba47

Change-Id: I958a027f914abd7da53d3552ce6eece30e6b5d9e
1108f6d4a95c695d8a468199b04ec10c33bdf0a2 27-Aug-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Clean up some benches that answer questions we're no longer asking." into master-skia

https://skia.googlesource.com/skia/+/4473be8

Change-Id: I794ff66a30addb20cb238aca08144888dc2ea5fa
326f1187daeca2bd1b10266ee70ce0746a663273 26-Aug-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Remove SkQuadTree." into master-skia

https://skia.googlesource.com/skia/+/2a65a23

Change-Id: I13c47b6696fa6526975c50d773e8403630804ea5
2b28daf59088138b8e790d6f662e5edb78cb96e5 25-Aug-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Revert of Benchmark designed to exercise fractional image scale/translation (patchset #2 of https://codereview.chromium.org/491793003/)" into master-skia

https://skia.googlesource.com/skia/+/5387c83

Change-Id: I75782457f0b434d496bf1a8f7beab0a46d566812
4e5f8c6a846579ee1ca0bd7d8f33385344a310c8 25-Aug-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Benchmark designed to exercise fractional image scale/translation" into master-skia

https://skia.googlesource.com/skia/+/5fc2266

Change-Id: Ic3fa5740a74bbe57aa0ea50e29793192d7a60b56
ca2b2ec7d99c82ec2fe4a88f4785ee8ca7540a47 21-Aug-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "fix android framework build for nanobench" into master-skia

https://skia.googlesource.com/skia/+/d92c4c5

Change-Id: I34b48d13a399cbc16a9b4aaefc6510edf6e7f24e
bba25117b60b5a1f17f46fa93418e79f6bea80be 21-Aug-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "SkMultiPictureDraw API" into master-skia

https://skia.googlesource.com/skia/+/7eacd77

Change-Id: Ib7015f0209f1ff4d45c99132d219dac4b970acea
93523c6f5e99355e170fe1db68575414051ce06c 21-Aug-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "SkTextBlob" into master-skia

https://skia.googlesource.com/skia/+/00d5c2c

Change-Id: I1f7a53a063126f37002e00d690c9f0d6d6a5f0b2
1d5b6cc4f3ffec798248e9d469dc92b2a38149b7 20-Aug-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Add --properties for things like gitHash that describe the current nanobench run." into master-skia

https://skia.googlesource.com/skia/+/1915b62

Change-Id: I32c94ac49487720ac40916cd37219722f3d1cfbb
13017f1ed9dd6e86d5fe435e51878b0e1b387a96 20-Aug-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Print max RSS in GM and nanobench too." into master-skia

https://skia.googlesource.com/skia/+/afb4379

Change-Id: Id368fa4cf592785f58e40cc52c3d4455ea295662
c386985b240b735ea83fe04e9918d7592c69e8d1 18-Aug-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Refactor GrLayerCache for new API" into master-skia

https://skia.googlesource.com/skia/+/6f294af

Change-Id: I7721804b4f7f3e5f4ceded0fd924ad9c2b19cdce
26faa8188e59ac472034945fc35606f130e44805 06-Aug-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Bye bye bench." into master-skia

https://skia.googlesource.com/skia/+/be21e34

Change-Id: I9e263eed9d8d1ca28f4fc96371a6721a44b6004b
3ed9925a42add76bbd508b44a5db221048d59ae1 06-Aug-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Remove ALL font fallback logic from Skia." into master-skia

https://skia.googlesource.com/skia/+/1b27704

Change-Id: I62b25b5e0d5459c5097d9d674f52d9ef7f17cdc2
e2e5ff110fec91fcc10a8fd49691c55c0134c180 31-Jul-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "sk_tool_utils_flags.cpp depends on GetResourcePath" into master-skia

https://skia.googlesource.com/skia/+/ada972d

Change-Id: I2deca2fb08f39b382e5d0ef6377039c924f95416
e1e2962db082ca951e5e23f32801d1e172cc8035 31-Jul-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Add standard fonts to all GMs." into master-skia

https://skia.googlesource.com/skia/+/992c7b0

Change-Id: I3569d3ec51e439926628f08e8bc01004040bddc1
ee64db2929da493bba15ada39fb2aee48da99702 30-Jul-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Add rotated rects benchmarks" into master-skia

https://skia.googlesource.com/skia/+/3342ed5

Change-Id: If4a85572403c2bff4217ee4a023183aaab03d177
3b5a8059bd794eedb42ed5a567c423d33a7d7a8f 28-Jul-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Revert of Remove relative path to GrColor.h in SkShader.h (https://codereview.chromium.org/422023005/)" into master-skia

https://skia.googlesource.com/skia/+/4beef91

Change-Id: Ia147670044419a510ee781f45dc997d6e42a5ad4
158b1e7cb37e2177ac034a77df1f2e9ed637f0ad 28-Jul-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Remove relative path to GrColor.h in SkShader.h" into master-skia

https://skia.googlesource.com/skia/+/939f430

Change-Id: If41306abf96f5c7bcf1c335763de827c41db37fa
062bac0c7ded05e0db4795bfb1806ee958260080 25-Jul-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Send less transform data when drawing text with nvpr" into master-skia

https://skia.googlesource.com/skia/+/b2808cd

Change-Id: I6b88d6cffa0958ab50866c0d294ba1367c98f4be
031c9ee8e0f61e6626bc2bf6c303eac39adf093a 25-Jul-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Added classes SkPatch and SkPatchMesh which help encapsulate and generalize this new primitive. The functionality and responsability of each class is better explained in the comments of the files." into master-skia

https://skia.googlesource.com/skia/+/50d7154

Change-Id: Id541610914301ca0c36cba6375812041a7cf4327
454ecec760038bf1d2a01458af9539fea5caaa6d 22-Jul-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Introduce skia_pic gyp variable." into master-skia

https://skia.googlesource.com/skia/+/c0bc913

Change-Id: I271c6b752b7460a170e515e9f1e171c586d5e676
73b463e06377735ccbbe897499f10b3d0259ff34 21-Jul-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Remove gpu shader optimatization for solid white or trans black colors" into master-skia

https://skia.googlesource.com/skia/+/02cafcc

Change-Id: Ia19f192b0d14ec6e2ca7de93308f797408bcc339
e74c8d639b6270297db7351fecc97f34bf5bc16b 16-Jul-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Remove outdated compiler restrictions." into master-skia

https://skia.googlesource.com/skia/+/122f9ec

Change-Id: I28793fa2870d58c6aedb3e412a5baf03f9cd5db5
be628703204d84892779cbaa1eab6a63339225d5 11-Jul-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Revert of Remove gpu shader optimatization for solid white or trans black colors (https://codereview.chromium.org/375823005/)" into master-skia

https://skia.googlesource.com/skia/+/c855ca0

Change-Id: I1a2b393adc89bb642ff372ce0d047f8dc9815cde
365408fb67515501293f6227f1a354e09802c9c1 11-Jul-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Remove gpu shader optimatization for solid white or trans black colors" into master-skia

https://skia.googlesource.com/skia/+/5f78d22

Change-Id: I7b8ed99e0c50035acf04e81a5be552b6214ed337
e7c50fd73168ae29c9b3ce6a54436f6c3d253c68 08-Jul-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Add missing / in android_gdbserver" into master-skia

https://skia.googlesource.com/skia/+/f955223

Change-Id: Ib150c69eb8b1efbc457eca548a06a40940791e83
1c700dd4454dcf9893f00a992003e50d6b2ea36e 08-Jul-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "YUV to RGB converter" into master-skia

https://skia.googlesource.com/skia/+/24dcac2

Change-Id: Ie0d4db667e102417baff8b23fba8669303ef4895
33015690cdd9a02297df78a020cce6f5e3e1f374 01-Jul-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Fix race condition in parallel font initialization." into master-skia

https://skia.googlesource.com/skia/+/60b08a0

Change-Id: I8be22815c9e2c8dda1e09baccc22e33f27ab674f
0d11c8d147034334c6493ba31acda01ecc362ccf 30-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "SaveFlags be-gone" into master-skia

https://skia.googlesource.com/skia/+/5f6102d

Change-Id: I83deca4417b2d1043a119bf9450ed54abb128985
aec3f0d851f77beef542c696e67a674acfdcd14d 27-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Remove SkBicubicImageFilter, and all related tests." into master-skia

https://skia.googlesource.com/skia/+/7bf1068

Change-Id: I018df4eccd4357802234976f17d8213756d88e2a
3e1540e5ac10298ae8ad1bc7804e0e4df72275ce 27-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Add nanobench, a fresh look at our microbenchmark harness." into master-skia

https://skia.googlesource.com/skia/+/f372321

Change-Id: I179843ae79cb7d3d09196f7ca69e02ab7ac3327c
adcfd33aa39aa41cd6df2954580c069981bf9574 24-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "delete disabled bench" into master-skia

https://skia.googlesource.com/skia/+/32492e8

Change-Id: I20601da958134b2059d487d8e55bf6ec0e5817c8
ff2e2db092eda51d374dc6e4b860cc7fef62f45b 23-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "use platform-independent font for gm" into master-skia

https://skia.googlesource.com/skia/+/5fb6bd4

Change-Id: I3d59e47e249aa1e9bd515e9ad4fb5dc0fd258c05
7b96911645b84f19a42f355da8ef5d8a5931ad17 23-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Revert of Revert of Fix SkPaint::measureText for stroked hairline text (https://codereview.chromium.org/354433002/)" into master-skia

https://skia.googlesource.com/skia/+/c4b84ae

Change-Id: I661c015166c60fc31a9180ddc17fdaa4a30ad007
39126105d4aaed4837975036e4aba0053a5ee5c2 23-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Revert of Fix SkPaint::measureText for stroked hairline text (https://codereview.chromium.org/335603003/)" into master-skia

https://skia.googlesource.com/skia/+/abc9bb5

Change-Id: Id5b13c24859bbdae5e42521b50c96e1d86509e78
4bfff2750ea6d3dae541e1ad69323ef68115342d 23-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Fix SkPaint::measureText for stroked hairline text" into master-skia

https://skia.googlesource.com/skia/+/196af73

Change-Id: Ie5fa006ac576d3a2956d86a3752cd05f3ec36147
3538fc9a5a7b4df684f7323c792dee784b410f96 21-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Add GYP target for sk_tool_utils.* component." into master-skia

https://skia.googlesource.com/skia/+/2010891

Change-Id: I7e9df951189a921864799edddfae60ae1c88a99a
fd33437fecbd8d252d53d61b98b270ade608b172 20-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Move BenchTimer to tools as Timer" into master-skia

https://skia.googlesource.com/skia/+/9ac68ee

Change-Id: I7dc24b601cc1e7bbbc1129b710adc7ff4ec2174b
ab13a9fbecb1a02a2ef660d60cf171d344321922 20-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Revert of Move BenchTimer to tools as Timer (https://codereview.chromium.org/344213003/)" into master-skia

https://skia.googlesource.com/skia/+/9e64b78

Change-Id: I0d5ca3b3f94bb665dc9ac5eecb0b3d41a5afdf54
0ec0eac8419433256295c74dd2214502408f18a2 20-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Move BenchTimer to tools as Timer" into master-skia

https://skia.googlesource.com/skia/+/4ed7528

Change-Id: Ic2d1a8c7357bc2b693384423587f99bab72397b3
33f3cb871d26a73e25237257dcd2b128802e0169 19-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Remove Sk prefix from some bench classes." into master-skia

https://skia.googlesource.com/skia/+/f168b86

Change-Id: If62cff6a577fa8c2482b8cc7926af22125d96981
03d9deec706cd92f8f6524bdabc788a8df50ddf4 18-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Refactor how we handle resources path in Tests." into master-skia

https://skia.googlesource.com/skia/+/bcbc178

Change-Id: Idecea6249a2a1874080c9eaee9a57709fdb0fcbe
1dc1ba0639572b75b46770f496d18ec003d5b874 18-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Add basic stacktrace handler using libunwind." into master-skia

https://skia.googlesource.com/skia/+/30e6e2a

Change-Id: I845b3fafadc2842c38996c154bf7dbe17859d809
6ef50e6b9588ddb58852fda770874a360cd417c3 18-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "In Android framework, make tools depend on jsoncpp" into master-skia

https://skia.googlesource.com/skia/+/f01a6c3

Change-Id: I821177944866bf1aaee703a38fb4dc6f1dd79495
a8dbe3f21c692b274486d03e7e44b4d19a0ea06b 17-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Silence warnings about using offsetof on near-POD structs." into master-skia

https://skia.googlesource.com/skia/+/24ad096

Change-Id: If7bd992905da096c98e415c3da88949ca4069d9d
a86595034260e4d24c0ae23bf3c33b9f90580a65 10-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "GM/bench for text draws with various parameters and clip rects." into master-skia

https://skia.googlesource.com/skia/+/7c5c9da

Change-Id: Id2461a266120b3496f5655e6beb59726f50eeca5
a9637127438a0c795273e7892a0a6e897286b3cf 05-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Add bench for rectanizers" into master-skia

https://skia.googlesource.com/skia/+/c2fce56

Change-Id: I68ed79afed16027837390ebc25d0f9fb048802ad
a51c5483043e2abaf16b86e492cf1ccd78ae2995 05-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Two new benches for ETC1 bitmaps." into master-skia

https://skia.googlesource.com/skia/+/9a3cdbb

Change-Id: I61fd2efd429d0e756c65f37907bc2bb73e5fc2cd
ab312cb7e11a396b04e93f042b198763bdd04e5e 04-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Add non power of two gm for ETC1 bitmap" into master-skia

https://skia.googlesource.com/skia/+/2dc337c

Change-Id: Ib8e3cd42167df59861b34dff6a5975cd3aea09e0
6a890e7034bcf44a7dd6697e6970f814e8852300 04-Jun-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Android: remove -lcutils dependency" into master-skia

https://skia.googlesource.com/skia/+/bec3634

Change-Id: I078b513c9037b748d98a424ad45625985bbdd7e1
6246616ce4175835217808f8a992fd7b7d02478a 29-May-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge "Reland https://codereview.chromium.org/286903025" into master-skia

https://skia.googlesource.com/skia/+/37c772a

Change-Id: I6909525493b2e765d4563b9d9e3b5e9759620db8
03a64be66b0c7a30c1b7bb07be400e865d33d0df 28-May-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge Skia at "f449156 from Wed, 28 May 2014 17:30:02 +0000"

https://skia.googlesource.com/skia/+/f449156bd00815eae1f1daea436f08068ef0f01c

Change-Id: I8dbffa17a86582e6e30d665b4c8791b92ab581fa
7b8ac190209923982a99c13d02abb0defad78662 27-May-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge Skia at "293a4b3 from Tue, 27 May 2014 21:51:38 +0000"

https://skia.googlesource.com/skia/+/293a4b367ae5b89384c364737ef76099fd3f0101

Change-Id: I82a343a1dfd84331709749a158b5e646c318e352
bf0333300c974a5618226859c1a0bf4b80e627db 27-May-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge Skia at "f3b1eb4 from Tue, 27 May 2014 21:12:42 +0000"

https://skia.googlesource.com/skia/+/f3b1eb4ea262e48c93db8f0975e16341596cd8ec

Change-Id: Ib596c31c8a20a07b37c8956eae8a3766fa9e72c4
ce68a2dd541bb100b84b2f7b7a643f84ca08df2b 27-May-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge Skia at "3089004 from Tue, 27 May 2014 20:57:44 +0000"

https://skia.googlesource.com/skia/+/3089004cc88e919526e43a8122a74db8f0a7790b

Change-Id: Idae1e4bbe88f09350204f5a4513bc0844fde6705
346b2d9f25c76e38a996bc03ae5ae7690d05f508 27-May-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge Skia at "44f4129 from Tue, 27 May 2014 20:54:04 +0000"

https://skia.googlesource.com/skia/+/44f41293ac94530d08fca2ce8484a7248e7a5e97

Change-Id: I089f5b24bdd2c0d4bfdf886ae35f76906e2b820c
862c0b8e58cff43625de612415fad23731b6820d 22-May-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Manual merge Skia into Android.

Change-Id: I66b251aa66696b46f3eca878083392d62f217ef0
005a98d93d9735e07e59250441a28034f54efd53 20-May-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge Skia at "6a106ce251bd531ab6792d72ab50770149b3675e from Tue, 20 May 2014 19:02:55 +0000"

Change-Id: I796f4052c886f1f054062d54ea422e561042fd13
f9246e209873426f19d7245173a575623580bb84 16-May-2014 Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Merge Skia at r14761

Change-Id: Iad6655f881e4f8bbd889e10542b2f11cef34444e
1cadd3c11c7d87f410bcaf0f229a89eca7a3a121 24-Feb-2014 Derek Sollenberger <djsollen@google.com> Merge remote-tracking branch 'goog/m33' into master

Conflicts:
Android.mk
include/utils/SkFrontBufferedStream.h
src/images/SkImageDecoder_libpng.cpp
src/ports/SkFontHost_FreeType.cpp
src/utils/SkDeferredCanvas.cpp
src/utils/SkFrontBufferedStream.cpp
src/utils/SkPictureUtils.cpp

Change-Id: Iae45e9cff346667ca9c4b406622bc467f04e7410
fb19a94c96f0e4bd55995fe5bf979f4715fcfd20 20-Feb-2014 wsmlby <wsmlby@google.com> built skia_bench into /data/local/tmp/

Change-Id: Ic0a0a7aa600a03add04186b24051697c6215472a
/external/skia/bench/Android.mk
c966a79f9451249f14c417a7657245661a628817 11-Feb-2014 Leon Scroggins III <scroggo@google.com> A couple of attempts to fix Android bench crash.

bench/Android.mk:
Undefine FORTIFY_SOURCE, like in external/skia/Android.mk, so strrchr
will not cause problems.

bench/DecodeBench.cpp:
Use SkOSPath::SkBasename instead of calling strrchr directly.

Change-Id: Iff13d834a68bb8c708811250d07cc80284f01d2c
/external/skia/bench/Android.mk
f397b21b691b7ea535dc764590704946cfff7899 17-Jan-2014 Derek Sollenberger <djsollen@google.com> Merge Skia r12682 into Android.

Conflicts:
include/core/SkDraw.h
include/pdf/SkPDFDevice.h
include/utils/SkCanvasStateUtils.h
include/utils/SkFrontBufferedStream.h
src/core/SkDevice.cpp
src/core/SkDeviceLooper.cpp
src/core/SkDeviceLooper.h
src/core/SkRRect.cpp
src/doc/SkDocument_PDF.cpp
src/effects/SkBlurMaskFilter.cpp
src/fonts/SkFontMgr_fontconfig.cpp
src/gpu/GrAAHairLinePathRenderer.cpp
src/gpu/GrAAHairLinePathRenderer.h
src/gpu/GrTextContext.cpp
src/images/SkImageDecoder_libpng.cpp
src/images/SkScaledBitmapSampler.cpp
src/images/SkScaledBitmapSampler.h
src/pdf/SkPDFDevice.cpp
src/pdf/SkPDFDeviceFlattener.cpp
src/ports/SkFontConfigInterface_android.cpp
src/ports/SkFontHost_FreeType.cpp
src/ports/SkFontHost_FreeType_common.cpp
src/utils/SkCanvasStack.cpp
src/utils/SkCanvasStack.h
src/utils/SkCanvasStateUtils.cpp
src/utils/SkDeferredCanvas.cpp
src/utils/SkFrontBufferedStream.cpp
src/utils/SkPictureUtils.cpp

Change-Id: Ice86d9769ed99f804932d8839acfdea695cb6d28
14e97bb1ef42971eb1e196540ef200d76b8fe3db 18-Nov-2013 Derek Sollenberger <djsollen@google.com> Merge Skia r12108 into android

Conflicts:
include/pdf/SkPDFDevice.h
include/utils/SkCanvasStateUtils.h
include/utils/SkFrontBufferedStream.h
src/core/SkDevice.cpp
src/core/SkDeviceLooper.cpp
src/core/SkDeviceLooper.h
src/doc/SkDocument_PDF.cpp
src/gpu/GrAAHairLinePathRenderer.cpp
src/gpu/GrAAHairLinePathRenderer.h
src/gpu/GrTextContext.cpp
src/images/SkImageDecoder_libpng.cpp
src/images/SkScaledBitmapSampler.cpp
src/images/SkScaledBitmapSampler.h
src/pdf/SkPDFDevice.cpp
src/pdf/SkPDFDeviceFlattener.cpp
src/ports/SkFontConfigInterface_android.cpp
src/ports/SkFontHost_FreeType.cpp
src/utils/SkCanvasStack.h
src/utils/SkCanvasStateUtils.cpp
src/utils/SkDeferredCanvas.cpp
src/utils/SkFrontBufferedStream.cpp
tests/CanvasStateTest.cpp

Change-Id: Ia38ee21ae98fd5455c551becd7e1884c334f5df1
2c7111b0b151acaf124e39bd57b376149b8511ce 20-Sep-2013 Leon Scroggins III <scroggo@google.com> Build fix.

Do not build bench which depends on more recent changes to
bench not included by android yet.

Change-Id: Icddcd60be3cb5f577378b0a82c8d0084fdebc498
/external/skia/bench/Android.mk
34835907d8ed21079a9ee09e0e16082a98637d42 19-Sep-2013 Leon Scroggins III <scroggo@google.com> Add an option on SkImageDecoder to skip writing 0s.

Only implemented for PNG.

Add a getter and setter, and sets the default to false in the
constructor. Also copies the setting in copyFieldsToOther.

Fix an indpendent bug where fDitherImage was not being copied in
copyFieldsToOther.

In SkScaledBitmapSampler::begin, consolidate the settings passed in
by passing a const reference to the decoder. The decoder can be
referenced for its settings of dither, unpremultiplied, and now
skipping writing zeroes. Update callers to use the new API. In png
decoder, rather than passing around a pointer to an initial
read of getDitherImage, and potentially changing it, look at the
field on the decoder itself, and modify it directly. This is a
change in behavior - now if that same decoder is used to decode
a different image, the dither setting has changed. I think this is
okay because A) the typical use case is to use a new decoder for
each decode, B) we do not make any promises that a decode does not
change the decoder and C) it makes the code in SkScaledBitmapSampler
much cleaner.

In SkScaledBitmapScampler, add new row procs for skipping zeroes. Now
that choosing the row proc has five dimensions (src config, dst config,
dither, skip writing zeroes, unpremultiplied), use a new method: each
src/dst combination has a function for choosing the right proc depending
on the decoder.

SkScaledBitmapScampler::RowProc is now public for convenience.

Remove Sample_Gray_D8888_Unpremul, which is effectively no different
from Sample_Gray_D8888.

In cases where unpremultiplied was trivial, such as 565 and when
sampling from gray, decoding may now succeed.

Add a benchmark (currently disabled) for comparing the speed of skipping
writing zeroes versus not skipping. For this particular image, which is
mostly transparent pixels, normal decoding took about 3.6 milliseconds,
while skipping zeroes in the decode took only about 2.5 milliseconds
(this is on a Nexus 4). Presumably it would be slower on an image
with a small amount of transparency, but there will be no slowdown
for an image which reports that it has no transparency.

In SkImageRef_ashmem, always skip writing zeroes, since ashmem
memory is guaranteed to be initialized to 0.

Add a flag to skip writing zeroes in skimage.

Add a regression test for choosing the rowproc to ensure I did not
change any behavior accidentally.

BUG:10016979
Change-Id: I5986ae750b85a9c9d8e3cafeebe904910247de3b
/external/skia/bench/Android.mk
1c38bb9ea8c4c8f5227c3e25e86faddfbf824524 14-Aug-2013 Leon Scroggins III <scroggo@google.com> Merge Skia r10680 into Android.

Conflicts:
include/core/SkUserConfig.h
src/images/SkImageDecoder_libjpeg.cpp

Change-Id: I40e031f0abcd0d1e064b25f071bfc5f1b3c55e91
0cfa53d69f121ba65ae8466971f54c38081afe44 31-Jul-2013 Derek Sollenberger <djsollen@google.com> Merge Skia r10377 into Android.

This CL also includes a cherry-pick of r10483 to fix
errors in the JPEG region decoder.

Conflicts:
include/core/SkUserConfig.h
src/images/SkImageDecoder.cpp
src/images/SkImageDecoder_libbmp.cpp
src/images/SkImageDecoder_libgif.cpp
src/images/SkImageDecoder_libico.cpp
src/images/SkImageDecoder_libjpeg.cpp
src/images/SkImageDecoder_libpng.cpp
src/images/SkImageDecoder_libwebp.cpp
src/images/SkImageDecoder_wbmp.cpp
src/ports/FontHostConfiguration_android.cpp
src/ports/FontHostConfiguration_android.h
src/ports/SkFontConfigInterface_android.cpp

Change-Id: I415ba6cfbb7ee41f4c8c5c01ec1bcc32345568d2
e7e8691b08f0cf2292ff470ada84e03ded358075 28-May-2013 Derek Sollenberger <djsollen@google.com> Merge Skia r9286 into android.

Conflicts:
include/core/SkFontHost.h
include/core/SkPaint.h
include/core/SkScalar.h
include/ports/SkTypeface_android.h
src/core/SkPaint.cpp
src/core/SkScalerContext.cpp
src/core/SkScalerContext.h

bug: 8719528
Change-Id: Icf2f43cfaacc6f0a0fa1965b2c1f4d2b957e9982
dde23ce372d3ac1beb27c82ad5814cc744b843d8 03-Apr-2013 Derek Sollenberger <djsollen@google.com> Merge Skia r8352 into Android

Change-Id: Id9945639617af9802b3d16a5f8485469125e8545
60a9b8e11b10563167107cebafd1cc25d825d7b1 04-Feb-2013 Derek Sollenberger <djsollen@google.com> Merge Skia @7527

Conflicts resolved in:
include/gpu/GrBackendEffectFactory.h
src/core/SkPaint.cpp
src/effects/gradients/SkLinearGradient.cpp
src/ports/FontHostConfiguration_android.cpp

Change-Id: I5ad1f8f99f8fdbc26c5f98861701dd0c1cee82fa
1d0f5a1e3b467fc2211e2a94b3806770b228b6e0 19-Dec-2012 Derek Sollenberger <djsollen@google.com> Merge Skia @6890

Change-Id: I12ae1c7ebdb566addf3d2783c8405793e842df8a
6699e7ea2e981dccc2f3c41b5dcf1c860b11558d 06-Dec-2012 Jean-Baptiste Queru <jbq@google.com> Merge skia @5967

Change-Id: I8c637470b52c8277a781111c2ac2d1dcce7d84fa
4f1dae40e24d57d647db01443b8bf2410514b8b5 06-Mar-2012 Derek Sollenberger <djsollen@google.com> Skia Merge (revision 3312)

This CL also includes changes made to Android's copy of
Skia in their J release branch.

Change-Id: Ib2baecf48004951a3ad4a1574cdc38790c814cbc
/external/skia/bench/Android.mk
1cab2921ab279367f8206cdadc9259d12e603548 18-Jan-2012 Derek Sollenberger <djsollen@google.com> Skia merge (revision 3022)

This CL has companion changes to account for API updates in...
(1) frameworks/base
(2) external/webkit

Change-Id: Ibb989e76e8bd24313849f9631dbef42cdef9eb7d
/external/skia/bench/Android.mk
0199fa7423f89a129da2b22a488f2c18e2e4727f 23-Jun-2011 Derek Sollenberger <djsollen@google.com> Skia Merge (revision 1562)

Change-Id: Ief005abc9eb741ccf5efec3d1f29fe2dfc23103d
/external/skia/bench/Android.mk
0b15698a8c76bb8abc1b555c1d91892669b4118f 06-Jun-2011 Derek Sollenberger <djsollen@google.com> Skia Merge (revision 1510)

This CL includes bug fixes and closely mirrors the version of
Skia used in Chrome M13, which is likely to be our baseline for
ICS.

The CL also adds source files for the SampleApp which will allow
us to execute basic skia tests. The SampleApp requires the
utils/views directory in order to run.

Finally, we have included the PDF backend for Skia in order to
experiment with using it to generate PDF files for certain
applications.

Note: The SampleApp and PDF code are not built as part of libskia.

Change-Id: I1895ccfbd8074e25f19148cc7bd1b4af571fb307
/external/skia/bench/Android.mk
40528743dbb9ce7f39f093e0cdc47849ac8887cf 07-Jan-2011 Derek Sollenberger <djsollen@google.com> Skia Merge (revision 808)

This merge has companion changes in the following projects in order
to be compatible with changes to skia interfaces and practices:

1. /frameworks/base
2. /external/webkit

Change-Id: I54092971305579e81a8fdb27bbe04ec340792e3b
/external/skia/bench/Android.mk
32a0e74681142badb9efd90be3558bd9a943755e 22-Feb-2010 Mike Reed <reed@google.com> update benchmark tests
/external/skia/bench/Android.mk
57382d688c1d6928b1d9bbbaf27188d54dd9e002 02-Sep-2009 Mike Reed <reed@google.com> add decoding bitmaps to bench tool
refresh misc. skia files
/external/skia/bench/Android.mk
9a5843c9b6ef01f25513bef72a91936f75cc4458 13-Aug-2009 Mike Reed <reed@google.com> special case no scale in the matrixprocs for tiled bitmaps
yields ~10% overall speedup
also, refresh misc fixes in freetype and antipath from trunk
/external/skia/bench/Android.mk
7cc0a6ac7b817b217dd614cba96fc533b32d505d 04-Aug-2009 Mike Reed <reed@google.com> enable arm flags in makefile and by including cpu-features.h
/external/skia/bench/Android.mk