summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-10-02Merge from Chromium at DEPS revision 30.0.1599.85android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-cts-releasekitkat-cts-devTorne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I449d60b3d7547648d4a6871c352653a8a17d57b5
2013-10-02Merge third_party/skia/gyp from ↵Torne (Richard Coles)
https://chromium.googlesource.com/a/external/skia/gyp.git at 4558d6c52772c6ef6638a45a6bd9fb852a01148b This commit was generated by merge_from_chromium.py. Change-Id: If1cf9ef466b9e92005ab4ee2dac04d92a16cb4f4
2013-09-27Hack to make it compile, given that we're missing SkBitmapDevice.hreed@google.com
R=djsollen@google.com Review URL: https://codereview.chromium.org/25037005 git-svn-id: http://skia.googlecode.com/svn/branches/chrome/m30_1599/gyp@11503 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-09-12Merge from Chromium at DEPS revision 30.0.1599.39android-4.4_r0.8android-4.4_r0.7Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I2b887907447928b7249a5e19409d8672d4dd123e
2013-09-12Merge third_party/skia/gyp from ↵Torne (Richard Coles)
https://chromium.googlesource.com/a/external/skia/gyp.git at 21e2d90077b889f17dd1ca74b3cb6f76aa8b1a87 This commit was generated by merge_from_chromium.py. Change-Id: Ib74a51559d43fa36e2d96babb69fe4cb3653e71d
2013-09-11cherrypick rev 11081 into branch m30_1599 to fix http://crbug.com/286073djsollen@google.com
git-svn-id: http://skia.googlecode.com/svn/branches/chrome/m30_1599/gyp@11196 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-09-11cherrypick rev 11013 into branch m30_1599 to fix http://crbug.com/286073djsollen@google.com
git-svn-id: http://skia.googlecode.com/svn/branches/chrome/m30_1599/gyp@11195 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-09-05Merge from Chromium at DEPS revision 30.0.1599.31Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I23ea04969becf5c3a08f399d9c665e48962b490e
2013-09-05Merge third_party/skia/gyp from ↵Torne (Richard Coles)
https://chromium.googlesource.com/a/external/skia/gyp.git at f241a2a431570ba2dde614ae696a9ce441cce60f This commit was generated by merge_from_chromium.py. Change-Id: I0478897ac8cc595110e194aa3aef185823f4946f
2013-09-04cherrypick rev 10981 into branch m30_1599 to fix http://crbug.com/278141djsollen@google.com
git-svn-id: http://skia.googlecode.com/svn/branches/chrome/m30_1599/gyp@11077 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-28Merge from Chromium at DEPS revision 30.0.1599.23Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Icc43d5e2b37569e5a240d2c361b2232a61d3c878
2013-08-28Merge third_party/skia/gyp from ↵Torne (Richard Coles)
https://chromium.googlesource.com/a/external/skia/gyp.git at ffdb65f5c5352876c0e6d384b0bc70f6dea18078 This commit was generated by merge_from_chromium.py. Change-Id: Ie0b9c729f52efacb051dddbefa8554f1b1a5d030
2013-08-27Merge r10804 from trunk to branches/chrome/m30_1599bsalomon@google.com
git-svn-id: http://skia.googlecode.com/svn/branches/chrome/m30_1599/gyp@10962 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-27branch Skia at r10680 for Chrome M30 (branch 1599)bsalomon@google.com
git-svn-id: http://skia.googlecode.com/svn/branches/chrome/m30_1599/gyp@10930 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-13Merge from Chromium at DEPS revision r217092Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: Ib4aab7f4f2daee807de688b34ceef269415e8822
2013-08-12Merge third_party/skia/gyp from ↵Android Chromium Automerger
https://chromium.googlesource.com/external/skia/gyp.git at d147bb92759ec927a4cc53ab5817439991378fad This commit was generated by merge_from_chromium.py. Change-Id: Ib90606e79ee994f2598df3ae80776ca29b6bd3fe
2013-08-12fix malformed gypi file that was missing commasdjsollen@google.com
R=torne@chromium.org Review URL: https://codereview.chromium.org/22841003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10678 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-12Update Skia Android tools.djsollen@google.com
This CL moves the skia_launcher out of the system/bin and into /data/local/tmp; removes the need to package our shared libs in an apk; and updates all the scripts to work in the new environment. R=mtklein@google.com, scroggo@google.com Review URL: https://codereview.chromium.org/22617002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10673 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-12Merge from Chromium at DEPS revision r216972Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: I9cd3e4777e7a7ff09fc589b2b78230e926fda604
2013-08-12Merge third_party/skia/gyp from ↵Android Chromium Automerger
https://chromium.googlesource.com/external/skia/gyp.git at f3ccf597b84a756e9dddb2a0f51e7a5e0e1f0d7e This commit was generated by merge_from_chromium.py. Change-Id: Ife7036958bbf5e4471b4c605969cd92b7f4ad325
2013-08-12Add new GM to targeted at rect->clear optimization with different xfermodes.commit-bot@chromium.org
R=robertphillips@google.com Author: bsalomon@google.com Review URL: https://chromiumcodereview.appspot.com/22264010 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10645 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-12Adding 2 functions to the Skia APIcommit-bot@chromium.org
I need wrappers for both SkOrderedReadBuffer and SkOrderedWriteBuffer inside Chromium in order to do the IPC serialization of Skia SkImageFilter objects. See https://codereview.chromium.org/21271002/ BUG= R=djsollen@google.com, scroggo@google.com, reed@google.com Author: sugoi@chromium.org Review URL: https://chromiumcodereview.appspot.com/22591002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10642 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-12pdfviewer: add ability to run on gpuedisonn@google.com
Review URL: https://codereview.chromium.org/22684002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10638 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-12Create a gypi that contains all the SK_API header files for use by clients ↵djsollen@google.com
(i.e. chromium). R=robertphillips@google.com, torne@chromium.org Review URL: https://codereview.chromium.org/22474010 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10637 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-12Use Path Ops to generate PDF clipscommit-bot@chromium.org
R=vandebo@chromium.org, edisonn@google.com, caryclark@google.com Author: richardlin@chromium.org Review URL: https://chromiumcodereview.appspot.com/21161003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10633 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-12Upstreaming DropShadowImageFilter into skia, from Blinkjunov@chromium.org
GM imagefiltersbase will need rebaselining after this change R=senorblanco@chromium.org Committed: https://code.google.com/p/skia/source/detail?r=10583 Review URL: https://codereview.chromium.org/22258005 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10626 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-12Add downsample from 8888 to 4444.scroggo@google.com
Extend SkBitmap::copyTo to copy from a source with SkARGB_8888_Config to a destination bitmap with SkARGB_4444_Config. BUG=http://code.google.com/p/chromium/issues/detail?id=245774 R=reed@google.com Review URL: https://codereview.chromium.org/22350003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10621 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-12enable SK_FONTHOST_USES_FONTMGR for mac and win. linux fontmgr not readyreed@google.com
BUG= Review URL: https://codereview.chromium.org/22406004 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10605 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-11Reverted r10654 (Fix crash when querying a runtime config that is defined in ↵robertphillips@google.com
environment) due to compilation failure on Chromium win_layout bot git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10669 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-10Sanitizing source files in Housekeeper-Nightlyskia.committer@gmail.com
git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10668 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-09remove include from the header pathsdjsollen@google.com
R=robertphillips@google.com, torne@chromium.org Review URL: https://codereview.chromium.org/22450005 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10664 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-09Remove exported headers and add all public headers into dictionary for ↵djsollen@google.com
reference by clients. R=robertphillips@google.com Review URL: https://codereview.chromium.org/22613003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10661 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-09Fix crash when querying a runtime config that is defined in environmentcommit-bot@chromium.org
Fix crash when querying a runtime config in case when there's no skia.conf file and the config variable is still defined in the environment. Runs the added SkRTConf::UnitTest test as part of new "UnitTest" test. BUG=skia:1494 R=bsalomon@google.com, humper@google.com Author: kkinnunen@nvidia.com Review URL: https://chromiumcodereview.appspot.com/22650007 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10654 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-09Merge third_party/skia/gyp from ↵Android Chromium Automerger
https://chromium.googlesource.com/external/skia/gyp.git at 5afe400f473c747e2e5acb50b249fad1b8f2b0fc This commit was generated by merge_from_chromium.py. Change-Id: Ia18ffef2aceadb367de401336963c16cfdd1345b
2013-08-09Sanitizing source files in Housekeeper-Nightlyskia.committer@gmail.com
git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10650 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-08This attempts to replicate some bad cache behavior Mozilla reported.commit-bot@chromium.org
R=bsalomon@google.com Author: robertphillips@google.com Review URL: https://chromiumcodereview.appspot.com/22411005 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10649 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-08Add new GM to targeted at rect->clear optimization with different xfermodes.commit-bot@chromium.org
R=robertphillips@google.com Author: bsalomon@google.com Review URL: https://chromiumcodereview.appspot.com/22264010 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10645 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-08Adding 2 functions to the Skia APIcommit-bot@chromium.org
I need wrappers for both SkOrderedReadBuffer and SkOrderedWriteBuffer inside Chromium in order to do the IPC serialization of Skia SkImageFilter objects. See https://codereview.chromium.org/21271002/ BUG= R=djsollen@google.com, scroggo@google.com, reed@google.com Author: sugoi@chromium.org Review URL: https://chromiumcodereview.appspot.com/22591002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10642 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-08pdfviewer: add ability to run on gpuedisonn@google.com
Review URL: https://codereview.chromium.org/22684002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10638 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-08Create a gypi that contains all the SK_API header files for use by clients ↵djsollen@google.com
(i.e. chromium). R=robertphillips@google.com, torne@chromium.org Review URL: https://codereview.chromium.org/22474010 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10637 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-08Merge third_party/skia/gyp from ↵Android Chromium Automerger
https://chromium.googlesource.com/external/skia/gyp.git at 3366cfd554f29ba78df0de1c8f742f6d544d33fd This commit was generated by merge_from_chromium.py. Change-Id: Iddf6ec8ba3a0db1af29e04cc8f1d557c7e75bcca
2013-08-08Merge from Chromium at DEPS revision r216370Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: I8fda82d818167706a51d5fea874de69099e587fa
2013-08-08Use Path Ops to generate PDF clipscommit-bot@chromium.org
R=vandebo@chromium.org, edisonn@google.com, caryclark@google.com Author: richardlin@chromium.org Review URL: https://chromiumcodereview.appspot.com/21161003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10633 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-07Upstreaming DropShadowImageFilter into skia, from Blinkjunov@chromium.org
GM imagefiltersbase will need rebaselining after this change R=senorblanco@chromium.org Committed: https://code.google.com/p/skia/source/detail?r=10583 Review URL: https://codereview.chromium.org/22258005 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10626 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-07Add downsample from 8888 to 4444.scroggo@google.com
Extend SkBitmap::copyTo to copy from a source with SkARGB_8888_Config to a destination bitmap with SkARGB_4444_Config. BUG=http://code.google.com/p/chromium/issues/detail?id=245774 R=reed@google.com Review URL: https://codereview.chromium.org/22350003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10621 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-07enable SK_FONTHOST_USES_FONTMGR for mac and win. linux fontmgr not readyreed@google.com
BUG= Review URL: https://codereview.chromium.org/22406004 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10605 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-07Merge third_party/skia/gyp from ↵Android Chromium Automerger
https://chromium.googlesource.com/external/skia/gyp.git at dccf47acbdb65e21ed989fa3f45e638caffa6ce6 This commit was generated by merge_from_chromium.py. Change-Id: I4a68de303acea7a7fec14be692f2167b3067da70
2013-08-07Revert "Add blend optimization helpers and use to convert rect draws to clears."bsalomon@google.com
This reverts commit r10537. git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10601 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-07Merge from Chromium at DEPS revision r216133Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: I96bb9d31020fd7aa85ea0dbb6b95dd7c68b91dae
2013-08-07Move SkComposeImageFilter into its own {.h, .cpp} filescommit-bot@chromium.org
In http://crrev.com/21154002, SkComposeImageFilter will be used outside of tests. Consequently, this moves SkComposeImageFilter from SkTestImageFilters.{h, cpp} into its own {.h, .cpp} files. BUG=181613 R=senorblanco@chromium.org Author: ajuma@chromium.org Review URL: https://chromiumcodereview.appspot.com/22438003 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@10591 2bbb7eff-a529-9590-31e7-b0007b416f81