AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,727 Commits 1 Branch 0 Tags 544 MiB
323ca781f1
Commit Graph

8727 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
skia.committer@gmail.com
b74bdf0249 Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@10842 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-21 07:01:29 +00:00
vandebo@chromium.org
0dcbece326 Support multiple PDF rendering backends in the GM 
R=epoger@google.com, vandebo@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10841 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 23:08:40 +00:00
robertphillips@google.com
147c4f3e0c Chromium's clang bots do not like the SkASSERT(!"foo") construct 
git-svn-id: http://skia.googlecode.com/svn/trunk@10840 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 21:41:15 +00:00
commit-bot@chromium.org
941df4fb5b Add validation check that linewidth func is present (we already call it on ES). 
R=robertphillips@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10839 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 20:54:08 +00:00
djsollen@google.com
2b343cc255 create a macro for testing if skcolor and skpmcolor have same shift values 
R=reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10838 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 20:28:03 +00:00
commit-bot@chromium.org
6364b5edc3 Use ES3 texture swizzling. 
R=jvanverth@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10837 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 20:22:52 +00:00
commit-bot@chromium.org
9504575438 Add perf benchmarks and more unit tests for matrix inversion 
R=jvanverth@google.com, reed@google.com

Author: shawnsingh@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10836 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 20:15:24 +00:00
robertphillips@google.com
9b051a375b Revert r10830 (Split SkDevice out of SkRasterDevice) until we can get Chromium ready. 
git-svn-id: http://skia.googlecode.com/svn/trunk@10835 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 20:06:40 +00:00
edisonn@google.com
8cee797901 pdfviewer: check in pdfapi classes 
Review URL: https://codereview.chromium.org/22900010

git-svn-id: http://skia.googlecode.com/svn/trunk@10834 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 18:56:49 +00:00
commit-bot@chromium.org
327c081e4b Add libpoppler for PDF rendering, take 2 
R=vandebo@chromium.org, edisonn@google.com

Author: richardlin@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10833 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 18:57:01 +00:00
commit-bot@chromium.org
139484095f Move gpu conic calculations to GrPathUtils 
BUG=
R=bsalomon@google.com, jvanverth@google.com

Author: egdaniel@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10832 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 17:55:43 +00:00
djsollen@google.com
9615fed005 Add a GM to test the clipping of canvas layers. 
R=tomhudson@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10831 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 17:54:33 +00:00
robertphillips@google.com
3055b70018 Split SkDevice out of SkBitmapDevice 
https://codereview.chromium.org/22978012/



git-svn-id: http://skia.googlecode.com/svn/trunk@10830 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 17:49:04 +00:00
edisonn@google.com
4eaa6647e7 pdfviewer: remove text for pdf spec, in preparation to check-in only the PDF API. 
Review URL: https://codereview.chromium.org/22865024

git-svn-id: http://skia.googlecode.com/svn/trunk@10829 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 17:33:08 +00:00
vandebo@chromium.org
54c538e9a5 Revert "The CL adds libpoppler to DEPS and adds a libpoppler-cpp gyp target for Linux, Windows, and Mac. This does not currently change the GM tool to use poppler - that will be a refactor job in a separate CL." 
This reverts commit r10823
TBR=richardlin@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10828 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 17:06:22 +00:00
mtklein@google.com
ba0ca99b83 CHECK -> SKTDYNAMICHASH_CHECK, to avoid collision with CHECK in Chrome logging. 
BUG=
R=robertphillips@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10827 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 17:03:02 +00:00
robertphillips@google.com
2cc0b47a9b Third (and hopefully final) change to support bleed flag in Ganesh 
https://codereview.chromium.org/23172013/



git-svn-id: http://skia.googlecode.com/svn/trunk@10826 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 16:51:20 +00:00
mtklein@google.com
9e3074e968 use SkTDynamicHash in picture recording 
cleaned up SkPictureFlat.h quite a bit while working on this.

bench --match picture_record_ shows some improvement:
compare.sh bench --match picture_record_ --repeat 100
master -> usehash
N=3 p=0.001000 (corrected to 0.000333)
sig? rel. speed  bench
  y      1.0x  picture_record_dictionaries
  y      1.5x  picture_record_recurring_paint_dictionary
  y      3.8x  picture_record_unique_paint_dictionary
