Commit Graph

58 Commits

Author SHA1 Message Date
keyar@chromium.org
d1dc920097 Allow specific files and multiple inputs for picture testing tools.
Changed the render_pictures, bench_pictures and test_pictures.py so that multiple inputs can be given. Furthermore, specific files can also be specified.

Unit tests have also been added for picture_utils.cpp.

Review URL: https://codereview.appspot.com/6345054

git-svn-id: http://skia.googlecode.com/svn/trunk@4486 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-07-09 18:32:08 +00:00
bsalomon@google.com
c0961f5d23 Rebaseline MSAA16 AA clip images. We now enable MSAA when stencil clipping if the clip element is AA.
git-svn-id: http://skia.googlecode.com/svn/trunk@4393 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-28 19:50:27 +00:00
epoger@google.com
28060e7c94 Improve sorting of skdiff output, and make it consistent across platforms
BUG=https://code.google.com/p/skia/issues/detail?id=677
Review URL: https://codereview.appspot.com/6351045

git-svn-id: http://skia.googlecode.com/svn/trunk@4388 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-28 16:47:34 +00:00
reed@google.com
006db0f1b8 land https://codereview.appspot.com/6349043/
git-svn-id: http://skia.googlecode.com/svn/trunk@4375 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-27 19:33:29 +00:00
epoger@google.com
da4af24c9c skdiff: no longer skip .pdf files by default
Review URL: https://codereview.appspot.com/6257080

git-svn-id: http://skia.googlecode.com/svn/trunk@4330 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-25 18:45:50 +00:00
twiz@google.com
6cf5303b93 Adding files skipped from previous patch: http://code.google.com/p/skia/source/detail?r=4310
Review URL: https://codereview.appspot.com/6339043/

git-svn-id: http://skia.googlecode.com/svn/trunk@4312 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-22 18:55:55 +00:00
twiz@google.com
a31b8bb58d Refactoring in preparation for adding the picture benchmarking program.
Review URL: https://codereview.appspot.com/6339043/

git-svn-id: http://skia.googlecode.com/svn/trunk@4310 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-22 18:24:56 +00:00
reed@google.com
1bdf7fe8f6 tools/pinspect: quick tool to inspeact the header (and rough validity) of 1 or more picture files
Review URL: https://codereview.appspot.com/6295085

git-svn-id: http://skia.googlecode.com/svn/trunk@4258 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-14 18:58:40 +00:00
junov@chromium.org
777442d52e Adding the render_pictures test tool
Submitted on behalf of keyar@chromium.org

Review URL: https://codereview.appspot.com/6300056/



git-svn-id: http://skia.googlecode.com/svn/trunk@4235 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-12 14:56:36 +00:00
caryclark@google.com
3dd459151f fix warnings on Mac in miscellaneous files
Fix these class of warnings:
- unused functions
- unused locals
- sign mismatch
- missing function prototypes
- missing newline at end of file
- 64 to 32 bit truncation

The changes prefer to link in dead code in the debug build
with 'if (false)' than to comment it out, but trivial cases
are commented out or sometimes deleted if it appears to be
a copy/paste error.
Review URL: https://codereview.appspot.com/6305047

git-svn-id: http://skia.googlecode.com/svn/trunk@4186 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-06-06 12:11:10 +00:00
epoger@google.com
be6188d647 skdiff: return nonzero exit value if there are any mismatches
This will allow us to replace "gm -r" in our buildbots with "skdiff".  This will speed things up, and work around http://code.google.com/p/skia/issues/detail?id=473 ('PDF gradtext gm image results are nondeterministic')
Review URL: https://codereview.appspot.com/6242071

git-svn-id: http://skia.googlecode.com/svn/trunk@4097 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-31 15:13:45 +00:00
epoger@google.com
76222c0ef2 skdiff: internally track lists of ALL result types, not just baseMissing and comparisonMissing
This does not change skdiff output at all; verified using tools/tests/run.sh
Review URL: https://codereview.appspot.com/6260057

git-svn-id: http://skia.googlecode.com/svn/trunk@4096 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-31 15:12:09 +00:00
epoger@google.com
8e4e51d69b test-only: add test coverage of skdiff over input with identical bits or pixels
Review URL: https://codereview.appspot.com/6260055

git-svn-id: http://skia.googlecode.com/svn/trunk@4084 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-30 19:12:45 +00:00
epoger@google.com
6dbf6cde3b svndiff: report added and deleted files, not just modified files
Review URL: https://codereview.appspot.com/6260052

git-svn-id: http://skia.googlecode.com/svn/trunk@4063 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-29 21:28:12 +00:00
epoger@google.com
2e0a061c09 Add svndiff tool: runs skdiff over all pending changes in SVN checkout
This is needed for 
https://goto.google.com/HowToLandSkiaChangesThatChangeWebkitLayoutTests ,
and will be generally useful beyond that too.
Review URL: https://codereview.appspot.com/6256052

