summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-03-10Update skia public header list.android-4.4w_r1android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1kitkat-wearkitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-devTorne (Richard Coles)
Upstream copy of this file was out of date, update with the latest list of files from skia/include to resolve issues building with system skia. Bug: 13246311 Change-Id: I20bd482d19f1b4bb7b5c9818ba4868391aea9daf
2014-01-07Merge from Chromium at DEPS revision 33.0.1750.16Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: If46999dad9fd1f617d69aa2978010256d1b89135
2014-01-07Merge third_party/skia/gyp from ↵Torne (Richard Coles)
https://chromium.googlesource.com/a/external/skia/gyp.git at b3a60691746333dfa06bfd6324c1c406768cb2b0 This commit was generated by merge_from_chromium.py. Change-Id: I57a5657fef55e351fb5ecedb8c738dc35b479170
2014-01-06Branch at r12682 for Chrome M33vandebo@chromium.org
git-svn-id: http://skia.googlecode.com/svn/branches/chrome/m33_1750/gyp@12932 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-02Merge from Chromium at DEPS revision 241094Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I23adcdd642190f7b78ab024a392a1a8bec6c6f5c
2013-12-18branch Skia at r12678 for Chrome M33 (branch 1750)bungeman@google.com
git-svn-id: http://skia.googlecode.com/svn/branches/chrome/m33_1750/gyp@12753 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-18Merge from Chromium at DEPS revision 240154Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Ia8871320e760a5cb135e0077e15d9f3387ca80e0
2013-12-16Merge third_party/skia/gyp from ↵Android Chromium Automerger
https://chromium.googlesource.com/external/skia/gyp.git at 9bf4639b49741355d2a6eedd2b7be7e3bdd1fd32 This commit was generated by merge_from_chromium.py. Change-Id: I4f699ebbc5d8bda2fd95d090d1b74220b7c70b86
2013-12-13remove SkScalarCompare type and headerreed@google.com
BUG= R=fmalita@chromium.org Review URL: https://codereview.chromium.org/113193004 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@12681 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-13render_pictures: add --writeJsonSummaryPathcommit-bot@chromium.org
Known issues: - JSON summary will be empty if --writePath not specified also - testNames within summary do not include the config (8888, gpu, etc.) BUG= R=rmistry@google.com Author: epoger@google.com Review URL: https://codereview.chromium.org/98643007 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@12680 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-13Allow 0-width SkBitmap in setConfig.halcanary@google.com
Previously, SkBitmap::setConfig would allow zero height, but not zero width. This is changed for consistancy. A unit test was added. BUG= R=reed@google.com, scroggo@google.com Review URL: https://codereview.chromium.org/111953004 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@12673 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-12Implement an SkPicture image filter source. This is required for the ↵senorblanco@chromium.org
external-SVG reference feature of feImage. It simply plays back an SkPicture to a given destination rect. R=reed@google.com Review URL: https://codereview.chromium.org/114263002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@12661 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-12Revert "Implement an SkPicture image filter source. This is required for the ↵senorblanco@chromium.org
external-SVG reference feature of feImage. It simply plays back an SkPicture to a given destination rect." This reverts commit a620349a24471546ad2e8f0679774c1f5b4de0a4 (r12656). git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@12657 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-12Implement an SkPicture image filter source. This is required for the ↵senorblanco@chromium.org
external-SVG reference feature of feImage. It simply plays back an SkPicture to a given destination rect. R=reed@google.com Review URL: https://codereview.chromium.org/114263002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@12656 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-11Merge third_party/skia/gyp from ↵Android Chromium Automerger
https://chromium.googlesource.com/external/skia/gyp.git at 4d5fb26af2c0433ae37505607d19712a1363fb7c This commit was generated by merge_from_chromium.py. Change-Id: I929ff5f206c19a2ea1548d012704c8dac3b1265e
2013-12-11Merge third_party/skia/gyp from ↵Android Chromium Automerger
https://chromium.googlesource.com/external/skia/gyp.git at b95138495e05dd49e1622e4dc9edc2d4c9781134 This commit was generated by merge_from_chromium.py. Change-Id: I3d8f570d0040b351a4295d059923ebac07d61a07
2013-12-10Implement SkAshmemDiscardableMemoryhalcanary@google.com
- Implement ashmem-backed SkDiscardableMemory subclass: This class in only accesible via the SkDiscardableMemory::Create() function, which replaces the mock implementation in SkDiscardableMemory_none.cpp - Added SkDiscardableMemory_ashmem.cpp to the Android port of Skia Removed SkDiscardableMemory_none.cpp from the Android port. - Added DiscardableMemoryTest. Still needs work. - SkDiscardablePixelRef Bugfix: onLockPixels() now calls SkDELETE on the SkDiscardableMemory pointer when it fails to unlock. - Improved documentation inside ashmem.h BUG= R=scroggo@google.com Review URL: https://codereview.chromium.org/83563002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@12608 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-10Revert "[PDF] Fix font embedding restrictions."vandebo@chromium.org
This reverts r12600 and r12601, likely causing crash on Mac. Review URL: https://codereview.chromium.org/111893002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@12604 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-10[PDF] Fix font embedding restrictions.commit-bot@chromium.org
Stop using restricted font outlines and honor don't subset restriction. R=reed@google.com, bungeman@google.com Author: vandebo@chromium.org Review URL: https://codereview.chromium.org/107863002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@12600 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-10New Composite CSS border objectrobertphillips@google.com
https://codereview.chromium.org/86263003/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@12597 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-10Add support for reading a directory of images with --expectations (-r).commit-bot@chromium.org
DM writes out its images in a hierarchy that's a little different than GM, so this can't read GM's output. But it can read its own, written with -w. Example usage: $ out/Release/dm -w /tmp/baseline $ out/Release/dm -r /tmp/baseline -w /tmp/new (and optionally) $ mkdir /tmp/diff; out/Release/skdiff /tmp/baseline /tmp/new /tmp/diff GM's IndividualImageExpectationsSource and Expectations are a little too eager about decoding and hashing the expected images, so I took the opportunity to add DM::Expectations that mostly replaces skiagm::ExpectationsSource and skiagm::Expectations in DM. It mainly exists to move the image decoding and comparison off the main thread, which would otherwise be a major speed bottleneck. I tried to use skiagm code where possible. One notable place where I differed is in this new feature. When -r is a directory of images, DM does no hashing. It considerably faster to read the expected file into an SkBitmap and do a byte-for-byte comparison than to hash the two bitmaps and check those. The example usage above isn't quite working 100% yet. Expectations on some GMs fail, even with no binary change. I haven't pinned down whether this is due to - a bug in DM - flaky GMs - unthreadsafe GMs - flaky image decoding - unthreadsafe image decoding - something else but I intend to. Leon, Derek and I have suspected PNG decoding isn't threadsafe, but are as yet unable to prove it. I also seem to be able to cause malloc to fail on my laptop if I run too many configs at once, though I never seem to be using more than ~1G of RAM. Will track that down too. BUG= R=reed@google.com, bsalomon@google.com Author: mtklein@google.com Review URL: https://codereview.chromium.org/108963002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@12596 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-10Add support for MIPS to android buildcommit-bot@chromium.org
R=borenet@google.com, scroggo@google.com Author: djsollen@google.com Review URL: https://codereview.chromium.org/109323004 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@12592 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-10am 492eca10: (-s ours) Merge remote-tracking branch \'origin/kitkat-dev\'Baligh Uddin
* commit '492eca10cdbfb13f963abf4b0f16c6536abf17b5': Initial empty repository
2013-12-09make info real in SkPixelRef, and add bitmap::asImageInforeed@google.com
BUG= R=scroggo@google.com Review URL: https://codereview.chromium.org/108663004 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@12586 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-09fix file names in gpu.gypibsalomon@google.com
Review URL: https://codereview.chromium.org/99193004 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@12572 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-09Implement srcRect and dstRect functionality in SkBitmapSource. This is ↵senorblanco@chromium.org
required for the "preserveAspectRatio" options of SVG's feImage. Covered by new GM "bitmapsource". This also includes some changes to the xfermodeimagefilter and tileimagefilter GMs to properly handle the CTM. This worked before only because SkBitmapSource was ignoring the CTM. Now that it respects it, we need to give the correct transform. This also means the GMs now work while zoomed. It also implements CTM support for SkTileImageFilter. NOTE: this will require rebaselining a number of imagefilter GMs on Nexus4, since they render in perspective (using the CTM). The changes to the results should all be improvements. R=reed@google.com, robertphillips@google.com Review URL: https://codereview.chromium.org/106933002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@12571 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-09Make texture domain a helper so that it can be incorporated into other effects.commit-bot@chromium.org
R=robertphillips@google.com, jvanverth@google.com Author: bsalomon@google.com Review URL: https://codereview.chromium.org/98893006 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@12569 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-06Add GM to test bitmap shaders with basic geometry and bitmap masks.commit-bot@chromium.org
R=reed@google.com, bsalomon@google.com, rmistry@google.com Author: djsollen@google.com Review URL: https://codereview.chromium.org/98433004 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@12543 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-06Fix #define for distance field fontscommit-bot@chromium.org
R=robertphillips@google.com Author: jvanverth@google.com Review URL: https://codereview.chromium.org/108413002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@12536 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-06Reverting 12528 & 12533 (Implement srcRect and dstRect functionality in ↵robertphillips@google.com
SkBitmapSource) due to image differences on N4 https://codereview.chromium.org/108623002/ git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@12534 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-06Implement srcRect and dstRect functionality in SkBitmapSource. This is ↵commit-bot@chromium.org
required for the "preserveAspectRatio" options of SVG's feImage. Covered by new GM "bitmapsource". This also includes some changes to the xfermodeimagefilter and tileimagefilter GMs to properly handle the CTM. This worked before only because SkBitmapSource was ignoring the CTM. Now that it respects it, we need to give the correct transform. This also means the GMs now work while zoomed. R=reed@google.com Author: senorblanco@chromium.org Review URL: https://codereview.chromium.org/106933002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@12528 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-06Merge third_party/skia/gyp from ↵Android Chromium Automerger
https://chromium.googlesource.com/external/skia/gyp.git at a10662e47e520014f5aad5ce162edb8c9a81c2db This commit was generated by merge_from_chromium.py. Change-Id: Id2aa04cc30e26409b5239bcd257faa3321784d94
2013-12-05Revert "Implement srcRect and dstRect functionality in SkBitmapSource. This ↵senorblanco@chromium.org
is required for the "preserveAspectRatio" options of SVG's feImage. Covered by new GM "bitmapsource"." until I can sort out the xfermodeimagefilter and tileimagefilter failures. This reverts commit b26725c8c9755415284c34399e76be098868e01a, aka r12522. BUG= TBR=reed@google.com Review URL: https://codereview.chromium.org/107093005 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@12523 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-05Implement srcRect and dstRect functionality in SkBitmapSource. This is ↵senorblanco@chromium.org
required for the "preserveAspectRatio" options of SVG's feImage. Covered by new GM "bitmapsource". Note: I initially implemented this as a fully-generic SkResizeImageFilter, but then I realized that the dstRect should always be transformed by the filter matrix, but that the srcRect should not (since it's specified relative to the dimensions of the original bitmap). Since this would be confusing for someone attempting to use this as a generic resizing filter, I decided to build the functionality into SkBitmapSource instead. BUG= R=reed@google.com Review URL: https://codereview.chromium.org/106933002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@12522 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-05am d194b712: (-s ours) Merge from Chromium at DEPS revision 30.0.1599.85Torne (Richard Coles)
* commit 'd194b7120ce19bf8fd18b65be7851865b7d88e9c': Hack to make it compile, given that we're missing SkBitmapDevice.h
2013-12-05am c6503675: (-s ours) Merge from Chromium at DEPS revision 30.0.1599.39Torne (Richard Coles)
* commit 'c650367537c511ee507c7edeaee418bfa94e6ac7': cherrypick rev 11081 into branch m30_1599 to fix http://crbug.com/286073 cherrypick rev 11013 into branch m30_1599 to fix http://crbug.com/286073
2013-12-05am b4846245: (-s ours) Merge from Chromium at DEPS revision 30.0.1599.31Torne (Richard Coles)
* commit 'b4846245819b10ba5c8a85b739724c7db90c7802': cherrypick rev 10981 into branch m30_1599 to fix http://crbug.com/278141
2013-12-05am c06b1f5e: (-s ours) Merge from Chromium at DEPS revision 30.0.1599.23Torne (Richard Coles)
* commit 'c06b1f5ec2cc49a9911a1bde0397b037b5b41524': Merge r10804 from trunk to branches/chrome/m30_1599 branch Skia at r10680 for Chrome M30 (branch 1599)
2013-12-05am c9840ed6: (-s ours) Merge from Chromium at DEPS revision r217092Ben Murdoch
* commit 'c9840ed6efc5e7f9cd6fddb5f8d72cf5f8ec5b6b':
2013-12-05am c6ed1fd3: (-s ours) Merge from Chromium at DEPS revision r216972Ben Murdoch
* commit 'c6ed1fd3217bd6af9291ca794e9af84982c07392':
2013-12-05am 9b7ecfb0: (-s ours) Add new GM to targeted at rect->clear optimization ↵commit-bot@chromium.org
with different xfermodes. * commit '9b7ecfb0a6e6cf5ef2ab56da8f2dc6b30a796f7b': Add new GM to targeted at rect->clear optimization with different xfermodes.
2013-12-05am c8cdcb41: (-s ours) Adding 2 functions to the Skia APIcommit-bot@chromium.org
* commit 'c8cdcb410e6396ec82000b4813815e8020d1308b': Adding 2 functions to the Skia API
2013-12-05am d863dd70: (-s ours) pdfviewer: add ability to run on gpuedisonn@google.com
* commit 'd863dd707c8b1dab6ae155121ccdd4382279fda3': pdfviewer: add ability to run on gpu
2013-12-05am 8fed265d: (-s ours) Create a gypi that contains all the SK_API header ↵djsollen@google.com
files for use by clients (i.e. chromium). * commit '8fed265d16c03b370f4b12fd5f8a0947ddbbce32': Create a gypi that contains all the SK_API header files for use by clients (i.e. chromium).
2013-12-05am fcaa7d45: (-s ours) Use Path Ops to generate PDF clipscommit-bot@chromium.org
* commit 'fcaa7d454c7330fcfd19b100af9540670acb30c8': Use Path Ops to generate PDF clips
2013-12-05am a981291c: (-s ours) Upstreaming DropShadowImageFilter into skia, from Blinkjunov@chromium.org
* commit 'a981291c64263fccd2a0de89e30a75c8126f3440': Upstreaming DropShadowImageFilter into skia, from Blink
2013-12-05am aa1d940a: (-s ours) Add downsample from 8888 to 4444.scroggo@google.com
* commit 'aa1d940aa67339aaabaee9128cd425181cfa6b66': Add downsample from 8888 to 4444.
2013-12-05am 19638031: (-s ours) enable SK_FONTHOST_USES_FONTMGR for mac and win. ↵reed@google.com
linux fontmgr not ready * commit '19638031648f55de30cb73d56a9a2020a60f7587': enable SK_FONTHOST_USES_FONTMGR for mac and win. linux fontmgr not ready
2013-12-05Big Cleanup: SkBitmapFactory, SkLazyPixelRef, SkImageCachehalcanary@google.com
Removed SkBitmapFactory since no clients were using it. New cache selection mechanism can simply pass a SkDiscardableMemory::Factory into the SkDiscardablePixelRef if non-default SkDiscardableMemory should be used. Removed BitmapFactoryTest. SkDiscardableMemory::Factory interface. Android will need this functionality in the future inside their BitmapFactory. Removed SkLazyPixelRef, since it's functionality is now subsumed into SkDiscardablePixelRef. Removed LazyPixelRef test. Modified SkDiscardablePixelRef to optionally allow it to use a SkDiscardableMemory::Factory. This tiny change makes it a replacement for SkLazyPixelRef. This functioanlity is also necessary for moving Android over to SkDiscardablePixelRef from SkImageRef in a later CL. Added a test for this. SkDecodingImageGenerator::Install can optionally pass a factory in to SkDiscardablePixelRef. Removed SkImageCache, SkLruImageCache, and SkPurgeableImageCache. This functionality can be handled much more cleanly by SkDiscardableMemory. New SkDiscardableMemoryPool class to replace SkLruImageCache. In a later CL, we will replace SkImageRef_GlobalPool (used by android) as well. This is a concrete implementation of SkDiscardableMemory::Factory. Added a test for this. modified gm/factory.cpp to remove dependnce on SkBitmapFactory + SkLruImageCache. Now uses SkDecodingImageGenerator + SkDiscardablePixelRef + SkDiscardableMemoryPool. SkImageDecoder::Target replaces SkBitmapFactory::Target. The DecodeMemoryToTarget function may disappear in the future. Moved SkLazyCachingPixelRef::DecodeProc replaces SkBitmapFactory::DecodeProc. This is a short term change, since another CL changes SkLazyCachingPixelRef to use SkImageGenerator instead of DecodeProc. Modified DrawBitmapRectTest to use SkDiscardablePixelRef instead of SkLazyPixelRef. tools/LazyDecodeBitmap.cpp now uses SkDecodingImageGenerator + SkDiscardablePixelRef instead of a SkBitmapFactory. bench_pictures uses the Global SkDiscardableMemoryPool instead of a global gLruImageCache. R=reed@google.com, scroggo@google.com Review URL: https://codereview.chromium.org/103033002 git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@12515 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-05Merge third_party/skia/gyp from ↵Android Chromium Automerger
https://chromium.googlesource.com/external/skia/gyp.git at 671aa50bfb41f6b8300b31b885c39235e445223f This commit was generated by merge_from_chromium.py. Change-Id: I1017f2dc95b685044d7c04fc968053068da2b0e4
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 15:13:00 +0000