AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
9,513 Commits 1 Branch 0 Tags 544 MiB
4e5559af89
Commit Graph

9513 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
scroggo@google.com
5187c4313c More work to integrate skimage with rebaseline tools. 
tools/skimage_main.cpp:
Add the ability to write the results to checksum based filenames,
much like GM uses. This will allow using the skpdiff server to
rebaseline images.
Write the keys in the JSON file as <original image>_<pref config>.png,
so it matches gm_json.IMAGE_FILENAME_PATTERN. Also replace '_' with
'-' in the original file name, to avoid confusing the pattern matcher.
The '_' to '-' replacement also happens on the output filename.
Read the keys in a similar manner.
In make_outname, no longer remove a suffix. This fixes a bug where
subset decoding writes multiple subsets to the same file.

tools/rebaseline.py:
Since the filenames written to json files now match
gm_json.IMAGE_FILENAME_PATTERN, enable the option to match based
on configs/tests when rebaselining skimage.

test json files:
Update to match the new format of output.

gm/gm_expectations:
Add a constructor that takes a BitmapAndDigest as input.

tools/tests/skimage_self_test.py:
Test that reading the expectations file just created by skimage with
the same file actually compares to the original file (rather than just
succeeding because expectations were missing).

Change the expectations files to match the new format.

Will require a buildbot change to use the new flag: https://codereview.chromium.org/27389002/

BUG=1466
R=epoger@google.com

Review URL: https://codereview.chromium.org/26297004

git-svn-id: http://skia.googlecode.com/svn/trunk@11902 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-22 00:42:46 +00:00
senorblanco@chromium.org
380355eff3 Xoom rebaselines. 
Note: Some of these had no base versions in GS corresponding to the hashes in the JSON, causing the svndiff script to barf. I hacked it up to let me finish, but it should probably handle the case of a missing hash more gracefully.

TBR=epoger

Review URL: https://codereview.chromium.org/33303007

