Commit Graph

1153 Commits

Author SHA1 Message Date
edisonn@google.com
23e899bef2 pdfviewer: fix typo in sample app
Review URL: https://codereview.chromium.org/22861007

git-svn-id: http://skia.googlecode.com/svn/trunk@10781 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-16 17:01:24 +00:00
edisonn@google.com
63ce82fb41 pdfviewer: (cleanup) put the gyp for library code in a separate file
Review URL: https://codereview.chromium.org/23038004

git-svn-id: http://skia.googlecode.com/svn/trunk@10779 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-16 16:13:44 +00:00
commit-bot@chromium.org
8f4269725b This bench attempts to recreate Chromium's Canvas_putImageData performance test to track down https://code.google.com/p/chromium/issues/detail?id=270649.
Cranking the repitition count up to 500 on a MacPro yields:

WITHOUT 10624:
running bench [640 480]            writepix_rgba_UPM  8888: cmsecs = 748.25   GPU: cmsecs = 225.95 gmsecs = 244.80
running bench [640 480]             writepix_rgba_PM  8888: cmsecs =  54.12   GPU: cmsecs = 225.77 gmsecs = 244.59

WITH 10624:
running bench [640 480]            writepix_rgba_UPM  8888: cmsecs = 747.70   GPU: cmsecs = 230.30 gmsecs = 249.51
running bench [640 480]             writepix_rgba_PM  8888: cmsecs =  55.05   GPU: cmsecs = 230.13 gmsecs = 249.38

R=bsalomon@google.com

Author: robertphillips@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10761 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-16 00:40:34 +00:00
robertphillips@google.com
968863f818 Revert r10718 to unblock roll
git-svn-id: http://skia.googlecode.com/svn/trunk@10759 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-15 22:42:54 +00:00
mtklein@google.com
2822c9a92b Nobody defines SK_SUPPORT_HINTING_SCALE_FACTOR any more, so remove it.
I left the dummy value in the flattened paint.  I'm hoping to do an overhaul of
the paint serialization format which will need a picture version bump anyway,
so it can all go together.  If that doesn't pan out we can remove this on its
own later.

BUG=
R=reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10757 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-15 21:20:14 +00:00
scroggo@google.com
12bf9b35d2 Revert "Unpremultiply SkBitmaps for PDF output"
This reverts commit 16a6c9d28c8ef6f827d50ef258005fa5ec971bd9.

Seems to be breaking all of the windows debug bots in GM.

git-svn-id: http://skia.googlecode.com/svn/trunk@10737 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-15 14:51:04 +00:00
skia.committer@gmail.com
936be472b5 Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@10727 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-15 07:01:06 +00:00
edisonn@google.com
fb7b1bf534 pdfviewer: workaround gyp issue with multiple files, not being translated into an array in linux (works in mac, as per spec)
Review URL: https://codereview.chromium.org/23157003

git-svn-id: http://skia.googlecode.com/svn/trunk@10726 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-14 22:05:06 +00:00
commit-bot@chromium.org
5d18cee176 Unpremultiply SkBitmaps for PDF output
BUG=skia:236, chromium:175548
R=vandebo@chromium.org, edisonn@google.com, reed@google.com

Author: richardlin@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10725 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-14 22:02:23 +00:00
commit-bot@chromium.org
24ab3b0ce5 Add blend optimization helpers and use to convert rect draws to clears.
R=robertphillips@google.com, jvanverth@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10723 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-14 21:56:37 +00:00
edisonn@google.com
33f11b6fcd pdfviewer: make pdfviewer compile on mac
Review URL: https://codereview.chromium.org/23163007

git-svn-id: http://skia.googlecode.com/svn/trunk@10721 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-14 21:35:27 +00:00
reed@google.com
7d65dee189 allow both GDI and DW fontmgrs at the same time
BUG=
R=bungeman@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10718 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-14 18:59:28 +00:00
edisonn@google.com
3aa355527a pdfviewer: 1) debug code for drawText (show magenta background for text, to show text even when we fail to load/show it), 2) some cleanup: refactor and rename classes and files
Review URL: https://codereview.chromium.org/23020003

git-svn-id: http://skia.googlecode.com/svn/trunk@10716 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-14 18:26:20 +00:00
commit-bot@chromium.org
c1bf2de835 Fix crash when querying a runtime config that is defined in environment
Fix crash when querying a runtime config in case when there's no
skia.conf file and the config variable is still defined in the
environment.

