AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
11,415 Commits 1 Branch 0 Tags 544 MiB
defe6fdbc8
Commit Graph

11415 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
commit-bot@chromium.org
defe6fdbc8 rebaseline_server: allow user to specify which builders to process 
BUG=skia:1543,skia:1915
NOTRY=True
R=borenet@google.com

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14131 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-10 15:05:24 +00:00
commit-bot@chromium.org
c5367ec15d Rename README and DESIGN so their markdown gets picked up my GitHub. 
BUG=skia:
R=mtklein@google.com

Author: jcgregorio@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14130 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-10 14:13:23 +00:00
commit-bot@chromium.org
a94866d153 Add the chromium ninja builder to the list of trybots for a DEPS roll. 
R=robertphillips@google.com, borenet@google.com

Author: djsollen@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14129 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-10 14:10:08 +00:00
bensong@google.com
729296f7db revert of 14111 to fix build 
git-svn-id: http://skia.googlecode.com/svn/trunk@14128 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-10 12:46:36 +00:00
skia.committer@gmail.com
6b43f50761 Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@14127 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-10 03:05:44 +00:00
commit-bot@chromium.org
ff2de7cb94 SkRecordDraw: don't bother clipping an empty clip down further 
BUG=skia:2378
R=fmalita@chromium.org, mtklein@google.com, fmalita@google.com

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14126 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-10 02:26:33 +00:00
commit-bot@chromium.org
fe23f7978f Revert of remove sprintf (https://codereview.chromium.org/230413005/) 
Reason for revert:
Boo, hiss, SK_ARRAY_COUNT not defined in skia_launcher.cpp!

Original issue's description:
> remove sprintf
>
> Committed: http://code.google.com/p/skia/source/detail?r=14123

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

Author: mtklein@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14125 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 23:38:57 +00:00
commit-bot@chromium.org
d9ce2be6b2 SkRecordDraw: skip draw ops when the clip is empty 
- Adds tests for SkRecordDraw's two main features: cull- and clip- based skipping.
   - Adds full SkCanvas semantic mode to SkRecorder, so it can be used as a target for SkRecordDraw.

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

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14124 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 23:30:28 +00:00
commit-bot@chromium.org
d6e9b88468 remove sprintf 
R=mtklein@google.com

Author: halcanary@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14123 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 23:22:44 +00:00
mtklein@google.com
e4a4f12bb5 Real fix for SK_API / Windows shared lib problems. 
Ben reviewed this over my shoulder, and we tested on his machine.


git-svn-id: http://skia.googlecode.com/svn/trunk@14122 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 22:54:57 +00:00
commit-bot@chromium.org
0132a86876 Cleaned up the start page, added wait cursor, disabled Run button while waiting for results. 
BUG=skia:
R=mtklein@google.com

Author: jcgregorio@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14121 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 22:54:02 +00:00
commit-bot@chromium.org
780836e611 SK_API for SkXfermode_opts_SSE2 so Chrome can initialize flattenables. 
BUG=skia:2401
R=bungeman@google.com, mtklein@google.com

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14120 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 21:43:27 +00:00
commit-bot@chromium.org
d6cab4a6af I got too aggressive on the seccomp cleanup, turns out backports-debian doesn't have the linux/seccomp.h header. 
Also forgot one last place that referenced syscall_reporter.

BUG=skia:
R=mtklein@google.com

Author: jcgregorio@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14119 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 21:35:18 +00:00
commit-bot@chromium.org
0a09d7195b Implement drawDRRect for GPU 
BUG=skia:2259
R=jvanverth@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14118 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 21:26:11 +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
fmalita@google.com
2a6f221bf8 More SkPictureShader baselines. 
TBR=bensong@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14116 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 19:31:48 +00:00
fmalita@google.com
f8465249ba Baselines for the SkPictureShader GM. 
TBR=bensong@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14115 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 19:14:23 +00:00
commit-bot@chromium.org
6d036c2e47 Initial code for webtry, a web application for allowing users to try out Skia. 
Currently running at http://108.170.220.126:8000/

BUG=skia:
R=mtklein@google.com

Author: jcgregorio@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14114 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 18:59:44 +00:00
commit-bot@chromium.org
0257ebe4ac enable developers to provide their own android toolchain 
R=halcanary@google.com, scroggo@google.com

Author: djsollen@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14113 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 18:57:42 +00:00
commit-bot@chromium.org
093ed317cb Adjusts the bench expectations calculation to consider average value. 
BUG=skia:2225
NOTRY=true
R=borenet@google.com
TBR=borenet@google.com

Author: bensong@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14112 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 18:57:02 +00:00
reed@google.com
a2cbced5f7 no more callers of getTotalClip -- except in android 
git-svn-id: http://skia.googlecode.com/svn/trunk@14111 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 18:47:28 +00:00
commit-bot@chromium.org
1b035d82d2 Do div-by-zero check for all gpus in ellipse/rr effects. 
R=jvanverth@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14110 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 17:11:09 +00:00
bungeman@google.com
cde171860d Rebaselines for r14106. 
git-svn-id: http://skia.googlecode.com/svn/trunk@14109 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 17:09:36 +00:00
commit-bot@chromium.org
4460e75bc7 Define SK_CPU_X86 on x86 machines. 
Use this to only register flattening for SkSSE2ProcCoeffXfermode::CreateProc when it's linked.

BUG=skia:

R=reed@google.com, mtklein@google.com, bsalomon@google.com
TBR=reed@google.com
NOTRY=true
NOTREECHECKS=true

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14108 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 16:50:55 +00:00
commit-bot@chromium.org
c524e98f1e Xfermode: SSE2 implementation of multiply_modeproc 
This patch implements basics for Xfermode SSE optimization. Based on
these basics, SSE2 implementation of multiply_modeproc is provided. SSE2
implementation for other modes will come in future. With this patch
performance of Xfermode_Multiply will improve about 45%. Here are the
data on desktop i7-3770.
before:
Xfermode_Multiply   8888:  cmsecs =     33.30   565:  cmsecs =     45.65
after:
Xfermode_Multiply   8888:  cmsecs =     17.18   565:  cmsecs =     24.87

BUG=

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

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

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

Author: qiankun.miao@intel.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14107 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 15:43:46 +00:00
bungeman@google.com
d715aaa33f Measure DirectWrite BW consistently with rendering. 
Also move DirectWrite glyph drawing into the scaler context, as this
reduces duplication.

R=reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14106 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 15:35:03 +00:00
commit-bot@chromium.org
cb1926cc7a Rebaselines for https://codereview.chromium.org/181523002/ 
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>

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

Author: kevin.petit@arm.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14105 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 14:34:24 +00:00
commit-bot@chromium.org
479d1ae9b6 Fixes to Android.mk generation for arm64. 
Remove warning about no optimizations for arm64 and rebaseline the
associated test.

Exclude _opts_none.cpps when building arm64, to avoid double definitions.

BUG=skia:1975
R=halcanary@google.com, djsollen@google.com

Author: scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14104 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 13:34:26 +00:00
commit-bot@chromium.org
95c2e5532b ARM Skia NEON patches - 22 - S32_D565_Blend 
BlitRow565: new NEON version of S32_D565_Blend

This new implementation brings a good speedup in most cases and
gives exact results (removes one mismatch in gm).

Here are the benchmark results (speedup vs. existing S32A_D565_Blend):

+-------+-----------+------------+
| count | Cortex-A9 | Cortex-A15 |
+-------+-----------+------------+
| 1     | -26,7%    | -27,5%     |
+-------+-----------+------------+
| 2     | 0%        | +53%       |
+-------+-----------+------------+
| 4     | +38,3%    | +26,5%     |
+-------+-----------+------------+
| 8     | +10,9%    |  -4,5%     |
+-------+-----------+------------+
| 16    | +18,2%    | +1,6%      |
+-------+-----------+------------+
| 64    | +22,3%    | +8,75%     |
+-------+-----------+------------+
| 256   | +12,3%    | +11,2%     |
+-------+-----------+------------+
| 1024  | +79,2%    | +10,9%     |
+-------+-----------+------------+

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

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

Author: kevin.petit@arm.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14103 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 09:46:31 +00:00
skia.committer@gmail.com
e1d9443758 Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@14102 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-09 03:04:11 +00:00
commit-bot@chromium.org
506db0b7d2 SkRecord: make culling work if SkRecordAnnotateCullingPairs is called. 
- Allow stateful functors; allow visit()/mutate() at a given index; add count().
  - Annotate cull push/pop pairs on the PushCull records.  (tested)
  - Use those annotations to skip ahead in SkRecordDraw.   (not yet tested beyond dm --skr)
  - Make SkRecordDraw a function, move its implementation to a .cpp.

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

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14101 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-08 23:31:35 +00:00
commit-bot@chromium.org
9ffa52d98f More SkRecord TODOs: 
- add basic test for SkRecorder
  - rejigger GYPs so that the include dir comes along with the dependency

BUG=skia:2378

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

NOTRY=true
NOTREECHECKS=true
R=fmalita@chromium.org, mtklein@google.com

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14100 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-08 21:01:17 +00:00
commit-bot@chromium.org
b73696262c More SkRecord TODOs: 
- add basic test for SkRecorder
  - rejigger GYPs so that the include dir comes along with the dependency

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

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14099 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-08 20:17:26 +00:00
commit-bot@chromium.org
eefd8a01fc Don't try to render color fonts using distance fields. 
Adds detection of ARGB mask format, which is only used for color fonts.

BUG=skia:2173
R=bungeman@google.com, reed@google.com, bsalomon@google.com, robertphillips@google.com

Author: jvanverth@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14098 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-08 20:14:32 +00:00
commit-bot@chromium.org
066a28d2c1 Start on some unwritten SkRecord TODOs: 
- add SK_OVERRIDE for SkCanvas methods in SkRecorder
  - start on unit tests, here just for SkRecord itself

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

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14097 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-08 17:31:08 +00:00
reed@google.com
6719d60485 use default to fix warning (or I will shoot myself) 
git-svn-id: http://skia.googlecode.com/svn/trunk@14096 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-08 16:57:05 +00:00
reed@google.com
43d6d80b49 fix warning for uninitialized count 
git-svn-id: http://skia.googlecode.com/svn/trunk@14095 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-08 16:02:45 +00:00
reed@google.com
efadb4b63c fix warning about uninitialized typeface_encoding by folding glyph case into switch 
git-svn-id: http://skia.googlecode.com/svn/trunk@14094 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-08 15:48:26 +00:00
reed@google.com
bafee11dd1 fix warning by removing padding field 
git-svn-id: http://skia.googlecode.com/svn/trunk@14093 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-08 15:29:10 +00:00
commit-bot@chromium.org
c5d9bb0f67 Initial picture shader implementation 
This CL adds an SkPictureShader class to support SkPicture-based
patterns.

The implementation renders the picture into an SkBitmap tile and then
delegates to SkBitmapProcShader for the actual operation.

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

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

Author: fmalita@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14092 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-08 15:19:34 +00:00
commit-bot@chromium.org
03a99b8f96 Add push/pop cull to SkRecord. 
BUG=skia:2378
R=fmalita@google.com, mtklein@google.com, fmalita@chromium.org

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14091 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-08 15:17:17 +00:00
reed@google.com
43c27586e8 WIP -- SkFont 
BUG=skia:
R=bungeman@google.com, fmalita@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14090 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-08 15:04:29 +00:00
fmalita@google.com
667240a2e8 Relax the assert in SkReadBuffer::setPictureVersion(). 
I'm hitting this with SkPictureShader serialization because there can be
multiple pictures deserialized from the same buffer.

I think we can relax the assert to allow setting the same version
multiple times.

(Alternatively, we could guard all the callers - but since setting the
same version is a no-op, that seems overkill)

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

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14089 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-08 14:11:26 +00:00
commit-bot@chromium.org
e6d8be080d Removes deleted files SkBitmapShader* from gyp/core.gypi. 
BUG=skia:
NOTRY=true
R=robertphillips@google.com
TBR=robertphillips@google.com

Author: bensong@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14088 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-08 12:24:01 +00:00
commit-bot@chromium.org
8865d09cf8 Revert of Initial picture shader implementation (https://codereview.chromium.org/221923007/) 
Reason for revert:
breaking the buildbots. Subsequent CL only addressed CompareGMs but GenerateGMs are also failing.

Original issue's description:
> Initial picture shader implementation
>
> This CL adds an SkPictureShader class to support SkPicture-based
> patterns.
>
> The implementation renders the picture into an SkBitmap tile and then
> delegates to SkBitmapProcShader for the actual operation.
>
> R=reed@google.com,robertphillips@google.com,bsalomon@google.com
>
> Committed: http://code.google.com/p/skia/source/detail?r=14085

R=bsalomon@google.com, reed@google.com, robertphillips@google.com, fmalita@chromium.org
TBR=bsalomon@google.com, fmalita@chromium.org, reed@google.com, robertphillips@google.com
NOTREECHECKS=true
NOTRY=true

Author: bensong@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14087 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-07 23:45:31 +00:00
fmalita@google.com
98f4e5cea3 Suppress pictureshader GM failures. 
Pending baselines.

TBR=bensong@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14086 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-07 23:30:37 +00:00
commit-bot@chromium.org
592b2d13c9 Initial picture shader implementation 
This CL adds an SkPictureShader class to support SkPicture-based
patterns.

The implementation renders the picture into an SkBitmap tile and then
delegates to SkBitmapProcShader for the actual operation.

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

Author: fmalita@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14085 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-07 23:11:45 +00:00
commit-bot@chromium.org
1ae492f19b Add option to SkDecodingImageGenerator to require unpremul. 
Android needs to be able to set unpremul for purgeable
pixelRefs.

Once Android switches to the new interface, we can delete SkImageRef.

Bug=skia:2389

R=reed@google.com, halcanary@google.com

Author: scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14084 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-07 21:37:36 +00:00
commit-bot@chromium.org
fc94829337 remove SK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG 
remove SK_SUPPORT_LEGACY_GETDEVICECAPABILITIES

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

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14083 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-07 21:33:06 +00:00
commit-bot@chromium.org
c5713e484a clear bitmap in texture domain gm 
R=robertphillips@google.com
TBR=robertphillips@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14082 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-04-07 21:18:46 +00:00