git-svn-id: http://skia.googlecode.com/svn/trunk@11900 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-21 22:00:47 +00:00
robertphillips@google.com
dbbe1d437d Revert r11880 (Apply matrix early in draw bitmap - https://codereview.chromium.org/30593003) due to layout test failure 
git-svn-id: http://skia.googlecode.com/svn/trunk@11899 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-21 21:30:49 +00:00
mtklein@google.com
4c2af74078 GrTHashCache -> GrTHashTable 
The class is Table, but the file's Cache.  That's confusing.

BUG=
R=bsalomon@google.com

Review URL: https://codereview.chromium.org/32523004

git-svn-id: http://skia.googlecode.com/svn/trunk@11898 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-21 21:04:06 +00:00
scroggo@google.com
5ee18dd201 Image decoder fixes (mostly) around A8. 
Opaquness:
When decoding Gray to A8 in libpng, set reallyHasAlpha to true
and add a comment why we do not check for the real answer.

Add comments in jpeg decoder explaining why A8 is not opaque.

Fix a bug where an A8 subset is considered to be opaque.

Other fixes:
In SkJPEGImageDecoder, only allocate as much memory as
needed for each source row, based on the input config.
Also pull out common code into a static function.

When performing the check for requiring unpremultiplied colors,
allow A8 to succeed, since that setting should have no effect on
A8.

Add the check for requiring unpremultiplied colors to subset
decoding.

Fix a bug where attempting to sample gray to A8 does not sample.

R=reed@google.com

Review URL: https://codereview.chromium.org/26210007

git-svn-id: http://skia.googlecode.com/svn/trunk@11897 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-21 20:47:31 +00:00
reed@google.com
114038a2e2 Revert "Revert "cache SkImage::Info calculation in lazypixelref"" 
This reverts commit 81eba32ab10f9210c742938819cf1218be5611c9.

ImageDecoder is changed to allow info to be NULL, since it is an output-only parameter.

R=scroggo@google.com

Review URL: https://codereview.chromium.org/33573002

git-svn-id: http://skia.googlecode.com/svn/trunk@11896 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-21 20:13:42 +00:00
reed@google.com
e986b221ee Revert "cache SkImage::Info calculation in lazypixelref" 
This reverts commit a2537480710aa10b9ab9f8aec98538b79539f47e.

git-svn-id: http://skia.googlecode.com/svn/trunk@11894 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-21 19:45:38 +00:00
reed@google.com
2590a91b64 cache SkImage::Info calculation in lazypixelref 
BUG=
R=scroggo@google.com

Review URL: https://codereview.chromium.org/28493003

git-svn-id: http://skia.googlecode.com/svn/trunk@11893 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-21 18:58:17 +00:00
bungeman@google.com
0d00976bd3 Roll gyp from r1684 to r1765. 
R=epoger@google.com

Review URL: https://codereview.chromium.org/32963002

git-svn-id: http://skia.googlecode.com/svn/trunk@11892 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-21 18:49:43 +00:00
senorblanco@chromium.org
8204743fdb ChromeOS and IntelRhb rebaselines. 
TBR=robertphillips

Review URL: https://codereview.chromium.org/32533004

git-svn-id: http://skia.googlecode.com/svn/trunk@11891 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-21 18:46:49 +00:00
commit-bot@chromium.org
192cbf67b2 DM: add --serialize 
Plus:
  - minor ReplayTask refactoring to share code with SerializeTask
  - move --replay to ReplayTask and --serialize to SerializeTask like WriteTask
  - when --writePath is given, write failures for Replay and Serialize tasks
  - function names have fewer blatant Skia style violations

BUG=
R=bsalomon@google.com

Author: mtklein@google.com

Review URL: https://codereview.chromium.org/32613003

git-svn-id: http://skia.googlecode.com/svn/trunk@11890 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-21 18:40:25 +00:00
senorblanco@chromium.org
ad6d35bbf9 Third round of matrixconvolution rebaselines, and removal from ignored-tests.txt. 
"We have normality. I repeat, we have normality. Anything you still can't cope with is therefore your own problem."

TBR=robertphillips
BUG=

Review URL: https://codereview.chromium.org/33323002

git-svn-id: http://skia.googlecode.com/svn/trunk@11889 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-21 18:23:30 +00:00
robertphillips@google.com
950b1b079a Fix out of order destruction error 
https://codereview.chromium.org/33203002/



git-svn-id: http://skia.googlecode.com/svn/trunk@11888 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-21 17:37:28 +00:00
epoger@google.com
00434ec9e8 GM: remove deprecated --ignoreTests flag 
BUG=skia:1730
R=borenet@google.com

Review URL: https://codereview.chromium.org/27983004

git-svn-id: http://skia.googlecode.com/svn/trunk@11887 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-21 17:25:26 +00:00
commit-bot@chromium.org
8c294900f3 Add DPI stettings to SkDocument::CreatePDF(). Tests will be added in a future cl, once DPI will be used in SkPDFDevice 
R=reed@google.com, bungeman@google.com, vandebo@chromium.org

Author: edisonn@google.com

Review URL: https://codereview.chromium.org/32233003

git-svn-id: http://skia.googlecode.com/svn/trunk@11886 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-21 17:14:37 +00:00
senorblanco@chromium.org
9f51d16b54 Second round of matrixconvolution rebaselines. 
TBR=robertphillips
BUG=

Review URL: https://codereview.chromium.org/33103002

git-svn-id: http://skia.googlecode.com/svn/trunk@11885 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-21 17:04:11 +00:00
commit-bot@chromium.org
4b7d673089 More clang warning fixes. 
Mostly unused functions and variables removed.

BUG=None
TEST=ninja -C out/Debug most
     ninja -C out/Release most

R=bsalomon@google.com, caryclark@google.com, robertphillips@google.com

Author: tfarina@chromium.org

Review URL: https://codereview.chromium.org/27933002

git-svn-id: http://skia.googlecode.com/svn/trunk@11884 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-21 16:41:00 +00:00
commit-bot@chromium.org
f642f8cf90 Magnifier gpu path fix 
The y axis was inverted for the offset, which should have been computed on the other side of the magnifying rectangle.

BUG=
R=bsalomon@google.com, senorblanco@google.com, senorblanco@chromium.org

Author: sugoi@chromium.org

Review URL: https://codereview.chromium.org/28273005

git-svn-id: http://skia.googlecode.com/svn/trunk@11883 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-21 15:59:26 +00:00
senorblanco@chromium.org
718f5e2b7c First round of matrixconvolution rebaselines. 
TBR=robertphillips

Review URL: https://codereview.chromium.org/32823002

git-svn-id: http://skia.googlecode.com/svn/trunk@11882 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-21 15:41:55 +00:00
commit-bot@chromium.org
8e919add40 Fix GrProgramsTest to not generate tests with too many TexCoord references 
Make GrProgramsTest check how many texture coordinate sets are
available and select random effects up until the amount runs out.

Otherwise, following effect sequence would fail the shader compilation
when Skia is compiled with nv_path_rendering on (eg. when fixed
function codepath is used):
 * Stage 0: TextureDomain (1 texcoord)
 * Stage 1: Convolution (1 texcoord)
 * Stage 2: Bitmap Alpha Threshold (2 texcoords)
 * Stage 3: DisplacementMap (2 texcoords)
 * Stage 4: Config Conversion (1 texcoords)
 * Stage 5: Two-Point Conical Gradient (2 texcoords)

This would use more texture coordinate sets than 8, which is fairly
common amount currently.

R=bsalomon@google.com, cdalton@nvidia.com

Author: kkinnunen@nvidia.com

Review URL: https://codereview.chromium.org/32403002

git-svn-id: http://skia.googlecode.com/svn/trunk@11881 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-21 14:48:23 +00:00
commit-bot@chromium.org
15455b2a13 Apply matrix early in draw bitmap 
R=robertphillips@google.com

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/30593003

git-svn-id: http://skia.googlecode.com/svn/trunk@11880 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-21 14:48:17 +00:00
reed@google.com
e7e29b7815 scope ComputeIsOpaque with SkBitmap 
BUG=

Review URL: https://codereview.chromium.org/32653002

git-svn-id: http://skia.googlecode.com/svn/trunk@11879 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-21 14:31:20 +00:00
reed@google.com
9cd697c696 change ERROR label to BAD_CONFIG -- avoid windows complaint 
BUG=

Review URL: https://codereview.chromium.org/32623002

git-svn-id: http://skia.googlecode.com/svn/trunk@11878 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-21 14:12:13 +00:00
reed@google.com
383a697692 store SkAlphaType inside SkBitmap, on road to support unpremul 
BUG=
R=bsalomon@google.com, scroggo@google.com

Review URL: https://codereview.chromium.org/25275004

git-svn-id: http://skia.googlecode.com/svn/trunk@11877 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-21 14:00:07 +00:00
robertphillips@google.com
c2eae47954 Reverting revert of r11862 (Constify SkFlattenable::getFactory()) or reverting r11871. 
git-svn-id: http://skia.googlecode.com/svn/trunk@11876 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-21 12:26:10 +00:00
robertphillips@google.com
466ea91886 A few stragglers for r1187 (Fix cubic->quad RR corner regression) 
https://codereview.chromium.org/31333002/



git-svn-id: http://skia.googlecode.com/svn/trunk@11875 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-21 00:15:15 +00:00
robertphillips@google.com
7c4d5124d1 More rebaselines for r1187 (Fix cubic->quad RR corner regression) 
https://codereview.chromium.org/31323002/



git-svn-id: http://skia.googlecode.com/svn/trunk@11874 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-20 23:53:11 +00:00
robertphillips@google.com
d8b0a148c5 rebaselines after r1187 (Fix cubic->quad RR corner regression) 
https://codereview.chromium.org/31313002/



git-svn-id: http://skia.googlecode.com/svn/trunk@11873 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-20 23:06:40 +00:00
senorblanco@chromium.org
2a4223c783 Fix for cropped matrix convolution for BottomLeft render targets. 
R=bsalomon@google.com

Review URL: https://codereview.chromium.org/31083002

git-svn-id: http://skia.googlecode.com/svn/trunk@11872 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-20 20:21:19 +00:00
robertphillips@google.com
b5e391025e Reverted due to Chromium compilation failures. Please see: 
https://codereview.chromium.org/30973002/



git-svn-id: http://skia.googlecode.com/svn/trunk@11871 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-20 13:34:21 +00:00
robertphillips@google.com
123671901a Fix cubic->quad RR corner regression 
https://codereview.chromium.org/29673002/



git-svn-id: http://skia.googlecode.com/svn/trunk@11870 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-20 13:11:16 +00:00
skia.committer@gmail.com
b3c2da312f Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@11869 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-19 07:02:35 +00:00
vandebo@chromium.org
1c87672883 Revert "[PDF] Add unpremultiply support and a GM (try3)." 
This is crashing in some configurations, can now repro.

This reverts commit 12add177d0ab7bbac97f5093c9382924d88bde8c.

Review URL: https://codereview.chromium.org/29903002

git-svn-id: http://skia.googlecode.com/svn/trunk@11868 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-18 21:04:51 +00:00
mtklein@google.com
a7a9f37a31 DM: add --writePath 
For fun, make the output prettier, hiding ", N failures" unless there is one.

BUG=
R=bsalomon@google.com

Review URL: https://codereview.chromium.org/29293003

git-svn-id: http://skia.googlecode.com/svn/trunk@11867 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-18 20:52:44 +00:00
vandebo@chromium.org
59fd223870 [PDF] Add unpremultiply support and a GM (try3). 
This is a resubmit of https://codereview.chromium.org/22831039 which was
reverted because it causes issues on Windows.

BUG=chromium:175548
R=edisonn@google.com

Review URL: https://codereview.chromium.org/29193003

git-svn-id: http://skia.googlecode.com/svn/trunk@11866 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-18 20:18:29 +00:00
vandebo@chromium.org
dc37e20647 Revert "PDF: support perspective in simple shaders. (this version does not work well with tilling)" 
Accidentally committed the wrong git branch.

This reverts commit 76839c65670df8a863041a82a4b61502e78af043.

Review URL: https://codereview.chromium.org/29743002

git-svn-id: http://skia.googlecode.com/svn/trunk@11865 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-18 20:16:34 +00:00
vandebo@chromium.org
eb5992c6cc PDF: support perspective in simple shaders. (this version does not work well with tilling) 
Review URL: https://codereview.chromium.org/26389006

git-svn-id: http://skia.googlecode.com/svn/trunk@11864 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-18 20:14:08 +00:00
senorblanco@chromium.org
7938bae14a Implement crop rect support for SkMatrixConvolutionImageFilter. 
R=bsalomon@google.com

Review URL: https://codereview.chromium.org/27471002

git-svn-id: http://skia.googlecode.com/svn/trunk@11863 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-18 20:08:14 +00:00
commit-bot@chromium.org
575604d4c2 Constify SkFlattenable::getFactory(). 
This allows us to also constify the argument of
SkFlattenableWriteBuffer::writeFlattenable() - which I've recently found
myself const-casting for no apparent good reason.

R=bungeman@google.com, mtklein@google.com, reed@google.com

Author: fmalita@chromium.org

Review URL: https://codereview.chromium.org/29143005

git-svn-id: http://skia.googlecode.com/svn/trunk@11862 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-18 19:37:55 +00:00
epoger@google.com
cce4e09a5c Revert r11860, which was supposed to just be a whitespace change (argh) 
(SkipBuildbotRuns)

Review URL: https://codereview.chromium.org/29603002

git-svn-id: http://skia.googlecode.com/svn/trunk@11861 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-18 18:36:25 +00:00
epoger@google.com
94041c6d8b Whitespace change to trigger buildbots after https://code.google.com/p/skia/source/detail?r=11859 
git-svn-id: http://skia.googlecode.com/svn/trunk@11860 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-18 18:33:03 +00:00
vandebo@chromium.org
ce60c1fc5d Revert "[PDF] Add unpremultiply support and a GM." 
This reverts commit f746273b8ba282f548a6eaffb45b11b6f468aa8e.

Review URL: https://codereview.chromium.org/29343002

git-svn-id: http://skia.googlecode.com/svn/trunk@11858 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-18 16:10:03 +00:00
vandebo@chromium.org
c4d17716cd [PDF] Add unpremultiply support and a GM. 
This is a resubmit of https://codereview.chromium.org/22831039 which was
reverted because it causes issues on Windows.

BUG=chromium:175548
R=edisonn@google.com

Review URL: https://codereview.chromium.org/27518003

git-svn-id: http://skia.googlecode.com/svn/trunk@11857 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-18 15:53:03 +00:00
bsalomon@google.com
de7de5638f rebaseline gpu complex clip tests 
Review URL: https://codereview.chromium.org/29303002

git-svn-id: http://skia.googlecode.com/svn/trunk@11856 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-18 15:47:28 +00:00
epoger@google.com
f711f320a3 GM: add --ignoreFailuresFile as an alternative to --ignoreTests 
(moved from old review at https://codereview.chromium.org/27752002/ )

This will allow the user to specify the tests to ignore failure on as a file,
rather than listing them out in the command line (and thus busting the
line length limit on Android).
BUG=skia:1730
R=scroggo@google.com

Review URL: https://codereview.chromium.org/29203002

git-svn-id: http://skia.googlecode.com/svn/trunk@11855 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-18 14:55:47 +00:00
commit-bot@chromium.org
6ee68583f8 SkThreadPool: allow for Runnables that add other Runnables to the pool. 
There's a scenario that we're currently not allowing for, but I'd really like to use in DM:

1) client calls add(SomeRunnable*) several times
2) client calls wait()
3) any of the runnables added by the client _themselves_ call add(SomeOtherRunnable*)
4-inf) maybe those SomeOtherRunnables too call add(SomeCrazyThirdRunnable*), etc.