Runs the added SkRTConf::UnitTest test as part of new "UnitTest" test.

Previous version of the patch failed Windows build due to setenv usage.
On Windows, use _putenv_s instead.

BUG=skia:1494
R=bsalomon@google.com, humper@google.com

Author: kkinnunen@nvidia.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10715 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-14 18:14:37 +00:00
djsollen@google.com
d4236574cf Prevent picture recording from over optimizing the culling of clips.
BUG=skia:1496
R=mtklein@google.com, reed@google.com, robertphillips@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10689 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-13 14:29:06 +00:00
djsollen@google.com
2cad2c04c3 fix malformed gypi file that was missing commas
R=torne@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10678 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-12 14:57:54 +00:00
djsollen@google.com
cc95b1aeb8 Update Skia Android tools.
This CL moves the skia_launcher out of the system/bin and into
/data/local/tmp; removes the need to package our shared libs in an
apk; and updates all the scripts to work in the new environment.

R=mtklein@google.com, scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10673 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-12 12:30:04 +00:00
robertphillips@google.com
1c0ade7fc6 Reverted r10654 (Fix crash when querying a runtime config that is defined in environment) due to compilation failure on Chromium win_layout bot
git-svn-id: http://skia.googlecode.com/svn/trunk@10669 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-11 13:20:18 +00:00
djsollen@google.com
a8797b966f remove include from the header paths
R=robertphillips@google.com, torne@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10664 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-09 16:11:36 +00:00
djsollen@google.com
ee05f759c8 Remove exported headers and add all public headers into dictionary for reference by clients.
R=robertphillips@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10661 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-09 15:45:35 +00:00
commit-bot@chromium.org
a1007def7e Fix crash when querying a runtime config that is defined in environment
Fix crash when querying a runtime config in case when there's no
skia.conf file and the config variable is still defined in the
environment.

Runs the added SkRTConf::UnitTest test as part of new "UnitTest" test.

BUG=skia:1494
R=bsalomon@google.com, humper@google.com

Author: kkinnunen@nvidia.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10654 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-09 13:23:56 +00:00
skia.committer@gmail.com
17f1ae63d5 Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@10650 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-09 07:01:22 +00:00
commit-bot@chromium.org
c28f555f7f This attempts to replicate some bad cache behavior Mozilla reported.
R=bsalomon@google.com

Author: robertphillips@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10649 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-08 22:55:21 +00:00
commit-bot@chromium.org
103f2d0f22 Add new GM to targeted at rect->clear optimization with different xfermodes.
R=robertphillips@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10645 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-08 21:13:38 +00:00
commit-bot@chromium.org
34504ad924 Adding 2 functions to the Skia API
I need wrappers for both SkOrderedReadBuffer and SkOrderedWriteBuffer inside Chromium in order to do the IPC serialization of Skia SkImageFilter objects.

See https://codereview.chromium.org/21271002/

BUG=
R=djsollen@google.com, scroggo@google.com, reed@google.com

Author: sugoi@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10642 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-08 19:20:05 +00:00
edisonn@google.com
768bc6a920 pdfviewer: add ability to run on gpu
Review URL: https://codereview.chromium.org/22684002

git-svn-id: http://skia.googlecode.com/svn/trunk@10638 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-08 12:42:13 +00:00
djsollen@google.com
1efccd297e Create a gypi that contains all the SK_API header files for use by clients (i.e. chromium).
R=robertphillips@google.com, torne@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10637 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-08 12:31:05 +00:00
commit-bot@chromium.org
d2623a1a0b Use Path Ops to generate PDF clips
R=vandebo@chromium.org, edisonn@google.com, caryclark@google.com

Author: richardlin@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10633 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-08 02:52:05 +00:00
junov@chromium.org
f44fcdca01 Upstreaming DropShadowImageFilter into skia, from Blink
GM imagefiltersbase will need rebaselining after this change

R=senorblanco@chromium.org

Committed: https://code.google.com/p/skia/source/detail?r=10583

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10626 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-07 20:00:55 +00:00
scroggo@google.com
8dc8bc5547 Add downsample from 8888 to 4444.
Extend SkBitmap::copyTo to copy from a source with
SkARGB_8888_Config to a destination bitmap with
SkARGB_4444_Config.

