Commit Graph

662 Commits

Author SHA1 Message Date
commit-bot@chromium.org
e892615292 Adding flag to switch bench_record into tilegrid mode
BUG=skia:
R=tomhudson@google.com, mtklein@google.com, skyostil@google.com, skyostil@chromium.org

Author: iancottrell@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13628 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-02-28 19:25:11 +00:00
commit-bot@chromium.org
c530208ab0 Add point count to lua SkPath.
Add some scripts for classifying rrects and counting complex clip combinations.

R=reed@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13601 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-02-26 21:38:47 +00:00
bsalomon@google.com
4ebe382188 Revert "Revert of Add getReducedClipStack to lua canvas (https://codereview.chromium.org/180283004/)"
This reverts commit efded03a38d6147caaf2d951638d27fdd47eed64.

Fixes builds

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13599 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-02-26 20:22:32 +00:00
commit-bot@chromium.org
1caedbb216 Revert of Add getReducedClipStack to lua canvas (https://codereview.chromium.org/180283004/)
Reason for revert:
breaking a bunch of builds

Original issue's description:
> Add getReducedClipStack to lua canvas
>
> Committed: http://code.google.com/p/skia/source/detail?r=13594

R=reed@google.com
TBR=reed@google.com
NOTREECHECKS=true
NOTRY=true

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13597 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-02-26 18:32:44 +00:00
commit-bot@chromium.org
a47ac2bcc2 Add getReducedClipStack to lua canvas
R=reed@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13594 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-02-26 17:50:08 +00:00
commit-bot@chromium.org
d85b822616 Add some SkPath lua functions
R=reed@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13572 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-02-24 21:59:29 +00:00
commit-bot@chromium.org
5cc25359c6 Add getClipStack method to lua SkCanvas
R=reed@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13567 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-02-24 18:59:48 +00:00
commit-bot@chromium.org
d5f032d46b Do not define SK_SUPPORT_DEEPCOPYTO_CONFIG in Skia.
Clean up our callers who depend on the deprecated function.

R=scroggo@google.com

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13566 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-02-24 18:51:43 +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
commit-bot@chromium.org
184263325b Updates bench alert test output to match latest changes.
BUG=skia:2193
TBR=epoger@google.com
NOTRY=true

Author: bensong@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13513 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-02-20 16:22:55 +00:00
commit-bot@chromium.org
557e3cda9a Separates faster and slower bench alerts; sorts by delta.
Separate faster and slower bench alerts; sort by delta.

BUG=skia:2193
NOTRY=true
R=epoger@google.com

Author: bensong@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13512 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-02-20 15:58:32 +00:00
robertphillips@google.com
7fac718702 Fix valgrind suppressions (again)
https://codereview.chromium.org/166193003/



git-svn-id: http://skia.googlecode.com/svn/trunk@13449 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-02-14 14:08:05 +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
robertphillips@google.com
dd31ac470b Fix valgrind suppressions
https://codereview.chromium.org/158493004/



git-svn-id: http://skia.googlecode.com/svn/trunk@13403 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-02-11 15:23:21 +00:00
commit-bot@chromium.org
164052e9ce Create a common utility for finding and running binaries in out/
NOTRY=true
BUG=skia:2019
R=epoger@google.com

Author: rmistry@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13367 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-02-07 18:41:49 +00:00
commit-bot@chromium.org
4b5ad7fcd7 remove tools/test_rendering.py and tools/test_pictures.py
BUG=skia:2035
R=borenet@google.com

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13289 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-02-03 21:19:04 +00:00
commit-bot@chromium.org
c22d139808 Initial QuadTree implementation
In an effort to find a faster bounding box hierarchy than the R-Tree, a QuadTree has been implemented here.
For now, the QuadTree construction is generally faster than the R-Tree and the queries are a bit slower, so overall, SKP local tests showed QuadTree performance similar to the R-Tree performance.

Tests and bench are included in this cl.

At this point, I'd like to be able to commit this in order to more easily use the bots to test multiple configurations and a larger number of SKPs. The R-Tree BBH is still used by default so this change shouldn't affect chromium.

BUG=skia:
R=junov@chromium.org, junov@google.com, senorblanco@google.com, senorblanco@chromium.org, reed@google.com, sugoi@google.com, fmalita@google.com

Author: sugoi@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13282 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-02-03 18:08:33 +00:00
commit-bot@chromium.org
0ed90029e3 add_codereview_message script to append messages to a CL
Add add_codereview_message.py script.  This script takes a message and
a codereview URL as arguments calls `git cl upload` to append the
message to the given codereview issue.

Motivation: We are automating a process of testing Chromium/Skia DEPS
rolls where roll_deps.py is automatically run every night, and then at
a later time, compare_codereview.py is run to generate a report of the
trybot results.  This script can be used to append that report to the
DEPS roll Cl.

This CL also refactors functioanlity common to roll_deps and
add_codereview_message:
*   Add tools/git_utils.py module.
    -   ChangeGitBranch class was factored out of
        roll_deps.GitBranchCLUpload.  The other half of that class
        became roll_deps.git_cl_uploader function.  I make use of
        this new class in both roll_deps and upload_deps_roll.
    -   test_git_executable moved to this new module.
*   Add tools/misc_utils.py - move VerboseSubprocess, ChangeDir,
    and ReSearch classes from roll_deps module.
*   Remove generic functions from roll_deps.
*   Add git_cl_uploader function to roll_deps.  Refactor
    roll_deps.roll_deps function to make use of it

BUG=skia:
R=borenet@google.com, robertphillips@google.com

Author: halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13251 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-30 22:12:30 +00:00
robertphillips@google.com
5fbccb35eb Suppress new valgrind complaint
https://codereview.chromium.org/144853006/



git-svn-id: http://skia.googlecode.com/svn/trunk@13244 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-30 18:51:29 +00:00
commit-bot@chromium.org
f296eac872 Remove nvpr bench_pictures_cfg
BUG=skia:2042
R=bsalomon@google.com

Author: borenet@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13215 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-28 14:35:51 +00:00
commit-bot@chromium.org
06cd6c1a6d Add the NOTRY command on roll_deps.py
Motivation: The current workflow is to submit via `git cl dcommit`.
As we move to automated nightly creation of the DEPS roll CLs, we want
to make it easier for the submitter to speed along a clean roll.

BUG=skia:
R=borenet@google.com, robertphillips@google.com, rmistry@google.com

Author: halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13211 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-27 22:42:51 +00:00
borenet@google.com
17bb951e65 roll_deps.py: Make default_bots_list a module-level variable
This allows us to import the script rather than run it in a sub-shell.

BUG=skia:
R=halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13200 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-27 18:08:55 +00:00
commit-bot@chromium.org
788a5f0871 Explain empty report in compare_codereview.py.
Let user know when control and roll have no common trybots, instead of
being silent.

BUG=skia:
R=borenet@google.com

Author: halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13194 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-27 16:34:45 +00:00
commit-bot@chromium.org
9e63883725 Add a suppressions file for leak sanitizer.
LeakSanitizer is built into AddressSanitizer, and runs with no extra speed
penalty.  Most interestingly, it's got a lock-free allocator, so it doesn't
bottleneck threaded code.

This file is enough to supress all leak warnings except from the Nvidia driver
on my desktop for tests and dm.  Looks like lsan doesn't or can't pay attention
to leaked globals (-fno-common doesn't affect this).

BUG=skia:
R=robertphillips@google.com

Author: mtklein@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13153 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-23 18:42:31 +00:00
tfarina@chromium.org
5a064e3af8 Remove more unnamed namespace usages.
Skia prefers 'static' over 'unnamed' namespaces.

BUG=None
TEST=skgpu and tools
R=robertphillips@google.com, bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13146 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-23 02:02:57 +00:00
commit-bot@chromium.org
517c1e2921 Chromium Codereview Comparison Script.
This script takes two Codereview URLs, looks at the trybot results for
the two codereviews and compares the results.

Motivation:  This should speed up the DEPS roll procedure.

BUG=skia:2039
R=robertphillips@google.com, borenet@google.com

Author: halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13144 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-22 22:57:19 +00:00
commit-bot@chromium.org
34f47f9e7c Add reviewers to roll_deps.py, remove linux_heapcheck bot
The --reviewers and --cc are disabled for now, while we work on the workflow.

BUG=skia:
R=robertphillips@google.com

Author: halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13137 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-21 21:38:49 +00:00
commit-bot@chromium.org
240196d751 Make tools/submit_try safer
Using proc.wait() in combination with PIPE doesn't seem
to be safe for large patches according to
http://docs.python.org/2/library/subprocess.html.

Moving to proc.communicate().

Signed-off-by: Kévin PETIT <kevin.petit@arm.com>

BUG=skia:
R=djsollen@google.com, borenet@google.com

Author: kevin.petit.arm@gmail.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13113 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-16 19:48:19 +00:00
commit-bot@chromium.org
6a18079de8 Use MACOSX_DEPLOYMENT_TARGET instead of SDKROOT.
MACOSX_DEPLOYMENT_TARGET is the minimum unconditionally supported OS,
which should just be 10.6 for us until Chrome changes.  SDKROOT is the
maximum conditionally supported OS, which defaults sanely to whatever's
the latest SDK the machine has, so we don't need to mention it.

BUG=skia:
R=bungeman@google.com

Author: mtklein@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13102 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-15 21:39:18 +00:00
commit-bot@chromium.org
c3147c668c render_pictures: adjust unittests to show specific failures
BUG=skia:2043,skia:2044
R=rmistry@google.com

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13100 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-15 20:35:54 +00:00
commit-bot@chromium.org
238771c930 [try 2] skpmaker: make the SKP more graphically interesting (add a border)
relanding https://codereview.chromium.org/137993008/

BUG=skia:1942
NOTRY=True
R=rmistry@google.com
TBR=rmistry

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13088 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-15 16:33:31 +00:00
commit-bot@chromium.org
7e1a31db6a Revert of skpmaker: make the SKP slightly more interesting (add a border) (https://codereview.chromium.org/137993008/)
Reason for revert:
broke http://108.170.217.252:10117/builders/Build-Mac10.6-GCC-x86-Debug/builds/2837

Original issue's description:
> skpmaker: make the SKP slightly more interesting (add a border)
>
> This will help with render_pictures self-testing
> BUG=skia:1942
>
> Committed: http://code.google.com/p/skia/source/detail?r=13086

R=rmistry@google.com
TBR=rmistry@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:1942

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13087 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-15 16:04:45 +00:00
commit-bot@chromium.org
a3b0c4fe63 skpmaker: make the SKP slightly more interesting (add a border)
This will help with render_pictures self-testing
BUG=skia:1942
R=rmistry@google.com

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13086 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-15 15:40:13 +00:00
commit-bot@chromium.org
17cc3eaeaf When a picture lies about its size (i.e., claims to be 100x100 but only ever draws to 90x100) arbitrary pixel differences can appear in the undrawn portion. This is causing spurious differences to appear in the 8888 vs. gpu telemetry results.
R=bsalomon@google.com

Author: robertphillips@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13084 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-15 14:51:25 +00:00
commit-bot@chromium.org
9f8e282901 submit_try: Obtain the list of trybots from the checked-in slaves.cfg
This should drastically speed up the script.

BUG=
R=epoger@google.com, rmistry@google.com

Author: borenet@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13071 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-14 19:18:45 +00:00
commit-bot@chromium.org
a6d46cb1bc Add default_msaa16 and nvpr configs to bench_pictures.cfg
BUG=skia:2032
R=robertphillips@google.com, bsalomon@google.com

Author: borenet@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13070 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-14 18:47:07 +00:00
borenet@google.com
1a5e83a0ac Use git_cl.Changelist.GetUpstreamBranch() for diff in submit_try
BUG=skia:1862
R=epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13066 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-14 18:03:10 +00:00
commit-bot@chromium.org
30d4f8372c deprecate tools/test_rendering.py and tools/test_pictures.py
they will be removed entirely on/after Feb 1 unless there is objection

BUG=skia:1943
R=borenet@google.com

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13065 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-14 17:01:28 +00:00
commit-bot@chromium.org
a858223408 Add no-op NULL picture to bench_record.
Defaults of out/Release/bench_record are still fine; NULL's not too far off
from stable at 900 loops.  But for focus on NULL, I'd recommend
something like out/Release/bench_record --loops 100000 --skps.

Also: fail on failures, print 2 significant digits instead of fixed 4.2.

BUG=skia:1850
R=tomhudson@chromium.org

Author: mtklein@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13054 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-13 19:09:36 +00:00
commit-bot@chromium.org
15ac322aae Add bench_record.
I got fed up trying to figure out how best to measure recording cost with bench_pictures, render_pictures, etc, so I wrote a new tool.

Features welcome.

BUG=
R=tomhudson@google.com

Author: mtklein@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13037 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-13 12:03:47 +00:00
borenet@google.com
4d5e1366c9 Fixes to roll_deps for the bots
The bots are running an older version of git which does not support the
-q/--quiet flag for branch or the --short flag for symbolic-ref.

BUG=
R=halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13030 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-10 21:02:25 +00:00
borenet@google.com
6f0f5b4aad Remove references to Skia's SVN repository
BUG=
R=epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13006 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-09 21:41:39 +00:00
halcanary@google.com
8c5d2c1e75 Changes to roll_deps.py
-  Code cleanup
-  Stop assuming that chromium's checkout would be via git-svn.
-  Verbose commit message for the deps revision
-  Shorter branch names.
-  New default: save_branches = yes.
-  New option: --git_hash=GIT_HASH

BUG=skia:1973
BUG=skia:1974
BUG=skia:1993
BUG=skia:1995
R=borenet@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12974 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-08 21:29:34 +00:00
borenet@google.com
d4ba6e7781 submit_try: create the diff file using git, rather than relying on trychange.py
BUG=skia:1862

(SkipBuildbotRuns)

R=epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12967 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-08 21:00:30 +00:00
reed@google.com
672588b684 change offset to xy for pixelref subsetting
BUG=
R=scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12958 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-08 15:42:01 +00:00
commit-bot@chromium.org
11f156201a add unittest for render_pictures binary
Once committed, this will be run as part of RunToolSelfTests on http://108.170.217.252:10117/builders/Housekeeper-PerCommit .

BUG=skia:1943
R=rmistry@google.com

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12941 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-07 17:03:40 +00:00
halcanary@google.com
31fdb92995 DEPS roll script
This script:
    -  searches through the last N commits to find out the hash that is
       associated with the revision number.
    -  creates a new branch in the chromium tree, modifies the DEPS
       file, commits, and uploads to Rietveld.
    -  create a whitespace-only commit and uploads that to to Rietveld.

BUG=
R=borenet@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12921 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-06 19:50:22 +00:00
robertphillips@google.com
11e10e340b Patch for Windows compilation errors from r12916
git-svn-id: http://skia.googlecode.com/svn/trunk@12919 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-06 19:09:29 +00:00
rmistry@google.com
6ab96733b8 Support mesa config in render_pictures.
R=epoger@google.com, robertphillips@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12916 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-06 18:37:24 +00:00