git-svn-id: http://skia.googlecode.com/svn/trunk@4052 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-25 19:48:05 +00:00
epoger@google.com
0f645b68a3 download_baselines.py : only set svn properties of files whose content has changed
and while I was at it, sort the filenames before acting on them, to make the output easier to read

BUG=http://code.google.com/p/skia/issues/detail?id=618
Review URL: https://codereview.appspot.com/6223061

git-svn-id: http://skia.googlecode.com/svn/trunk@4031 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-22 19:14:01 +00:00
epoger@google.com
46256ea736 Add to skdiff: test images for bitwise equality before testing for pixel-wise equality
- we now check for bitwise equality of files before bothering with pixel 
  comparisons (this will help with formats for which we don't have good
  decoders, like PDF)
- unparsable files are now reported as differing, unless they are bitwise equal
  (before, they were always reported as matching!)
- "largest area mismatch" is now based on same-size image pairs only;
  previously, if any image pairs had mismatching size, it was 100%
- removed repetitive "image size mismatch, so no diff to display" messages
- changed format of leftmost table cells to be more readable

BUG=http://code.google.com/p/skia/issues/detail?id=473
Review URL: https://codereview.appspot.com/6208089

git-svn-id: http://skia.googlecode.com/svn/trunk@4027 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-22 13:45:35 +00:00
epoger@google.com
a611c3ea53 Remove chromium mode from skdiff, because it is no longer actively used.
Ran tools/tests/run.sh to validate this change.

TBR=caryclark1
Review URL: https://codereview.appspot.com/6222045

git-svn-id: http://skia.googlecode.com/svn/trunk@4005 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-18 20:10:06 +00:00
epoger@google.com
90cb9b325c skdiff test-only change: add test of --nodiffs mode, make tests validate return value
Review URL: https://codereview.appspot.com/6206085

git-svn-id: http://skia.googlecode.com/svn/trunk@3999 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-18 18:25:26 +00:00
epoger@google.com
a44435296a test-only change: update run.sh and rearrange dirs to ease addition of more tests
Review URL: https://codereview.appspot.com/6220044

git-svn-id: http://skia.googlecode.com/svn/trunk@3995 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-17 17:12:38 +00:00
epoger@google.com
b2aacb6dc2 test-only changes: add more image files to test more skdiff behavior
Tests output order for very vs. slightly different pixels, very vs. slightly different image sizes, etc.

TBR=tomhudson@google.com
Review URL: https://codereview.appspot.com/6213049

git-svn-id: http://skia.googlecode.com/svn/trunk@3977 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-16 18:06:54 +00:00
epoger@google.com
6600852667 skdiff: only write out diff images that are included in index.html
Not only are those files unnecessary, in some different-image-size cases, their contents are nondeterministic!
Review URL: https://codereview.appspot.com/6208073

git-svn-id: http://skia.googlecode.com/svn/trunk@3975 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-16 17:40:57 +00:00
epoger@google.com
292aff6aca Make skdiff use enumeration of result types instead of separate booleans for each result type.
This is one step on the way to a more robust version of skdiff that we can use to address http://code.google.com/p/skia/issues/detail?id=473 ('PDF gradtext gm image results are nondeterministic')

I have confirmed that skdiff results will not change, using tools/tests/run.sh.
Review URL: https://codereview.appspot.com/6208063

git-svn-id: http://skia.googlecode.com/svn/trunk@3972 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-16 14:57:28 +00:00
epoger@google.com
a2b793c4d1 Add self-test for skdiff, and remove date/time from skdiff output so it passes.
BUG=http://code.google.com/p/skia/issues/detail?id=612
Review URL: https://codereview.appspot.com/6198074

git-svn-id: http://skia.googlecode.com/svn/trunk@3938 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-15 14:58:53 +00:00
epoger@google.com
15b5167a2d Rename tests/images dir as tests/skdiff
git-svn-id: http://skia.googlecode.com/svn/trunk@3930 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-14 20:19:42 +00:00
epoger@google.com
620c3b4a9f Images for testing skdiff tool
Review URL: https://codereview.appspot.com/6208056

git-svn-id: http://skia.googlecode.com/svn/trunk@3922 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-14 15:38:57 +00:00
reed@google.com
c7a67cb57e Just use std qsort
Review URL: https://codereview.appspot.com/6195052

git-svn-id: http://skia.googlecode.com/svn/trunk@3846 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-07 14:52:12 +00:00
epoger@google.com
a5f406e998 Add new flags to skdiff
New flags are:
--nodiffs: don't write out image diffs or index.html, just generate report on stdout
--match: compare files whose filenames contain this substring; if unspecified, compare ALL files
         this flag may be repeated to add more matching substrings