BUG=http://code.google.com/p/chromium/issues/detail?id=245774
R=reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10621 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-07 19:16:05 +00:00
reed@google.com
ebbda765e1 enable SK_FONTHOST_USES_FONTMGR for mac and win. linux fontmgr not ready
BUG=

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10605 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-07 15:30:09 +00:00
bsalomon@google.com
75796db3b3 Revert "Add blend optimization helpers and use to convert rect draws to clears."
This reverts commit r10537.

git-svn-id: http://skia.googlecode.com/svn/trunk@10601 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-07 13:34:14 +00:00
commit-bot@chromium.org
1c4c9ef437 Move SkComposeImageFilter into its own {.h, .cpp} files
In http://crrev.com/21154002, SkComposeImageFilter will be used
outside of tests. Consequently, this moves SkComposeImageFilter from
SkTestImageFilters.{h, cpp} into its own {.h, .cpp} files.

BUG=181613
R=senorblanco@chromium.org

Author: ajuma@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10591 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-07 00:07:51 +00:00
jvanverth@google.com
9c8b4eaf28 Reverting r10583: Upstreaming DropShadowImageFilter into skia, from Blink
git-svn-id: http://skia.googlecode.com/svn/trunk@10587 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-06 21:12:59 +00:00
junov@chromium.org
d8e4024719 Upstreaming DropShadowImageFilter into skia, from Blink
GM imagefiltersbase will need rebaselining after this change

R=senorblanco@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10583 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-06 20:01:40 +00:00
commit-bot@chromium.org
4460de4e9e Tweak -mssse3 on Mac a little.
Using OTHER_CPLUSPLUSFLAGS instead of OTHER_CFLAGS will append -mssse3 into the
argument list instead of overwriting as the old note warns about.  (So it's
actually there twice now for the files in opts_ssse3, and we can still build if
we remove -mssse3 from common_conditions.gypi.)

We could also just delete this clause entirely given that
common_conditions.gypi sets it anyway.  Which do you think is best?  This code
won't compile unless _someone_ has set -mssse3.  Seems to me the redundancy
helps communicate that and protect against changes in common_conditions.gypi.

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

Author: mtklein@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10573 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-06 18:13:01 +00:00
commit-bot@chromium.org
c1cdf21ab8 Add blend optimization helpers and use to convert rect draws to clears.
Committed: http://code.google.com/p/skia/source/detail?r=10537

R=robertphillips@google.com, jvanverth@google.com, reed@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10562 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-06 15:07:23 +00:00
commit-bot@chromium.org
f916f9e7cf revise SkTDynamicHash and add unit tests
BUG=
R=reed@google.com

Author: mtklein@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10552 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-05 22:31:20 +00:00
bsalomon@google.com
9b6a185e36 Revert "Add blend optimization helpers and use to convert rect draws to clears."
This reverts commit r10537.

git-svn-id: http://skia.googlecode.com/svn/trunk@10542 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-05 18:27:23 +00:00
edisonn@google.com
5149bd954b pdfviewer: set backdround to transparent, and add an app to chop transparent content in png files.
Review URL: https://codereview.chromium.org/21981008

git-svn-id: http://skia.googlecode.com/svn/trunk@10538 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-05 17:26:11 +00:00
commit-bot@chromium.org
66017f6cc5 Add blend optimization helpers and use to convert rect draws to clears.
R=robertphillips@google.com, jvanverth@google.com, reed@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10537 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-05 16:55:55 +00:00
djsollen@google.com
6a6c80c6e3 Enable SkUtilsArm on all ARM platforms and always use NDK compliant NEON detection on Android.
R=scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10530 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-05 13:38:28 +00:00
commit-bot@chromium.org
19dd017a62 Fix a crash on stroking empty paths with nv_path_rendering enabled
Fix the crash by defining that GrPathRenderer::drawPath and
GrPathRenderer::stencilPath are called only with non-empty paths.

Adds a new test "GpuDrawPath" and tests the condition.

BUG=1477
R=bsalomon@google.com

Author: kkinnunen@nvidia.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10528 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-05 13:28:55 +00:00
commit-bot@chromium.org
7e5d18664b In preparation for make Chromium's skia.gyp use pdf.gypi.
R=edisonn@google.com, djsollen@google.com

