commit-bot@chromium.org
94da31dd3b
Upstream Android Changes from K release
...
R=scroggo@google.com
Author: djsollen@google.com
Review URL: https://codereview.chromium.org/145233002
git-svn-id: http://skia.googlecode.com/svn/trunk@13152 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-23 17:21:28 +00:00
commit-bot@chromium.org
6dda827913
add leaks flag to show unref'd insts
...
Leaks are shown optionally instead of always for tests, gm, and bench.
The current display does not show actual leaks necessarily, but
shows global objects that were not deleted when the test ended.
To enable the end-of-run leak display, pass --leaks or -l.
BUG=skia:
R=mtklein@google.com
Author: caryclark@google.com
Review URL: https://codereview.chromium.org/143943009
git-svn-id: http://skia.googlecode.com/svn/trunk@13151 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-23 17:21:19 +00:00
bungeman@google.com
4732df6941
Basic support for vector FON.
...
This change gives vector FON fonts slightly better support than bitmap
FON fonts which we already have some support for.
This also fixes the calculation of the y component of advances for
bitmap and vector FON glyphs.
git-svn-id: http://skia.googlecode.com/svn/trunk@13150 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-23 15:22:42 +00:00
commit-bot@chromium.org
fed2ab6483
No deduping dictionaries for matrices and regions.
...
There's little benefit to deduping matrices and regions: they're infrequently
used, and doubly infrequently reused. Their use-weighted byte cost is tiny.
There is some downside to deduping matrices and regions. Even when they're not
used, we prepare dictionaries for deduping them for every picture. Each of
these dictionaries costs 160 bytes, so two unused dictionaries make a big chunk
of the ~1100 bytes it takes to allocate an SkPictureRecord. (~330 come from
parent class SkCanvas, 768 from SkPictureRecord itself, here reduced to 448).
One side benefit of not deduping these guys is that the change weighs -140 lines of code.
It may go without saying, but this breaks the picture format.
Testing: out/Debug/tests && out/Debug/dm (which runs all picture modes by default)
BUG=skia:1850
R=reed@google.com , bensong@google.com , robertphillips@google.com
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/143883006
git-svn-id: http://skia.googlecode.com/svn/trunk@13149 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-23 15:16:05 +00:00
commit-bot@chromium.org
09647969cf
Remove extraneous folders from includes.
...
R=reed@google.com , bsalomon@google.com , mtklein@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/145203003
git-svn-id: http://skia.googlecode.com/svn/trunk@13148 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-23 14:30:21 +00:00
commit-bot@chromium.org
c896f4de12
Both gears and snow should detect if Path is available, and also report on the console if present.
...
BUG=skia:
R=robertphillips@google.com
Author: jcgregorio@google.com
Review URL: https://codereview.chromium.org/143743004
git-svn-id: http://skia.googlecode.com/svn/trunk@13147 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-23 13:53:12 +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
mike@reedtribe.org
d173b87608
remove SkScalarMul macro
...
git-svn-id: http://skia.googlecode.com/svn/trunk@13145 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-23 02:02:45 +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
f1d63aa80d
Revert of Add factory class for generating various flavors of GrTextContext. ( https://codereview.chromium.org/144283002/ )
...
Reason for revert:
Breaks Chrome. Need to fix template issue.
Original issue's description:
> Add factory class for generating various flavors of GrTextContext.
>
> This is the first pass of making Gr*TextContext more generic and easily
> subclassed. The next stage will be making GrBitmapTextContext and
> GrDistanceFieldTextContext more similar by moving the SkDraw loop into
> each subclass.
>
> BUG=skia:2018
>
> Committed: http://code.google.com/p/skia/source/detail?r=13142
R=bsalomon@google.com , reed@google.com
TBR=bsalomon@google.com , reed@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2018
Author: jvanverth@google.com
Review URL: https://codereview.chromium.org/145023006
git-svn-id: http://skia.googlecode.com/svn/trunk@13143 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-22 22:01:41 +00:00
commit-bot@chromium.org
ce96b651d3
Add factory class for generating various flavors of GrTextContext.
...
This is the first pass of making Gr*TextContext more generic and easily
subclassed. The next stage will be making GrBitmapTextContext and
GrDistanceFieldTextContext more similar by moving the SkDraw loop into
each subclass.
BUG=skia:2018
R=bsalomon@google.com , reed@google.com
Author: jvanverth@google.com
Review URL: https://codereview.chromium.org/144283002
git-svn-id: http://skia.googlecode.com/svn/trunk@13142 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-22 21:37:03 +00:00
commit-bot@chromium.org
7873333236
Remove GetGr() hack.
...
It seems no GM are using this.
BUG=None
TEST=SampleApp
R=bsalomon@google.com , caryclark@google.com
Author: tfarina@chromium.org
Review URL: https://codereview.chromium.org/144543003
git-svn-id: http://skia.googlecode.com/svn/trunk@13141 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-22 14:43:47 +00:00
commit-bot@chromium.org
566a3f1a1f
update mesa version mapping to GL version
...
mesa3d have updated to 10.0 to support OpenGL 3.3, see http://www.mesa3d.org/index.html . At least Intel has implemented mesa 10.0 on IA.
BUG=None
R=bsalomon@google.com
Author: yunchao.he@intel.com
Review URL: https://codereview.chromium.org/143803012
git-svn-id: http://skia.googlecode.com/svn/trunk@13140 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-22 14:37:08 +00:00
skia.committer@gmail.com
394c7bb04d
Sanitizing source files in Housekeeper-Nightly
...
git-svn-id: http://skia.googlecode.com/svn/trunk@13139 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-22 07:01:54 +00:00
tfarina@chromium.org
58674817a7
Remove unnamed namespace usage from tests/
...
Skia preference is to use 'static' keyword rather than use unnamed
namespace.
BUG=None
TEST=tests
R=robertphillips@google.com , bsalomon@google.com
Review URL: https://codereview.chromium.org/132403008
git-svn-id: http://skia.googlecode.com/svn/trunk@13138 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-21 23:39:22 +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
0c95d664df
Remove a stray setReserve that causes dynamic allocation in picture creation.
...
This brings us down to about 10 calls to malloc per picture.
No measurable change in bench_record or bench_pictures.
BUG=
R=reed@google.com
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/132693009
git-svn-id: http://skia.googlecode.com/svn/trunk@13136 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-21 20:48:46 +00:00
commit-bot@chromium.org
764ea79201
Rename Logan skimage expectations: .jon -> .json
...
BUG=skia:
R=scroggo@google.com
Author: borenet@google.com
Review URL: https://codereview.chromium.org/144253002
git-svn-id: http://skia.googlecode.com/svn/trunk@13135 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-21 20:03:09 +00:00
commit-bot@chromium.org
2982a4f98c
Add comment at top of freetype.gyp.
...
This tells VI to use colors when viewing.
R=djsollen@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/138123007
git-svn-id: http://skia.googlecode.com/svn/trunk@13134 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-21 19:48:47 +00:00
bsalomon@google.com
bfadab42c6
really really fix iOS build.
...
Review URL: https://codereview.chromium.org/132693007
git-svn-id: http://skia.googlecode.com/svn/trunk@13133 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-21 17:40:48 +00:00
bsalomon@google.com
3ea18e9766
Really fix ios build?
...
Review URL: https://codereview.chromium.org/144063003
git-svn-id: http://skia.googlecode.com/svn/trunk@13132 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-21 16:52:48 +00:00
bsalomon@google.com
304eb1c3ef
Fix ios build?
...
Review URL: https://codereview.chromium.org/134083009
git-svn-id: http://skia.googlecode.com/svn/trunk@13131 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-21 16:35:56 +00:00
commit-bot@chromium.org
c72425ae36
Move GrGLInterface function pointers into a nested struct
...
BUG=skia:2042
R=robertphillips@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/133073009
git-svn-id: http://skia.googlecode.com/svn/trunk@13130 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-21 16:09:18 +00:00
commit-bot@chromium.org
91506eb0b9
Scope our ANNOTATE_BENIGN_RACE.
...
This should unstick the DEPS roll. When building with TSAN, Chromium's pulling
in the canonical one from dynamic_annotations.h, and we're trying to redefine it.
R=robertphillips@google.com , reed@google.com , bsalomon@google.com
TBR=reed@google.com
BUG=
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/144063002
git-svn-id: http://skia.googlecode.com/svn/trunk@13129 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-21 15:11:02 +00:00
borenet@google.com
5e93b85884
Whitepspace change to verify that the bots are working
...
This CL caused some buildslaves to fail to UpdateScripts:
https://skia.googlesource.com/buildbot/+/6707360ca6f76ae383ac7558015fb94f4d12577c
Review URL: https://codereview.chromium.org/144073002
git-svn-id: http://skia.googlecode.com/svn/trunk@13128 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-21 14:25:35 +00:00
senorblanco@chromium.org
2bfe36b68d
Apply the CTM to filter parameters for SkBlurImageFilter, SkDropShadowImageFilter, SkDisplacementMapEffect and SkMorphologyImageFilter. I had resisted this (and may later put in an assert that the CTM contains no rotation, skew or perspective), but it just makes the filters play better with Skia generally.
...
This revealed that the displacement map was not handling clipping or upstream cropping at all well (the color would "swim" through the displacement at the edge of the clip rect). Fixed by passing through the correct offsets to the bitmap accesses in both raster and GPU paths. Same for morphology.
R=sugoi@google.com
Review URL: https://codereview.chromium.org/137053003
git-svn-id: http://skia.googlecode.com/svn/trunk@13127 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-20 19:58:28 +00:00
senorblanco@chromium.org
29f351a867
Allow an override of MACOSX_DEPLOYMENT_TARGET, so the user can build against a different SDK if desired.
...
R=mtklein@google.com , bungeman, mtklein
Review URL: https://codereview.chromium.org/138033018
git-svn-id: http://skia.googlecode.com/svn/trunk@13126 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-20 16:14:02 +00:00
bsalomon@google.com
fde5e264f3
Fix utils.gyp missing file
...
TBR=robertphillips@google.com
Review URL: https://codereview.chromium.org/142043003
git-svn-id: http://skia.googlecode.com/svn/trunk@13125 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-17 20:33:09 +00:00
commit-bot@chromium.org
4bd5177e4f
ignore some verylargebitmap errors
...
BUG=skia:1978
NOTREECHECK=True
NOTRY=True
R=senorblanco@google.com
TBR=senorblanco
Author: epoger@google.com
Review URL: https://codereview.chromium.org/140643003
git-svn-id: http://skia.googlecode.com/svn/trunk@13124 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-17 20:16:05 +00:00
commit-bot@chromium.org
bd58febffb
Speed up GrResourceCache add and lookup by using TDynamicHash
...
Speed up GrResourceCache add and lookup by using TDynamicHash instead
of GrTHashTable. GrTHashTable spends most of its time memmoving the
array elements while sorting after an add. Lookup is not particularly
fast either.
R=mtklein@google.com , bsalomon@google.com , reed@google.com
Author: kkinnunen@nvidia.com
Review URL: https://codereview.chromium.org/91453002
git-svn-id: http://skia.googlecode.com/svn/trunk@13122 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-17 17:56:21 +00:00
commit-bot@chromium.org
cd0bf0adaa
Tweak validate() to check less as the size of the hash grows.
...
This makes working with a non-trivial SkTDynamicHash less painful in Debug
builds. validate() is skipped in Release, so this has no effect there.
BUG=
R=kkinnunen@nvidia.com , bsalomon@google.com
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/140753003
git-svn-id: http://skia.googlecode.com/svn/trunk@13121 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-17 17:55:14 +00:00
commit-bot@chromium.org
2ab1ba0555
Make leak counters thread-safe and turn them on by default for Debug
...
Make leak counters implemented with SK_DECLARE_INST_COUNT thread-safe.
Enable the leak counting for Debug builds when Skia is built as a
static library. Having SK_DECLARE_INST_COUNT without
SK_DEFINE_INST_COUNT relies on static variables in member functions
declared in the header files. These might be duplicated in the clients
of the library when Skia is built as a dynamic library, producing
incorrect operation.
Protect the instance counter initialization step (initStep) by
using SkOnce.
Makes SkOnce.h part of the public API, since SkInstCnt is public.
Protect the per-class child list shared variable with a per-class mutex.
Changes the behavior in the way that if the child list has been
"cleaned up", it will still try to create subsequent child lists.
BUG=skia:1219
R=robertphillips@google.com , mtklein@google.com , bsalomon@google.com , bungeman@google.com , djsollen@google.com
Author: kkinnunen@nvidia.com
Review URL: https://codereview.chromium.org/99483003
git-svn-id: http://skia.googlecode.com/svn/trunk@13120 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-17 17:55:02 +00:00
commit-bot@chromium.org
7322893af0
Adding SK_API to SkGLContextHelper and SkNullGLContext for use in blink unit test component build
...
BUG=skia:
R=bsalomon@chromium.org
Author: junov@chromium.org
Review URL: https://codereview.chromium.org/141813002
git-svn-id: http://skia.googlecode.com/svn/trunk@13119 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-17 16:59:03 +00:00
commit-bot@chromium.org
90313cc36a
Move GrGLExtensions from GrGLContextInfo to GrGLInterface
...
BUG=skia:2042
R=robertphillips@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/140823003
git-svn-id: http://skia.googlecode.com/svn/trunk@13118 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-17 15:05:38 +00:00
commit-bot@chromium.org
bd00629708
Add AUTHORS file for copyright tracking
...
BUG=skia:
R=jcgregorio@google.com , rmistry@google.com
Author: hcm@google.com
Review URL: https://codereview.chromium.org/138413004
git-svn-id: http://skia.googlecode.com/svn/trunk@13117 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-17 15:00:14 +00:00
commit-bot@chromium.org
7b8d72d892
Adding SkPictureImageFilter to the fuzzer
...
BUG=skia:
R=senorblanco@google.com , senorblanco@chromium.org , sugoi@google.com
Author: sugoi@chromium.org
Review URL: https://codereview.chromium.org/140993004
git-svn-id: http://skia.googlecode.com/svn/trunk@13116 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-16 22:54:41 +00:00
commit-bot@chromium.org
92b7884e88
Remove GR_GL_IGNORE_ES3_MSAA.s
...
R=jvanverth@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/140933005
git-svn-id: http://skia.googlecode.com/svn/trunk@13115 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-16 20:49:46 +00:00
commit-bot@chromium.org
58c0fa37ba
Clear the canvas before drawing the gears.
...
BUG=skia:
R=robertphillips@google.com
Author: jcgregorio@google.com
Review URL: https://codereview.chromium.org/141113002
git-svn-id: http://skia.googlecode.com/svn/trunk@13114 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-16 19:48:33 +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
cc190eb6f3
Allow GrGLInterface factories in Chromium to continue to compile.
...
BUG=skia:2042
TBR=jvanverth@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/136573003
git-svn-id: http://skia.googlecode.com/svn/trunk@13112 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-16 18:49:01 +00:00
commit-bot@chromium.org
b1854a8509
Make GrGLContextInfo have private ptr to GrGLInterface
...
BUG=skia:2042
R=robertphillips@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/140843003
git-svn-id: http://skia.googlecode.com/svn/trunk@13111 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-16 18:39:04 +00:00
commit-bot@chromium.org
5b8bde5db2
Missing #include "SkTemplates.h" for SkAutoTMalloc.
...
BUG=
R=halcanary@google.com
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/137783021
git-svn-id: http://skia.googlecode.com/svn/trunk@13110 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-16 18:16:37 +00:00
bsalomon@google.com
ead86f2d8a
quick fix for r13108
...
BUG=skia:2042
NOTREECHECKS
NOTRY
TBR=robertphillips@google.com
Review URL: https://codereview.chromium.org/135313004
git-svn-id: http://skia.googlecode.com/svn/trunk@13109 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-16 17:51:07 +00:00
commit-bot@chromium.org
9e90aed5de
Rename GrGLBinding->GrGLStandard, no longer a bitfield
...
BUG=skia:2042
R=jvanverth@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/133413003
git-svn-id: http://skia.googlecode.com/svn/trunk@13108 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-16 16:35:09 +00:00
commit-bot@chromium.org
f7ba41321b
Hide bitmap rowbyes assert when LEGACY_ONLOCKPIXELS
...
Motivation: without this, we break Blink.
BUG=skia:
NOTREECHECKS=true
NOTRY=true
R=robertphillips@google.com
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/140903002
git-svn-id: http://skia.googlecode.com/svn/trunk@13107 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-16 15:47:06 +00:00
commit-bot@chromium.org
3aa7a02b65
SK_API SkMallocPixelRef
...
Motivation: make https://codereview.chromium.org/138393002/ work.
R=reed@google.com , djsollen@google.com , bsalomon@google.com
Author: halcanary@google.com
Review URL: https://codereview.chromium.org/135853019
git-svn-id: http://skia.googlecode.com/svn/trunk@13106 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-16 14:46:16 +00:00
skia.committer@gmail.com
f5e67c12c8
Sanitizing source files in Housekeeper-Nightly
...
git-svn-id: http://skia.googlecode.com/svn/trunk@13105 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-16 07:01:48 +00:00
commit-bot@chromium.org
c665804300
Move SkMessageBus::Get out of header, and retry crrev.com/106563002.
...
BUG=
R=bsalomon@google.com , kkinnunen@nvidia.com
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/140053002
git-svn-id: http://skia.googlecode.com/svn/trunk@13104 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-15 23:09:01 +00:00
commit-bot@chromium.org
b06faacaf1
Factor out UnPreMultiplyPreservingByteOrder
...
BUG=
R=reed@google.com
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/130303005
git-svn-id: http://skia.googlecode.com/svn/trunk@13103 2bbb7eff-a529-9590-31e7-b0007b416f81
2014-01-15 22:24:58 +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