Overall relative speed:   1.9x

bench_pictures --record is pretty much neutral:
compare.sh bench_pictures -r ../skp --mode record --repeat 30
master -> usehash
N=63 p=0.001000 (corrected to 0.000016)
sig? rel. speed  bench
  n      0.9x  desk_pokemonwiki.skp
  y      0.9x  desk_googlespreadsheet.skp
  y      0.9x  tabl_pravda.skp
  y      1.0x  desk_googlespreadsheetdashed.skp
  n      1.0x  tabl_onlinewsj.skp
  n      1.0x  tabl_nytimes.skp
  n      1.0x  desk_googlehome.skp
  y      1.0x  desk_techcrunch.skp
  n      1.0x  tabl_slashdot.skp
  n      1.0x  tabl_techmeme.skp
  n      1.0x  desk_googleplus.skp
  n      1.0x  desk_sfgate.skp
  n      1.0x  tabl_transformice.skp
  n      1.0x  desk_espn.skp
  n      1.0x  desk_baidu.skp
  n      1.0x  tabl_worldjournal.skp
  n      1.0x  desk_chalkboard.skp
  n      1.0x  tabl_frantzen.skp
  n      1.0x  desk_gws.skp
  n      1.0x  tabl_androidpolice.skp
  n      1.0x  desk_linkedin.skp
  n      1.0x  mobi_wikipedia.skp
  n      1.0x  desk_wowwiki.skp
  n      1.0x  desk_css3gradients.skp
  n      1.0x  desk_gmailthread.skp
  n      1.0x  desk_yahoogames.skp
  n      1.0x  desk_facebook.skp
  n      1.0x  desk_wordpress.skp
  n      1.0x  tabl_vnexpress.skp
  n      1.0x  desk_br337.skp
  n      1.0x  tabl_engadget.skp
  n      1.0x  tabl_theverge.skp
  n      1.0x  desk_amazon.skp
  n      1.0x  desk_ebay.skp
  n      1.0x  tabl_hsfi.skp
  n      1.0x  tabl_sahadan.skp
  n      1.0x  desk_weather.skp
  n      1.0x  tabl_digg.skp
  n      1.0x  desk_youtubetvbrowse.skp
  n      1.0x  tabl_culturalsolutions.skp
  n      1.0x  tabl_ukwsj.skp
  n      1.0x  desk_youtube.skp
  n      1.0x  tabl_googlecalendar.skp
  y      1.0x  desk_yahooanswers.skp
  n      1.0x  desk_blogger.skp
  n      1.0x  desk_yahoonews.skp
  y      1.0x  desk_yahoosports.skp
  y      1.0x  tabl_mercurynews.skp
  n      1.0x  desk_youtubetvvideo.skp
  y      1.0x  tabl_gspro.skp
  y      1.1x  tabl_googleblog.skp
  y      1.1x  tabl_cnet.skp
  y      1.1x  tabl_mlb.skp
  y      1.1x  tabl_cuteoverload.skp
  y      1.1x  desk_booking.skp
  y      1.1x  tabl_deviantart.skp
  y      1.1x  desk_twitter.skp
  y      1.1x  tabl_cnn.skp
  y      1.1x  tabl_gamedeksiam.skp
  y      1.1x  tabl_gmail.skp
  y      1.1x  tabl_nofolo.skp
  y      1.1x  tabl_mozilla.skp
  y      1.1x  desk_pinterest.skp
Overall relative speed:   1.0x

