Commit Graph

38 Commits

Author SHA1 Message Date
mtklein
9e64b78ff6 Revert of Move BenchTimer to tools as Timer (https://codereview.chromium.org/344213003/)
Reason for revert:
GpuTimer broken

Original issue's description:
> Move BenchTimer to tools as Timer
>
> This breaks a bunch of circular dependencies between tools and gm and bench.
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/4ed75287aed6371c6e4a41ffcc78c8a49c9810ed

R=tfarina@chromium.org, mtklein@chromium.org
TBR=mtklein@chromium.org, tfarina@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Author: mtklein@google.com

Review URL: https://codereview.chromium.org/346753003
2014-06-20 10:43:07 -07:00
mtklein
4ed75287ae Move BenchTimer to tools as Timer
This breaks a bunch of circular dependencies between tools and gm and bench.

BUG=skia:
R=tfarina@chromium.org, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/344213003
2014-06-20 10:31:49 -07:00
reed
c3b3266b7d hide SkBitmap::Config entirely (behind a flag)
patch from issue 339463002

TBR=

I think the NoGPU failure is unrelated, so ignoring
NOTRY=True

Author: reed@google.com

Review URL: https://codereview.chromium.org/340533002
2014-06-17 08:38:31 -07:00
reed
0689d7b12e stop using SkBitmap::Config
R=scroggo@google.com

Author: reed@chromium.org

Review URL: https://codereview.chromium.org/338493005
2014-06-14 05:30:20 -07:00
reed
6c22573edb hide SkBitmap::setConfig
patch from issue 325733002

TBR=scroggo

Author: reed@chromium.org

Review URL: https://codereview.chromium.org/322963002
2014-06-09 19:52:07 -07:00
djsollen@google.com
74ff1badf4 Fix windows compiler failures by using SkIsFinite.
BUG=skia:2574

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14821 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-21 12:24:58 +00:00
commit-bot@chromium.org
89558c9dcb Fix skpdiff segfault caused by NaN computation.
BUG=skia:2574
R=mtklein@google.com, rmistry@google.com

Author: djsollen@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14818 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-05-21 11:57:12 +00:00
commit-bot@chromium.org
28fcae2ec7 Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType. (https://codereview.chromium.org/234243002/)
Reason for revert:
Want to reland the original CL.

Original issue's description:
> Revert of Rename kPMColor_SkColorType to kN32_SkColorType. (https://codereview.chromium.org/227433009/)
>
> Reason for revert:
> breaking the Chrome deps roll.
> http://build.chromium.org/p/chromium.linux/builders/Linux%20GN%20%28dbg%29/builds/839/steps/compile/logs/stdio
>
> Original issue's description:
> > Rename kPMColor_SkColorType to kN32_SkColorType.
> >
> > The new name better represents what this flag means.
> >
> > BUG=skia:2384
> >
> > Committed: http://code.google.com/p/skia/source/detail?r=14117
>
> TBR=reed@google.com,scroggo@google.com
> NOTREECHECKS=true
> NOTRY=true
> BUG=skia:2384
>
> Committed: http://code.google.com/p/skia/source/detail?r=14144

R=reed@google.com, bensong@google.com
TBR=bensong@google.com, reed@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2384

Author: scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14156 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-11 17:15:40 +00:00
commit-bot@chromium.org
96edc24598 Revert of Rename kPMColor_SkColorType to kN32_SkColorType. (https://codereview.chromium.org/227433009/)
Reason for revert:
Chrome's side of define changes not easy to figure out quickly. Reverting this for DEPS roll for now.

Original issue's description:
> Rename kPMColor_SkColorType to kN32_SkColorType.
>
> The new name better represents what this flag means.
>
> BUG=skia:2384
>
> Committed: http://code.google.com/p/skia/source/detail?r=14117

R=reed@google.com, scroggo@google.com
TBR=reed@google.com, scroggo@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2384

Author: bensong@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14149 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-11 13:47:30 +00:00
commit-bot@chromium.org
d923288e50 Revert of Revert of Rename kPMColor_SkColorType to kN32_SkColorType. (https://codereview.chromium.org/234243002/)
Reason for revert:
fixes on the chrome side are landing (brettw), keep fingers crossed.

Original issue's description:
> Revert of Rename kPMColor_SkColorType to kN32_SkColorType. (https://codereview.chromium.org/227433009/)
>
> Reason for revert:
> breaking the Chrome deps roll.
> http://build.chromium.org/p/chromium.linux/builders/Linux%20GN%20%28dbg%29/builds/839/steps/compile/logs/stdio
>
> Original issue's description:
> > Rename kPMColor_SkColorType to kN32_SkColorType.
> >
> > The new name better represents what this flag means.
> >
> > BUG=skia:2384
> >
> > Committed: http://code.google.com/p/skia/source/detail?r=14117
>
> TBR=reed@google.com,scroggo@google.com
> NOTREECHECKS=true
> NOTRY=true
> BUG=skia:2384
>
> Committed: http://code.google.com/p/skia/source/detail?r=14144

R=reed@google.com, scroggo@google.com
TBR=reed@google.com, scroggo@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2384

Author: bensong@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14145 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-10 22:49:20 +00:00
commit-bot@chromium.org
757ebd20ef Revert of Rename kPMColor_SkColorType to kN32_SkColorType. (https://codereview.chromium.org/227433009/)
Reason for revert:
breaking the Chrome deps roll.
http://build.chromium.org/p/chromium.linux/builders/Linux%20GN%20%28dbg%29/builds/839/steps/compile/logs/stdio

Original issue's description:
> Rename kPMColor_SkColorType to kN32_SkColorType.
>
> The new name better represents what this flag means.
>
> BUG=skia:2384
>
> Committed: http://code.google.com/p/skia/source/detail?r=14117

R=reed@google.com, scroggo@google.com
TBR=reed@google.com, scroggo@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2384

Author: bensong@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14144 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-10 22:36:34 +00:00
commit-bot@chromium.org
149e9a107c Rename kPMColor_SkColorType to kN32_SkColorType.
The new name better represents what this flag means.

BUG=skia:2384
R=reed@google.com

Author: scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14117 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-04-09 20:45:29 +00:00
commit-bot@chromium.org
8a2ad3cae7 add new copyTo version to SkBitmap, which takes SkColorType
BUG=skia:
R=scroggo@google.com, halcanary@google.com, bsalomon@google.com

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13553 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-02-23 03:59:35 +00:00
djsollen@google.com
27d7ede2e6 bugfix for typo in skpdiff tool
Review URL: https://codereview.chromium.org/154263008

git-svn-id: http://skia.googlecode.com/svn/trunk@13408 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-02-11 16:29:39 +00:00
djsollen@google.com
60bce6cfcc Return -1 in error condition instead of removing diff result.
BUG=skia:2160
R=epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13407 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-02-11 16:22:58 +00:00
commit-bot@chromium.org
2cce3df19a The default size of mask canvas is not appropriate. its height is too small: 150, while its width is 300. As a result, for non-alphaMask canvas who doesn't update the mask canvas size, this tool just magnify the upper part of 'Expected Image' as well as 'Actual Image' when user open view.html to show skpdiff_output.json in browser for many cases. The other part can't be shown because it is out of the mask canvas. This CL update non-alphaMask canvas size according to baseline canvas for each case, then the tool can magnify anywhere you want for the whole image when you click and move mouse on the mask canvas.
R=djsollen@google.com

Author: yunchao.he@intel.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12638 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-12 14:55:45 +00:00
commit-bot@chromium.org
32f40ee8b0 Remove mutex around image decoding in skpdiff.
I removed the mutex to investigate BUG=skia:1803, and I get no
crashes. The crashes may have been related to other multithreading
issues.

Removing the mutex will allow skpdiff to run faster.

R=djsollen@google.com

Author: scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12339 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-21 15:22:18 +00:00
commit-bot@chromium.org
c32ce49df8 Remove unused kMaxPOI.
BUG=
R=djsollen@google.com

Author: mtklein@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12307 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-18 21:01:29 +00:00
commit-bot@chromium.org
da4d7cfa58 Remove unnecessary includes.
R=djsollen@google.com

Author: scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12304 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-18 17:27:16 +00:00
djsollen@google.com
efc51b79a2 fix multithread related crashes in skpdiff
BUG=skia:1798
R=mtklein@google.com, scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12252 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-12 18:29:17 +00:00
scroggo@google.com
086364b8e6 Changes to make SkPDiff more robost.
bitmap_to_cielab now returns a boolean. Instead of asserting that the
config is 8888, copy to 8888 (and return false on failure). This allows
skpdiff to work on Index8 bitmaps (without changing the code that does
the real work). If it returns false, do not attempt to create a pmetric.

In pmetric, exit early if maxLevels is <= 2, since this would crash later
in the function (creation of an ImageL3D if maxLevels is 0, and then the
creation of an array of a negative number of entries). maxLevels is small
if the width or height of the image is small (i.e. a bitmap with width 1
has maxLevels of 0).

R=djsollen@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12239 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-12 14:41:20 +00:00
djsollen@google.com
2761b30dfe fix broken build on mac due to compiler warning
R=epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12175 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-07 19:40:35 +00:00
djsollen@google.com
513a7bffd3 update skpdiff visualization (image magnification with alpha mask)
R=epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12174 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-07 19:24:06 +00:00
djsollen@google.com
cbbf1ca304 add initial support ofr multi-threaded execution
Review URL: https://codereview.chromium.org/27541003

git-svn-id: http://skia.googlecode.com/svn/trunk@11823 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-10-16 18:36:49 +00:00
djsollen@google.com
1e391b5870 Update skpdiff to include a name with each file.
R=caryclark@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@11808 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-10-16 15:00:11 +00:00
robertphillips@google.com
adacc7067a Start cleaning up 64bit Win warnings
https://codereview.chromium.org/27192003/



git-svn-id: http://skia.googlecode.com/svn/trunk@11764 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-10-14 21:53:24 +00:00
commit-bot@chromium.org
fe87fb8a33 fix path issues on mac and win for skpdiff_server.py
R=djsollen@google.com, epoger@google.com, jvanverth@google.com

Author: zachr@google.com

Review URL: https://chromiumcodereview.appspot.com/22650009

git-svn-id: http://skia.googlecode.com/svn/trunk@10719 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-14 19:20:35 +00:00
zachr@google.com
74c5ab19fd add ui for mutli-rebaselining
R=epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10618 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-07 18:06:39 +00:00
zachr@google.com
6f8e2c5e87 download and rebaseline images using server
BUG=
R=epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10607 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-07 15:43:04 +00:00
zachr@google.com
a479aa1366 fix skpdiff viewer bug when using relative paths
BUG=skia:1463
R=djsollen@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10515 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-02 15:54:30 +00:00
zachr@google.com
785ef5d521 process gm expectation violations
R=epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10395 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-26 19:29:39 +00:00
zachr@google.com
48b8891194 add basic HTTP server for viewing skpdiff results
R=epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10371 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-25 19:49:17 +00:00
zachr@google.com
55173f2ecc fix trailing comma in outptu of SkDiffContext
R=djsollen@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10361 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-25 17:22:58 +00:00
edisonn@google.com
d2d9f563be skpdiff: remove default value for output. Diifs can be very big, and fill a hard drive, no sense to generate them if not needed.
R=zachr@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10291 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-23 20:15:08 +00:00
zachr@google.com
ee0f46d87f put max on outputted poi in skpdiff
R=djsollen@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10262 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-23 12:57:52 +00:00
zachr@google.com
5b3e2b9622 move skpdiff into tools
R=djsollen@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10249 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-22 18:46:45 +00:00
zachr@google.com
904f86e6aa Revert "migrate skpdiff to tools"
This reverts commit 58a7ec70ce6b4548793a2ddc37c63d3d44edbc36.

git-svn-id: http://skia.googlecode.com/svn/trunk@10226 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-22 13:29:20 +00:00
zachr@google.com
a54aaf7fba migrate skpdiff to tools
R=djsollen@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10225 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-22 13:14:04 +00:00