--nomatch: regardless of --match, DO NOT compare files whose filenames contain this substring
           this flag may be repeated to add more forbidden substrings

Also implemented the --threshold flag, which was already documented but not implemented.
Review URL: https://codereview.appspot.com/6135045

git-svn-id: http://skia.googlecode.com/svn/trunk@3806 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-05-01 13:26:16 +00:00
epoger@google.com
494548b870 Land http://codereview.appspot.com/6117046/ for Guanqun.Lu@gmail.com
git-svn-id: http://skia.googlecode.com/svn/trunk@3758 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-24 15:19:23 +00:00
epoger@google.com
1610a685e0 Make download_baselines.py download *all* platforms, if none are specified.
Simplifies the Skia rebaselining process... updated the --help pages in both scripts, too.

BUG=http://code.google.com/p/skia/issues/detail?id=486
Review URL: https://codereview.appspot.com/6016045

git-svn-id: http://skia.googlecode.com/svn/trunk@3664 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-12 18:02:25 +00:00
epoger@google.com
70f8bfea3e rename compare-baselines.py and download-baselines.py using underscores instead of hyphens, as per python requirements
git-svn-id: http://skia.googlecode.com/svn/trunk@3663 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-12 17:17:59 +00:00
epoger@google.com
01f78702f1 If skdiff encounters image size mismatch, do not display diff images
Currently, if skdiff encounters images whose expected and actual dimensions do not match, it will attempt (incorrectly) to display diffs.  Better to not display the diffs at all than to display misleading diffs...
Review URL: https://codereview.appspot.com/6015049

git-svn-id: http://skia.googlecode.com/svn/trunk@3662 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-04-12 16:32:04 +00:00
epoger@google.com
5fd53858f8 landing patch from http://codereview.appspot.com/5874051/
git-svn-id: http://skia.googlecode.com/svn/trunk@3468 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-03-22 18:20:06 +00:00
epoger@google.com
db12fee829 Improve default behavior of compare-baselines script.
Now it can typically be called without any command-line arguments.
Review URL: https://codereview.appspot.com/5615057

git-svn-id: http://skia.googlecode.com/svn/trunk@3139 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-03 14:32:34 +00:00
epoger@google.com
25d961cf98 Make skdiff always generate white diffs alongside actual pixel diffs
(and some associated improvement to the output)
Review URL: https://codereview.appspot.com/5616059

git-svn-id: http://skia.googlecode.com/svn/trunk@3138 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-02 20:50:36 +00:00
epoger@google.com
afd87fe108 Delete download-baselines-old script, we don't need it anymore.
Review URL: https://codereview.appspot.com/5615047

git-svn-id: http://skia.googlecode.com/svn/trunk@3130 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-02 18:39:40 +00:00
epoger@google.com
fc241ee752 Create compare-baselines tool to compare locally generated and checked-in GMs.
Review URL: https://codereview.appspot.com/5616056

git-svn-id: http://skia.googlecode.com/svn/trunk@3128 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-02-02 16:49:49 +00:00
epoger@google.com
20ad5ac8f6 Change download-baselines script to download images from skia-autogen SVN repo
I have copied the old version (which downloads the images from the buildbots
directly, but only works with our Mac buildbots) to download-baselines-old,
so we can use either version during a transition period.

Another difference: the new version sets the mimetype property of all image
files in the baseline_subdir, even those that have not changed.

BUG=386
http://code.google.com/p/skia/issues/detail?id=386 ('make buildbots write out RunGM image results to a browsable directory')
Review URL: https://codereview.appspot.com/5544056

git-svn-id: http://skia.googlecode.com/svn/trunk@3058 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-17 21:26:05 +00:00
epoger@google.com
d6256557cd Add --add-new-files option to download-baselines.py script
This will allow the user to determine whether the script downloads just
updates for baselines that are already checked in, or all available baselines.

BUG=436
addresses http://code.google.com/p/skia/issues/detail?id=436 ('add "update" flag to download-baselines script')
Review URL: http://codereview.appspot.com/5523050

git-svn-id: http://skia.googlecode.com/svn/trunk@2993 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-01-10 14:10:34 +00:00
epoger@google.com
27442af204 Add tool that downloads gm baseline images from the bots.
Review URL: http://codereview.appspot.com/5503082

git-svn-id: http://skia.googlecode.com/svn/trunk@2937 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-29 21:13:08 +00:00
epoger@google.com
338ef6532d Make update-doxygen.sh upload docs to http://code.google.com/p/skia-autogen
(and fix mime-type propset bug)

Once this is committed, I will remove the doxygen docs from the skia repo.
Review URL: http://codereview.appspot.com/5452072