(I'd take this to mean that the microbenches are probably drifting away from relevance.)
BUG=
R=reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10825 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 16:48:47 +00:00
commit-bot@chromium.org
85e9db0347 The CL adds libpoppler to DEPS and adds a libpoppler-cpp gyp target for Linux, Windows, and Mac. This does not currently change the GM tool to use poppler - that will be a refactor job in a separate CL. 
Several third-party libraries are pulled in, and platform-specific headers are included under third_party/(library name). Chromium style READMEs containing a description of the library, as well as a LICENSE file are also included in that directory. (is there a Skia-specific style for these?)

R=vandebo@chromium.org, edisonn@google.com, djsollen@chromium.org, bungeman@chromium.org, open-source-third-party-reviews@google.com, thestig@chromium.org

Author: richardlin@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10823 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 16:34:34 +00:00
commit-bot@chromium.org
edd18989ac Tweak Matrix44 test so it'll pass on ChromeOS 
BUG=
R=robertphillips@google.com

Author: jvanverth@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10822 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 16:28:42 +00:00
epoger@google.com
fd040116c5 Remove base-* directories from gm expected/actual paths; just use platform names 
BUG=skia:1512

The buildbot master continues to set gm_image_subdir, but the slaves no longer
use that component when building GM paths (they just use builder_name instead).
But gm_image_subdir is still used for SKP storage paths under
gs://chromium-skia-gm/playback/gm-actual , for now...

Immediately before committing this CL, I will copy the actual-results.json files
from their old locations to their new locations (within the skia-autogen repo)
so that both old and new versions of rebaseline.py will be able to retrieve
actual results, like so:

svn cp base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus Test-Android-GalaxyNexus-SGX540-Arm7-Debug
svn cp base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Release/base-android-galaxy-nexus Test-Android-GalaxyNexus-SGX540-Arm7-Release
svn cp base-android-nexus-10/Test-Android-Nexus10-MaliT604-Arm7-Debug/base-android-nexus-10 Test-Android-Nexus10-MaliT604-Arm7-Debug
...
svn cp base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Debug/base-shuttle-win7-intel-float Test-Win7-ShuttleA-HD2000-x86-Debug
svn cp base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float Test-Win7-ShuttleA-HD2000-x86-Release


Once we see this CL land successfully, I will delete the actual-results.json
files from their OLD location within skia-autogen, like so:

svn rm base-android-galaxy-nexus
svn rm base-android-nexus-10
...
svn rm base-shuttle-win7-intel-directwrite
svn rm base-shuttle-win7-intel-float

R=borenet@google.com, rmistry@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10821 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 16:21:55 +00:00
commit-bot@chromium.org
c5dffe4b52 Update renderable configs for ES3 
R=jvanverth@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10819 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 15:25:21 +00:00
commit-bot@chromium.org
f02f07835e Make SkMatrix44::invert() check for finite 1/det instead of magic value 
Previously we were checking to see if the magnitude of
determinant of the matrix to be inverted was less than 
1.0e-8, which is a magic number possibly plucked from 
Graphics Gems. After some discussion, it's been determined 
(ha) that we can simply check to see if 1/det is finite and 
if so proceed.

BUG=222926

Committed: http://code.google.com/p/skia/source/detail?r=10758

R=reed@google.com, shawnsingh@chromium.org

Author: jvanverth@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10818 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 15:25:04 +00:00
commit-bot@chromium.org
70ed38b58c Re-enable fontscaler GM for Android 
R=bsalomon@google.com

Author: jvanverth@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10817 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 15:24:27 +00:00
bungeman@google.com
4348663da8 Fix stack buffer read overflow in GrConvolutionEffect::TestCreate. 
BUG=skia:1532
R=bsalomon@google.com, robertphillips@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10816 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 15:20:34 +00:00
commit-bot@chromium.org
8700295fba Change comments about size internal formats 
R=robertphillips@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10815 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 15:12:01 +00:00
commit-bot@chromium.org
858638d8a5 Add direct bezier cubic support for GPU shaders 
BUG=
R=bsalomon@google.com, jvanverth@google.com, robertphillips@google.com

Author: egdaniel@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10814 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 14:45:45 +00:00
robertphillips@google.com
bcb88e51cd Revert r10788 (allow both GDI and DW fontmgrs at the same time) due to Chromium XP bot failures 
git-svn-id: http://skia.googlecode.com/svn/trunk@10813 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 14:36:59 +00:00
jvanverth@google.com
bee5f97c73 Final rebaselines for r10769. 
(SkipBuildbotRuns)


git-svn-id: http://skia.googlecode.com/svn/trunk@10812 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 14:31:59 +00:00
bsalomon@google.com
3323c4d341 Revert "Changed rules about sized internal formats on GLES3." 
This reverts commit r10806.

git-svn-id: http://skia.googlecode.com/svn/trunk@10811 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 13:48:33 +00:00
robertphillips@google.com
4146413c96 Fix merge problem between r10805 and 10803 
git-svn-id: http://skia.googlecode.com/svn/trunk@10810 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 12:28:23 +00:00
commit-bot@chromium.org
2e915b3234 Add correctness test to bbh_shootout. 
R=caryclark@google.com, reed@google.com

Author: sglez@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10809 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 12:23:18 +00:00
commit-bot@chromium.org
d28063e491 Replace uses of GR_API by SK_API. 
R=bsalomon@google.com, robertphillips@google.com

Author: tfarina@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10808 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 12:23:06 +00:00
djsollen@google.com
a61ba109bf default to device type of last build if no device type is given 
R=borenet@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10807 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 12:22:57 +00:00
commit-bot@chromium.org
c0b9b20ba6 Changed rules about sized internal formats on GLES3. 
R=jvanverth@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10806 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 12:22:48 +00:00
robertphillips@google.com
31acc11977 Fix name of "bleed" flag 
https://codereview.chromium.org/22812014/



git-svn-id: http://skia.googlecode.com/svn/trunk@10805 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 12:13:48 +00:00
robertphillips@google.com
8d3c640b5a Fix for nested rect drawing bug 
https://codereview.chromium.org/22824016/



git-svn-id: http://skia.googlecode.com/svn/trunk@10804 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 12:11:31 +00:00
robertphillips@google.com
d7ca66176f Update tiled bitmap path to respect bleed flag 
https://codereview.chromium.org/23261003/



git-svn-id: http://skia.googlecode.com/svn/trunk@10803 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 12:09:32 +00:00
skia.committer@gmail.com
93a7145a2a Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@10802 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-20 07:01:14 +00:00
bungeman@google.com
c58795f6f2 Remove unused typedef. 
git-svn-id: http://skia.googlecode.com/svn/trunk@10801 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-19 21:28:18 +00:00
bungeman@google.com
ffe95f5414 Fix size_t to int conversion warning on Win64 in SkRTConf.h. 
Review URL: https://codereview.chromium.org/23213004

git-svn-id: http://skia.googlecode.com/svn/trunk@10800 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-19 20:05:38 +00:00
scroggo@google.com
287068c37f Refer to the correct file for rebaselining benches. 
The file has moved, so update the instructions in the
expectations file.

R=bensong@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10799 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-19 18:51:32 +00:00
mtklein@google.com
361a72fc45 add new GM to try to reproduce a bug 
BUG=7671058
R=djsollen@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10798 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-19 18:43:34 +00:00
scroggo@google.com
8b71ef16ec skia: Added SkDiscardableMemory interface. 
Chrome's implementation of SkDiscardableMemory is provided here:
https://codereview.chromium.org/23206002. SkDiscardableMemory is
intended to be used for image caching.

R=reed@google.com, scroggo@google.com, hclam@chromium.org, jamesr@chromium.org
BUG=229120

Author=ernstm@chromium.org

Submitted on behalf of ernstm@chromium.org due to commit queue bug.

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10797 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-19 18:38:08 +00:00
borenet@google.com
cb9445de82 Add libraries to fix Ubuntu13 Clang build 
R=bungeman@google.com, djsollen@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10796 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-19 18:26:04 +00:00
borenet@google.com
8341c2a4f7 Whitespace change to test bots 
Review URL: https://codereview.chromium.org/23331002

git-svn-id: http://skia.googlecode.com/svn/trunk@10794 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-19 17:30:50 +00:00
rmistry@google.com
ccdb3873b6 Whitespace change to test the new master. 
git-svn-id: http://skia.googlecode.com/svn/trunk@10793 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-19 13:35:47 +00:00
skia.committer@gmail.com
7475811143 Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@10790 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-17 07:01:54 +00:00
tfarina@chromium.org
f6de475e5c Replace uses of GrAssert by SkASSERT. 
R=bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10789 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-17 00:02:59 +00:00
bungeman@google.com
069975678a allow both GDI and DW fontmgrs at the same time 
BUG=
R=bungeman@google.com

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

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10788 2bbb7eff-a529-9590-31e7-b0007b416f81
 2013-08-16 20:31:11 +00:00