aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm/gm_expectations.cpp
Commit message (Collapse)AuthorAge
* Cleanup: Rename SkOSPath functions.Gravatar tfarina2014-07-28
| | | | | | | | | | | | | | | | Mostly for brevity and matches better with Python: Python | Old C++ | New C++ os.path.join | SkOSPath::SkPathJoin | SkOSPath::Join os.path.basename | SkOSPath::SkBasename | SkOSPath::Basename BUG=None TEST=make all R=mtklein@google.com, bsalomon@google.com Author: tfarina@chromium.org Review URL: https://codereview.chromium.org/428443002
* In Android framework, make tools depend on jsoncppGravatar scroggo2014-06-18
| | | | | | | | | | | | | | | | | | Always build the tools with JSON, but either build our own or use the system's. Rename skia_build_json_writer to skia_use_system_jsoncpp, since we now always build with JSON. Remove SK_BUILD_JSON_WRITER, which was only there so we could build without JSON it in the framework. BUG=skia:2448 R=djsollen@google.com, reed@google.com Author: scroggo@google.com Review URL: https://codereview.chromium.org/303913002
* hide Config in SkImageDecoder -- use SkColorType insteadGravatar reed2014-06-12
| | | | | | | | | | patch from issue 334613003 TBR=scroggo Author: reed@chromium.org Review URL: https://codereview.chromium.org/334793002
* Generate gm/Android.mk, minus JSON.Gravatar commit-bot@chromium.org2014-05-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running gyp_to_android.py, generate the makefile for gm. For now, remove json functionality and do not depend on json. This allows us to build and run until solving skbug.com/2448. gm/gm_expectations.cpp: gm/gm_expectations.h: gm/gmmain.cpp: Remove all json functionality when SK_BUILD_JSON_WRITER is not defined. This flag is not defined when SK_BUILD_FOR_ANDROID is defined. gyp/gm.gyp: Depend on skia and cutils. platform_tools/android/bin/gyp_to_android.py: Generate gm/Android.mk. platform_tools/android/gyp_gen/makefile_writer.py: Build gm/Android.mk when building external/skia. Depends on https://codereview.chromium.org/282053002/ BUG=skia:2447 BUG=skia:2448 R=epoger@google.com Author: scroggo@google.com Review URL: https://codereview.chromium.org/281303003 git-svn-id: http://skia.googlecode.com/svn/trunk@14767 2bbb7eff-a529-9590-31e7-b0007b416f81
* reland "extract some common code from PictureRenderer"Gravatar commit-bot@chromium.org2014-05-09
| | | | | | | | | | | | | re-lands https://codereview.chromium.org/273703006/ NOTRY=True R=bungeman@google.com, djsollen@google.com Author: epoger@google.com Review URL: https://codereview.chromium.org/278633002 git-svn-id: http://skia.googlecode.com/svn/trunk@14662 2bbb7eff-a529-9590-31e7-b0007b416f81
* Revert of extract some common code from PictureRenderer ↵Gravatar commit-bot@chromium.org2014-05-08
| | | | | | | | | | | | | | | | | | | | | | | (https://codereview.chromium.org/273703006/) Reason for revert: breaking the android debug builds. It seems to be the result of android using shared libs and not lumping everything into one big static lib or executable. So we have more than one copy of SkString which is the root of the issue. Original issue's description: > extract some common code from PictureRenderer > > Committed: http://code.google.com/p/skia/source/detail?r=14638 R=borenet@google.com, epoger@google.com TBR=borenet@google.com, epoger@google.com NOTREECHECKS=true NOTRY=true Author: djsollen@google.com Review URL: https://codereview.chromium.org/274463004 git-svn-id: http://skia.googlecode.com/svn/trunk@14649 2bbb7eff-a529-9590-31e7-b0007b416f81
* extract some common code from PictureRendererGravatar commit-bot@chromium.org2014-05-08
| | | | | | | | | | R=borenet@google.com Author: epoger@google.com Review URL: https://codereview.chromium.org/273703006 git-svn-id: http://skia.googlecode.com/svn/trunk@14638 2bbb7eff-a529-9590-31e7-b0007b416f81
* replace gm_fprintf() calls with SkDebugf()Gravatar commit-bot@chromium.org2014-02-27
| | | | | | | | | | | BUG=skia:1221 R=bsalomon@google.com Author: epoger@google.com Review URL: https://codereview.chromium.org/181933002 git-svn-id: http://skia.googlecode.com/svn/trunk@13613 2bbb7eff-a529-9590-31e7-b0007b416f81
* Fix compilation with SK_ENABLE_INST_COUNT=1Gravatar commit-bot@chromium.org2013-12-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add INHERITED declarations to class declarations that prevent compilation with the flag. Remove SK_DEFINE_INST_COUNT from all class implementations. Instead, use function-local static variables in the reference count helper classes to create the global instances to store the needed info. The accessor functions are defined inline in the helper classes, so definitions are not needed. The initialization point of the variables should be as well defined as previously. Remove SK_DECLARE_INST_COUNT_TEMPLATE and use SK_DECLARE_INST_COUNT instead. This avoids possible future compilation errors further. For SK_ENABLE_INST_COUNT=0 compilation, add an empty static member function to all classes that use SK_DECLARE_INST_COUNT and SK_DECLARE_INST_COUNT_ROOT macros. The function ensures that classes contain public INHERITED typedef. This member function seems to be compiled away. This shouĺd ensure that part of the compilation errors are caught earlier. Also adds DSK_DECLARE_INST_COUNT to few SkPDFDict subclasses. R=robertphillips@google.com, richardlin@chromium.org, bsalomon@google.com Author: kkinnunen@nvidia.com Review URL: https://codereview.chromium.org/98703002 git-svn-id: http://skia.googlecode.com/svn/trunk@12501 2bbb7eff-a529-9590-31e7-b0007b416f81
* More work to integrate skimage with rebaseline tools.Gravatar scroggo@google.com2013-10-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Spin off incidental changes from DM CL (22839016).Gravatar commit-bot@chromium.org2013-10-14
| | | | | | | | | | | BUG= R=epoger@google.com, bsalomon@google.com Author: mtklein@google.com Review URL: https://codereview.chromium.org/27023004 git-svn-id: http://skia.googlecode.com/svn/trunk@11752 2bbb7eff-a529-9590-31e7-b0007b416f81
* flush after every print in windowsGravatar commit-bot@chromium.org2013-10-09
| | | | | | | | | | R=djsollen@google.com, reed@google.com, epoger@google.com Author: bsalomon@google.com Review URL: https://codereview.chromium.org/26680004 git-svn-id: http://skia.googlecode.com/svn/trunk@11670 2bbb7eff-a529-9590-31e7-b0007b416f81
* The two leaks are:Gravatar commit-bot@chromium.org2013-07-11
| | | | | | | | | | | | | | | missing unrefs in megalooper GM missing reset capability in oval renderer This CL also expands the instance counting system to some recently adding classes (e.g., SkFontStyleSet) R=bsalomon@google.com, jvanverth@google.com Author: robertphillips@google.com Review URL: https://chromiumcodereview.appspot.com/18461007 git-svn-id: http://skia.googlecode.com/svn/trunk@10030 2bbb7eff-a529-9590-31e7-b0007b416f81
* rebaseline.py: if expectations dir contains JSON format results, update ↵Gravatar epoger@google.com2013-07-08
| | | | | | | | | | | | those instead of image files Part of Step 3 in https://goto.google.com/ChecksumTransitionDetail R=senorblanco@chromium.org Review URL: https://codereview.chromium.org/18348018 git-svn-id: http://skia.googlecode.com/svn/trunk@9910 2bbb7eff-a529-9590-31e7-b0007b416f81
* Reland r9682, using new SkString::appendU64()Gravatar epoger@google.com2013-06-19
| | | | | | Review URL: https://codereview.chromium.org/17157005 git-svn-id: http://skia.googlecode.com/svn/trunk@9687 2bbb7eff-a529-9590-31e7-b0007b416f81
* Reverting r9682, which broke on some compilersGravatar epoger@google.com2013-06-19
| | | | git-svn-id: http://skia.googlecode.com/svn/trunk@9684 2bbb7eff-a529-9590-31e7-b0007b416f81
* GM: add --writeChecksumBasedFilenames option Gravatar epoger@google.com2013-06-19
| | | | | | | | | | | as needed for Step 2 of https://goto.google.com/ChecksumTransitionDetail : make GenerateGMs upload actual images to Google Storage instead of skia-autogen R=scroggo@google.com Review URL: https://codereview.chromium.org/17365002 git-svn-id: http://skia.googlecode.com/svn/trunk@9682 2bbb7eff-a529-9590-31e7-b0007b416f81
* Reland 'Add path utils, plus a test for it.'Gravatar scroggo@google.com2013-05-28
| | | | | | | | | | | | | | | Build SkPathJoin and SkBasename on windows also. Previous CL did not build on Windows because the two functions were accidentally placed inside an ifdef that did not include windows. Move the functions to the top of the file, and add a comment by the endif for clarity. Previously reviewed at https://codereview.chromium.org/15747004/ Review URL: https://codereview.chromium.org/15740024 git-svn-id: http://skia.googlecode.com/svn/trunk@9295 2bbb7eff-a529-9590-31e7-b0007b416f81
* Split GM json schema out of display_json_results.py, for sharing with other ↵Gravatar epoger@google.com2013-05-28
| | | | | | | | | | tools R=rmistry@google.com Review URL: https://codereview.chromium.org/16155002 git-svn-id: http://skia.googlecode.com/svn/trunk@9290 2bbb7eff-a529-9590-31e7-b0007b416f81
* Revert "Add path utils, plus a test for it."Gravatar scroggo@google.com2013-05-24
| | | | | | | | | | This reverts commit d172374b46cae0bd5d7c024b9848f5bdafcc6a16. This CL broke on Windows. Review URL: https://codereview.chromium.org/15986004 git-svn-id: http://skia.googlecode.com/svn/trunk@9278 2bbb7eff-a529-9590-31e7-b0007b416f81
* Add path utils, plus a test for it.Gravatar scroggo@google.com2013-05-24
| | | | | | | | | | | | | | | | | | | | | | | | SkOSFile: Added class SkOSPath with functions for modifying strings representing path names. OSPathTest.cpp: Test of the new utilities. factory.cpp: Use SkPathJoin. gmmain and gm_expectations: Use SkOSPath::SkPathJoin instead of a local version. skimage_main.cpp: Use the new location of SkPathJoin and SkBasename. R=epoger@google.com Review URL: https://codereview.chromium.org/15747004 git-svn-id: http://skia.googlecode.com/svn/trunk@9277 2bbb7eff-a529-9590-31e7-b0007b416f81
* GM: create GmResultDigest that encapsulates digest type ("bitmap-64bitMD5") ↵Gravatar epoger@google.com2013-05-24
| | | | | | | | | | and value (12345) R=scroggo@google.com Review URL: https://codereview.chromium.org/15883004 git-svn-id: http://skia.googlecode.com/svn/trunk@9271 2bbb7eff-a529-9590-31e7-b0007b416f81
* Improve tool that analyzes gm JSON summaryGravatar epoger@google.com2013-05-21
| | | | | | | | | BUG=https://code.google.com/p/skia/issues/detail?id=1300 R=borenet@google.com Review URL: https://codereview.chromium.org/15298010 git-svn-id: http://skia.googlecode.com/svn/trunk@9217 2bbb7eff-a529-9590-31e7-b0007b416f81
* GM: make behavior of make_filename() more late-bindingGravatar epoger@google.com2013-05-21
| | | | | | | | | | | This will be needed to add the option of writing out files with checksum-based filenames. R=scroggo@google.com Review URL: https://codereview.chromium.org/15415003 git-svn-id: http://skia.googlecode.com/svn/trunk@9215 2bbb7eff-a529-9590-31e7-b0007b416f81
* Add gm/confirm_no_failures_in_json.pyGravatar epoger@google.com2013-05-14
| | | | | | | | | | | The CompareGMs step will use this (instead of running skdiff over the image files) to decide whether to go red or green. R=rmistry@google.com Review URL: https://codereview.chromium.org/15100003 git-svn-id: http://skia.googlecode.com/svn/trunk@9127 2bbb7eff-a529-9590-31e7-b0007b416f81
* GM: include filename extension (.png) of each output file in JSON summaryGravatar epoger@google.com2013-05-14
| | | | | | | | | | | | Doing this so that, once we *do* start writing PDF checksums into the JSON summary, we'll be able to distinguish those from the PNG checksums. Otherwise, we could have naming collisions. R=scroggo@google.com Review URL: https://codereview.chromium.org/14890017 git-svn-id: http://skia.googlecode.com/svn/trunk@9119 2bbb7eff-a529-9590-31e7-b0007b416f81
* Write/compare against expectations in skimage tool.Gravatar scroggo@google.com2013-05-08
| | | | | | | | | | | | | | | | | | | | | skimage: Add two new modes: one to write expectations to a json file, and another to compare results against expectations. Use SkPATH_SEPARATOR instead of '/'. gm_expectations: Split into a static library so it can be used by skimage. Make functions non static and move function definitions into source file. Capitalize static member functions to follow the coding style guidelines. BUG=https://code.google.com/p/skia/issues/detail?id=1241 R=epoger@google.com Review URL: https://codereview.chromium.org/14670021 git-svn-id: http://skia.googlecode.com/svn/trunk@9069 2bbb7eff-a529-9590-31e7-b0007b416f81
* Re-land r9059 with empty cityhash.gyp, instead of deleted cityhash.gypGravatar epoger@google.com2013-05-08
| | | | | | | | | | R=rmistry@google.com Review URL: https://codereview.chromium.org/15060008/ git-svn-id: http://skia.googlecode.com/svn/trunk@9064 2bbb7eff-a529-9590-31e7-b0007b416f81
* Roll out r9059 to unbreak botsGravatar epoger@google.com2013-05-08
| | | | git-svn-id: http://skia.googlecode.com/svn/trunk@9060 2bbb7eff-a529-9590-31e7-b0007b416f81
* Remove third-party cityhash, unused since r8992Gravatar epoger@google.com2013-05-08
| | | | | | | | R=djsollen@google.com Review URL: https://codereview.chromium.org/15027013 git-svn-id: http://skia.googlecode.com/svn/trunk@9059 2bbb7eff-a529-9590-31e7-b0007b416f81
* GM: now that we use MD5 instead of CityHash, the JSON should say soGravatar epoger@google.com2013-05-07
| | | | | | | | | | (this should have been part of https://code.google.com/p/skia/source/detail?r=8992 ) R=bungeman@google.com Review URL: https://codereview.chromium.org/14758003 git-svn-id: http://skia.googlecode.com/svn/trunk@9038 2bbb7eff-a529-9590-31e7-b0007b416f81
* GM: specify that currently used checksums are CityHashes of SkBitmapsGravatar epoger@google.com2013-04-26
(distinct from other hash algorithms we may switch to, or hashes of files such as PDFs that cannot be read into an SkBitmap) Review URL: https://codereview.chromium.org/14284018 git-svn-id: http://skia.googlecode.com/svn/trunk@8877 2bbb7eff-a529-9590-31e7-b0007b416f81