git-svn-id: http://skia.googlecode.com/svn/trunk@2824 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-07 18:52:40 +00:00
epoger@google.com
b0c5e078d8 Create update-doxygen script that generates and uploads docs
(but only causes an SVN commit if any documentation actually changed).
Review URL: http://codereview.appspot.com/5440109

git-svn-id: http://skia.googlecode.com/svn/trunk@2807 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-06 14:52:38 +00:00
tomhudson@google.com
8b08c3e152 Make skdiff robust to image size differences: if the two image sizes differ,
report that fact explicitly, record 100% pixel difference, and don't try to
generate a valid delta image.



git-svn-id: http://skia.googlecode.com/svn/trunk@2767 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-11-30 17:01:00 +00:00
bsalomon@google.com
8e06dabfe6 Fix more VS2010 warnings.
Review URL: http://codereview.appspot.com/5169053/



git-svn-id: http://skia.googlecode.com/svn/trunk@2432 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-10-07 20:03:39 +00:00
bsalomon@google.com
1a315fe57e Make skdiff paths work on windows
http://codereview.appspot.com/5111041/



git-svn-id: http://skia.googlecode.com/svn/trunk@2321 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-09-23 14:56:37 +00:00
tomhudson@google.com
9b540ced41 Move SkBitmap members of the skdiff DiffRecord to pointers so that they
can be deleted as soon as they're written. When we're running in --chromium
mode we now have much larger datasets.



git-svn-id: http://skia.googlecode.com/svn/trunk@2025 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-08-02 14:10:04 +00:00
epoger@google.com
935d94500d Script to automatically update copyright notices in C/C++ source code.
Created to implement http://codereview.appspot.com/4816058/ ('Automatic update of all copyright notices to reflect new license terms.')

We can also use this to periodically clean up our code headers.
Review URL: http://codereview.appspot.com/4800055

git-svn-id: http://skia.googlecode.com/svn/trunk@1983 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-28 14:29:58 +00:00
epoger@google.com
ec3ed6a5eb Automatic update of all copyright notices to reflect new license terms.
I have manually examined all of these diffs and restored a few files that
seem to require manual adjustment.

The following files still need to be modified manually, in a separate CL:

android_sample/SampleApp/AndroidManifest.xml
android_sample/SampleApp/res/layout/layout.xml
android_sample/SampleApp/res/menu/sample.xml
android_sample/SampleApp/res/values/strings.xml
android_sample/SampleApp/src/com/skia/sampleapp/SampleApp.java
android_sample/SampleApp/src/com/skia/sampleapp/SampleView.java
experimental/CiCarbonSampleMain.c
experimental/CocoaDebugger/main.m
experimental/FileReaderApp/main.m
experimental/SimpleCocoaApp/main.m
experimental/iOSSampleApp/Shared/SkAlertPrompt.h
experimental/iOSSampleApp/Shared/SkAlertPrompt.m
experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig
experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig
experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig
gpu/src/android/GrGLDefaultInterface_android.cpp
gyp/common.gypi
gyp_skia
include/ports/SkHarfBuzzFont.h
include/views/SkOSWindow_wxwidgets.h
make.bat
make.py
src/opts/memset.arm.S
src/opts/memset16_neon.S
src/opts/memset32_neon.S
src/opts/opts_check_arm.cpp
src/ports/SkDebug_brew.cpp
src/ports/SkMemory_brew.cpp
src/ports/SkOSFile_brew.cpp
src/ports/SkXMLParser_empty.cpp
src/utils/ios/SkImageDecoder_iOS.mm
src/utils/ios/SkOSFile_iOS.mm
src/utils/ios/SkStream_NSData.mm
tests/FillPathTest.cpp
Review URL: http://codereview.appspot.com/4816058

git-svn-id: http://skia.googlecode.com/svn/trunk@1982 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-28 14:26:00 +00:00
tomhudson@google.com
7d04280a68 Extends skdiff to handle commands of the form
skdiff --chromium-release baseDir outputDir
  skdiff --chromium-debug baseDir outputDir
where baseDir is typically ../chromium/src.

Handles Chromium/WebKit layout tests: recursively traverses the
layout-test-results directory and compares -expected and -actual PNGs,
building a webpage showing the two images, their difference image,
and statistics, sorted by % of pixels difference. Respects all the
standard skdiff flags.

Also changes command line options named with words from starting with
a single hyphen to starting with two, falling in line with standards:
--threshold, --sortbymismatch, etc.



git-svn-id: http://skia.googlecode.com/svn/trunk@1856 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-14 13:15:55 +00:00
tomhudson@google.com
4e3059868f In skdiff, merge paths into the struct that holds the filename, to enable
1. better support reading from multiple input directories, and
2. allow filenames to differ between reference and novel images.



git-svn-id: http://skia.googlecode.com/svn/trunk@1848 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-07-13 17:42:46 +00:00