Right now in this scenario we'll assert in debug mode in step 3) when we call
add() and we're waiting to stop, and do strange unspecified things in release
mode.

The old threadpool had basically two states: running, and waiting to stop.  If
a thread saw we were waiting to stop and the queue was empty, that thread shut
down.  This wasn't accounting for any work that other threads might be doing;
potentially they were about to add to the queue.

So now we have three states: running, waiting, and halting.  When the client
calls wait() (or the destructor triggers), we move into waiting.  When a thread
notices we're _really_ done, that is, have an empty queue and there are no
active threads, we move into halting.  The halting state actually triggers the
threads to stop, which wait() is patiently join()ing on.

BUG=
R=bungeman@google.com, bsalomon@google.com

Author: mtklein@google.com

Review URL: https://codereview.chromium.org/26389005

git-svn-id: http://skia.googlecode.com/svn/trunk@11852 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-18 14:19:19 +00:00
skia.committer@gmail.com
f84ad8f7fc Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@11850 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-18 07:01:59 +00:00
senorblanco@chromium.org
1aa68723b8 Make SkImageFilter::asNewEffect() (and all derived-class overrides) protected. 
R=bsalomon@google.com, bsalomon

Review URL: https://codereview.chromium.org/26937006

git-svn-id: http://skia.googlecode.com/svn/trunk@11847 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-17 19:35:09 +00:00
robertphillips@google.com
32bbcf828d Add texture filtering override to debugger 
https://codereview.chromium.org/27716003/



git-svn-id: http://skia.googlecode.com/svn/trunk@11846 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-17 17:56:10 +00:00
robertphillips@google.com
c2cc1dbe81 Revert r11842 (call drawRect to try GrAARectRenderer if the path is a rect - https://codereview.chromium.org/23484007) due to changes to the following GM images: 
inverse_paths
pathopsinverse




git-svn-id: http://skia.googlecode.com/svn/trunk@11845 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-10-17 17:34:20 +00:00