AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
12,144 Commits 1 Branch 0 Tags 544 MiB
7693dbf46e
Commit Graph

32 Commits

Author SHA1 Message Date
commit-bot@chromium.org
25c1066e4d Generate gm/Android.mk, minus JSON. 
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
 2014-05-16 17:56:43 +00:00
commit-bot@chromium.org
90c0fbd349 reland "extract some common code from PictureRenderer" 
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
 2014-05-09 03:18:41 +00:00
commit-bot@chromium.org
de3ad9e220 Revert of extract some common code from PictureRenderer (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
 2014-05-08 16:23:56 +00:00
commit-bot@chromium.org
ee18f2a3c9 extract some common code from PictureRenderer 
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
 2014-05-08 14:48:44 +00:00
commit-bot@chromium.org
2b3a204bf6 replace gm_fprintf() calls with SkDebugf() 
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
 2014-02-27 18:45:26 +00:00
commit-bot@chromium.org
e3bb3bce3e Add JSON output option to bench. 
A new command-line flag --outResultsFile takes the filename to write the JSON into.

The human readable output is the same as before with one exception. Previously DEBUG would be printed if in debug mode, or nothing would be printed if in release mode. Now this is reported as a named option:

  build=DEBUG

or

  build=RELEASE

R=djsollen@google.com, bsalomon@google.com

Author: jcgregorio@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12465 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-12-03 18:16:48 +00:00
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
commit-bot@chromium.org
1d5bbb26cf Spin off incidental changes from DM CL (22839016). 
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
 2013-10-14 14:15:28 +00:00
epoger@google.com
defc487aa9 gm: add --ignoreTests flag 
BUG=skia:1600
R=scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@11374 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-09-19 06:18:27 +00:00
commit-bot@chromium.org
ef284a84f5 The two leaks are: 
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
 2013-07-11 22:29:29 +00:00
epoger@google.com
6f7f14d061 Reland r9682, using new SkString::appendU64() 
Review URL: https://codereview.chromium.org/17157005

git-svn-id: http://skia.googlecode.com/svn/trunk@9687 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-06-19 18:28:31 +00:00
epoger@google.com
628de5f1f4 Reverting r9682, which broke on some compilers 
git-svn-id: http://skia.googlecode.com/svn/trunk@9684 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-06-19 15:58:00 +00:00
epoger@google.com
6324ac5d81 GM: add --writeChecksumBasedFilenames option 
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
 2013-06-19 15:50:09 +00:00
scroggo@google.com
ccd7afb6fb Reland 'Add path utils, plus a test for it.' 
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
 2013-05-28 16:45:07 +00:00
scroggo@google.com
dbbcaa8983 Revert "Add path utils, plus a test for it." 
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
 2013-05-24 18:28:57 +00:00
scroggo@google.com
1bee037044 Add path utils, plus a test for it. 
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
 2013-05-24 18:12:17 +00:00
epoger@google.com
d4993ff360 GM: create GmResultDigest that encapsulates digest type ("bitmap-64bitMD5") 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
 2013-05-24 14:33:28 +00:00
epoger@google.com
659c8c06cd GM: make behavior of make_filename() more late-binding 
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
 2013-05-21 15:45:45 +00:00
epoger@google.com
ce057fec92 GM: include filename extension (.png) of each output file in JSON summary 
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
 2013-05-14 15:17:46 +00:00
scroggo@google.com
6843bdb706 Write/compare against expectations in skimage tool. 
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
 2013-05-08 19:14:23 +00:00
epoger@google.com
366a770159 GM: now that we use MD5 instead of CityHash, the JSON should say so 
(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
 2013-05-07 15:51:54 +00:00
epoger@google.com
76c913db20 GM: specify that currently used checksums are CityHashes of SkBitmaps 
(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
 2013-04-26 15:06:44 +00:00
epoger@google.com
908f583662 rename SkBitmapChecksummer as SkBitmapHasher, and prepare for it to possibly use 
some algorithm other than CityHash
Review URL: https://codereview.chromium.org/14170010

git-svn-id: http://skia.googlecode.com/svn/trunk@8639 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-04-12 02:23:55 +00:00
epoger@google.com
b0f8b430de GM: remove enableMissingWarning in favor of verbose flag, and trim output in nonverbose mode 
Review URL: https://codereview.chromium.org/14080003

git-svn-id: http://skia.googlecode.com/svn/trunk@8600 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-04-10 18:46:25 +00:00
epoger@google.com
5efdd0cb9c gm: write all messages to stdout/stderr with "GM:" preamble to distinguish from various debug messages coming from elsewhere 
Review URL: https://codereview.chromium.org/12691009

git-svn-id: http://skia.googlecode.com/svn/trunk@8126 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-03-13 14:18:40 +00:00
epoger@google.com
d271d245e9 gm: Add ability to compare against checksums (as opposed to image files) 
Review URL: https://codereview.appspot.com/7306071

git-svn-id: http://skia.googlecode.com/svn/trunk@7724 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-02-13 18:14:48 +00:00
epoger@google.com
84a1802b07 gm: report max-pixel-error if comparing against PNG files (not checksums) 
Review URL: https://codereview.appspot.com/7241064

git-svn-id: http://skia.googlecode.com/svn/trunk@7526 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-02-01 20:39:15 +00:00
epoger@google.com
3726960733 re-land r7258 with fixes and tests 
BUG=http://code.google.com/p/skia/issues/detail?id=1079
TBR=reed
Review URL: https://codereview.appspot.com/7132060

git-svn-id: http://skia.googlecode.com/svn/trunk@7291 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-01-19 04:21:27 +00:00
epoger@google.com
9ef89ce8b7 Roll out r7258 
BUG=http://code.google.com/p/skia/issues/detail?id=1079
TBR=robertphillips
Review URL: https://codereview.appspot.com/7138065

git-svn-id: http://skia.googlecode.com/svn/trunk@7289 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-01-18 21:45:42 +00:00
epoger@google.com
a243b22422 Reapply r7198 with Mac/Windows fixes 
BUG=https://code.google.com/p/skia/issues/detail?id=1067
Review URL: https://codereview.appspot.com/7138056

git-svn-id: http://skia.googlecode.com/svn/trunk@7258 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-01-17 17:54:28 +00:00
epoger@google.com
bc159bdcd0 Revert r7198 until I can fix https://code.google.com/p/skia/issues/detail?id=1067 
Review URL: https://codereview.appspot.com/7124043

git-svn-id: http://skia.googlecode.com/svn/trunk@7203 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-01-15 20:24:03 +00:00
epoger@google.com
06b8a19b56 gm: use new Expectations struct instead of comparison bitmaps 
Review URL: https://codereview.appspot.com/7088044

git-svn-id: http://skia.googlecode.com/svn/trunk@7198 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-01-15 19:10:16 +00:00