Author: robertphillips@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10526 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-04 15:09:23 +00:00
bsalomon@google.com
aade2e1e19 Add fullscreen rect bench
R=robertphillips@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10510 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-02 14:39:25 +00:00
scroggo@google.com
d4c3565aac Fixes for JPEG subset decoding.
Ensure that the stream passed to JPEG for subset decoding is
neither deleted before it is no longer needed nor deleted an
extra time.

src/images/SkJpegUtility.h:
src/images/SkJpegUtility.cpp:
Always ref and unref the stream provided to skjpeg_source_mgr.
Add some comments explaining how skjpeg_source_mgr's members
handle ownership.
Fix a warning comparing signed and unsigned numbers, converting
to size_t which is more appropriate for measuring bytes.
Remove dead code referring to fMemoryBase and fMemoryBaseSize,
which are never used.

src/images/SkImageDecoder_libjpeg.cpp:
Call the new constructor for skjpeg_source_mgr, which no longer
takes a boolean to determine ownership.

include/images/SkBitmapRegionDecoder.h
src/images/SkBitmapRegionDecoder.cpp:
This small shim has been removed, since it is not needed to use
Skia's image decoders. Its functionality will be folded into
Android.

Required for the merge to Android.

R=djsollen@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10483 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-01 15:03:42 +00:00
senorblanco@chromium.org
350b4d50ea Remove SkBlendImageFilter, and all tests. Its functionality has been subsumed by SkXfermodeImageFilter.
R=robertphillips@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10482 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-08-01 14:59:05 +00:00
commit-bot@chromium.org
92ffe7d10e Inverse fill support in PDF
BUG= https://code.google.com/p/skia/issues/detail?id=241 (partial fix)
R=edisonn@google.com, vandebo@chromium.org, reed@google.com

Author: richardlin@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10476 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-31 22:54:31 +00:00
mtklein@google.com
d9d5c05b50 Enable runtime checks for SSSE3 on x86 on Android.
$ compare-android.sh bench --match bitmap_ --repeat 30
master -> ssse3
N=30 p=0.001000 (corrected to 0.000033)
sig?  speedup  bench
  n    -1.16%  bitmap_scale_filter_256_64
  y    -0.72%  bitmap_8888_A_scale_bicubic
  y    -0.21%  bitmap_index8_A
  n    -0.00%  bitmap_565
  n    -0.00%  bitmap_scale_filter_90_80
  n     0.03%  bitmap_8888_A_source_transparent
  y     0.06%  bitmap_index8
  y     0.30%  bitmap_8888_A_source_stripes_two
  n     0.34%  bitmap_scale_filter_80_90
  y     0.42%  bitmap_8888_A
  y     0.44%  bitmap_8888_A_source_opaque
  n     0.53%  bitmap_scale_filter_90_10
  y     0.71%  bitmap_8888_A_source_stripes_three
  y     0.91%  bitmap_8888_A_scale_rotate_bicubic
  y     1.04%  bitmap_8888_update
  n     1.19%  bitmap_scale_filter_10_90
  n     1.39%  bitmap_scale_filter_90_90
  y     1.77%  bitmap_8888_update_volatile
  y     1.89%  bitmap_8888
  y     2.37%  bitmap_scale_filter_30_90
  y     9.57%  bitmap_scale_filter_64_256
  n    17.86%  bitmap_scale_filter_90_30
  y    25.40%  bitmap_8888_A_scale_rotate_bilerp
  y    27.19%  bitmap_8888_scale_rotate_bilerp
  y    27.23%  bitmap_8888_update_scale_rotate_bilerp
  y    27.29%  bitmap_8888_update_volatile_scale_rotate_bilerp
  y    55.08%  bitmap_8888_A_scale_bilerp
  y    58.75%  bitmap_8888_update_volatile_scale_bilerp
  y    58.90%  bitmap_8888_scale_bilerp
  y    58.92%  bitmap_8888_update_scale_bilerp
Overall speedup: 10.52%

BUG=skia:1111
R=djsollen@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10474 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-31 20:09:25 +00:00
reed@google.com
e027a6ed9b adapt FontConfig to use SK_FONTHOST_USES_FONTMGR
BUG=

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10463 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-07-31 17:37:31 +00:00