bungeman@google.com
1ad75a19a1
Fix spelling errors in SkWeakRefCnt.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@12432 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-02 19:12:04 +00:00
bungeman@google.com
4d71db8530
Actually mark other types of fonts as 'kOther' in FreeType port.
...
Without this, the fType is garbage and will most likely cause an assert
or unwanted behavior later.
Review URL: https://codereview.chromium.org/99453005
git-svn-id: http://skia.googlecode.com/svn/trunk@12431 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-02 19:10:02 +00:00
robertphillips@google.com
c932c9fd77
Fix truncation of glyphs in SkScalerContext.cpp
...
https://codereview.chromium.org/99323002/
git-svn-id: http://skia.googlecode.com/svn/trunk@12430 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-02 15:43:39 +00:00
rmistry@google.com
d6bab02386
Reverting r12427
...
git-svn-id: http://skia.googlecode.com/svn/trunk@12428 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-02 13:50:38 +00:00
skia.committer@gmail.com
5b39f5ba9c
Sanitizing source files in Housekeeper-Nightly
...
git-svn-id: http://skia.googlecode.com/svn/trunk@12427 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-12-02 13:36:22 +00:00
commit-bot@chromium.org
742058f0ca
Speed up GrResourceCache lookup by inlining GrBinHashKey comparisons
...
The GCC compilers for Android and Ubuntu do not seem to be able to
inline the memcmp operations on GrBinHashKey data. Write the comparisons
manually. Also shortcut GrBinHashKey::EQ to skip comparison when hashes
do not match.
Speeds up grresourcecache_find test on ARM and x86_64. Speeds up
grresourcecache_add on x86_64.
In order to test the change, moves ad hoc Gr unit tests from
src/gr_unittest.cpp to tests/GrUnitTests to be consistent with other
tests and enables GrUnitTests.
Fixes a regression from r2863 with where re-setting GrBinHashKey data
would not set the hash correctly. This should also improve the hash
function itself. The regression caused many of the hash operations be
no-ops. This is caught by the unit test.
Renames the comparison functions that GrHashTable needs from EQ, LT to
Equals, LessThan.
Renames GrTBinHashKey to GrBinHashKey. The GrTBinHashKey used to
forward comparison functions to an ENTRY template class, which would
extract the key and call back to the GrTBinHashKey. This would save
the user from writing one comparison function when comparison was done
with int ENTRY::compare(). There's no real benefit in this now. Also
this was used only for one class (GrTextureStripAtlas). The other use
in GrResourceKey was not actually using the provided "shortcut". The
new GrBinHashKey is not templated with the entry, rather just provides
== and < functions. The users of GrTHashTable provide the needed
functions now.
Adds explicit documentation of functions that are actually needed
GrTHashTable for the Key template. Adds SK_DEBUG guards according to
the contract.
R=bsalomon@google.com , mtklein@google.com
Author: kkinnunen@nvidia.com
Review URL: https://codereview.chromium.org/88113002
git-svn-id: http://skia.googlecode.com/svn/trunk@12426 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-28 08:24:29 +00:00
skia.committer@gmail.com
9c963520ea
Sanitizing source files in Housekeeper-Nightly
...
git-svn-id: http://skia.googlecode.com/svn/trunk@12425 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-28 07:02:25 +00:00
bungeman@google.com
21591f0b5a
Remove completed TODO in SkFontMgr.h.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@12424 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-27 22:05:22 +00:00
bungeman@google.com
cb4f77d89d
Document the SkScalerContext pure virtuals.
...
R=reed@google.com
Review URL: https://codereview.chromium.org/92623002
git-svn-id: http://skia.googlecode.com/svn/trunk@12423 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-27 20:53:45 +00:00
commit-bot@chromium.org
23d2cf9b07
Trying to add the same scaled image twice shouldn't assert.
...
This unbreaks bench_pictures --multi foo for me.
BUG=skia:1868
R=reed@google.com
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/89293002
git-svn-id: http://skia.googlecode.com/svn/trunk@12422 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-27 20:22:23 +00:00
commit-bot@chromium.org
a50418f65e
Don't check the framebuffer status every time we flush when we're on Chromium;
...
this reduces the number of unnecessary command buffer flushes by about 50%
for page loads when doing Ganesh rendering, since we do a flush on clear.
BUG=
R=bsalomon@google.com
Author: humper@google.com
Review URL: https://codereview.chromium.org/92103002
git-svn-id: http://skia.googlecode.com/svn/trunk@12421 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-27 18:13:17 +00:00
commit-bot@chromium.org
dbe7f52412
ARM Skia NEON patches - 16/17 - Blitmask
...
Blitmask: NEON optimised version of the D32_A8 functions
Here are the microbenchmark results I got for the D32_A8
functions:
Cortex-A9:
==========
+-------+--------+--------+--------+
| count | Black | Opaque | Color |
+-------+--------+--------+--------+
| 1 | -14% | -39,5% | -37,5% |
+-------+--------+--------+--------+
| 2 | -3% | -29,9% | -25% |
+-------+--------+--------+--------+
| 4 | -11,3% | -22% | -14,5% |
+-------+--------+--------+--------+
| 8 | +128% | +66,6% | +105% |
+-------+--------+--------+--------+
| 16 | +159% | +102% | +149% |
+-------+--------+--------+--------+
| 64 | +189% | +136% | +189% |
+-------+--------+--------+--------+
| 256 | +126% | +102% | +149% |
+-------+--------+--------+--------+
| 1024 | +67,5% | +81,4% | +123% |
+-------+--------+--------+--------+
Cortex-A15:
===========
+-------+--------+--------+--------+
| count | Black | Opaque | Color |
+-------+--------+--------+--------+
| 1 | -24% | -46,5% | -37,5% |
+-------+--------+--------+--------+
| 2 | -18,5% | -35,5% | -28% |
+-------+--------+--------+--------+
| 4 | -5,2% | -17,5% | -15,5% |
+-------+--------+--------+--------+
| 8 | +72% | +65,8% | +84,7% |
+-------+--------+--------+--------+
| 16 | +168% | +117% | +149% |
+-------+--------+--------+--------+
| 64 | +165% | +110% | +145% |
+-------+--------+--------+--------+
| 256 | +106% | +99,6% | +141% |
+-------+--------+--------+--------+
| 1024 | +93,7% | +94,7% | +130% |
+-------+--------+--------+--------+
Blitmask: add NEON optimised PlatformBlitRowProcs16
Here are the microbenchmark results (speedup vs. C code):
+-------+-----------------+-----------------+
| | Cortex-A9 | Cortex-A15 |
| count +--------+--------+--------+--------+
| | Blend | Opaque | Blend | Opaque |
+-------+--------+--------+--------+--------+
| 1 | -19,2% | -36,7% | -33,6% | -44,7% |
+-------+--------+--------+--------+--------+
| 2 | -12,6% | -27,8% | -39% | -48% |
+-------+--------+--------+--------+--------+
| 4 | -11,5% | -21,6% | -37,7% | -44,3% |
+-------+--------+--------+--------+--------+
| 8 | +141% | +59,7% | +123% | +48,7% |
+-------+--------+--------+--------+--------+
| 16 | +213% | +119% | +214% | +121% |
+-------+--------+--------+--------+--------+
| 64 | +212% | +105% | +242% | +167% |
+-------+--------+--------+--------+--------+
| 256 | +289% | +167% | +249% | +207% |
+-------+--------+--------+--------+--------+
| 1024 | +273% | +169% | +146% | +220% |
+-------+--------+--------+--------+--------+
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
BUG=
R=djsollen@google.com , mtklein@google.com , reed@google.com
Author: kevin.petit.arm@gmail.com
Review URL: https://codereview.chromium.org/23719002
git-svn-id: http://skia.googlecode.com/svn/trunk@12420 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-27 17:08:36 +00:00
bungeman@google.com
a9a4b04a98
Fix Valgrind reports of test branching on uninitialized data.
...
Fixes reports like:
[07:10:01.235147] [ 71/188] (9) Serialization
[07:10:01.235186] ==20052== Thread 3:
[07:10:01.235223] ==20052== Conditional jump or move depends on uninitialised value(s)
[07:10:01.235259] ==20052== at 0x546632: SkRRect::setRectRadii(SkRect const&, SkPoint const*) (SkRect.h:426)
[07:10:01.735876] ==20052== by 0x546FB7: SkRRect::readFromMemory(void const*, unsigned long) (SkRRect.cpp:362)
[07:10:01.735965] ==20052== by 0x47F87F: Tests(skiatest::Reporter*) (SerializationTest.cpp:20)
[07:10:01.736007] ==20052== by 0x480367: skiatest::SerializationClass::onRun(skiatest::Reporter*) (SerializationTest.cpp:212)
[07:10:01.736048] ==20052== by 0x4881DA: skiatest::Test::run() (Test.cpp:109)
[07:10:01.736086] ==20052== by 0x482516: SkTestRunnable::run() (skia_test.cpp:155)
[07:10:01.736122] ==20052== by 0x6236E5: SkThreadPool::Loop(void*) (SkThreadPool.cpp:97)
[07:10:01.736158] ==20052== by 0x62DDB2: thread_start(void*) (SkThreadUtils_pthread.cpp:66)
[07:10:01.736192] ==20052== by 0x4E39E99: start_thread (pthread_create.c:308)
[07:10:01.736228] ==20052== by 0x6A5BCCC: clone (clone.S:112)
[07:10:01.736262] ==20052== Uninitialised value was created by a stack allocation
[07:10:01.736296] ==20052== at 0x47EC6A: Tests(skiatest::Reporter*) (SerializationTest.cpp:155)
git-svn-id: http://skia.googlecode.com/svn/trunk@12419 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-27 17:00:12 +00:00
bungeman@google.com
09800bc983
Fix warning as error on Mac for implicit narrowing conversion from r12413.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@12418 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-27 16:08:37 +00:00
bungeman@google.com
7eb2ed5dca
Ever yet even more remaining rebaslines for r12400.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@12417 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-27 15:55:57 +00:00
commit-bot@chromium.org
361270e6b9
move to newer angle
...
R=robertphillips@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/86423002
git-svn-id: http://skia.googlecode.com/svn/trunk@12416 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-27 15:43:22 +00:00
reed@google.com
43c465f2bd
fix 8->1 bugs shown by removal of A1 config
...
BUG=
Review URL: https://codereview.chromium.org/91563003
git-svn-id: http://skia.googlecode.com/svn/trunk@12415 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-27 14:47:30 +00:00
skia.committer@gmail.com
d36f7657fa
Sanitizing source files in Housekeeper-Nightly
...
git-svn-id: http://skia.googlecode.com/svn/trunk@12414 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-27 07:02:04 +00:00
commit-bot@chromium.org
c09df2c32e
Non-rect polygons are not covered in GM cases, such as triangle, trapezoid, diamond, polygons with lots of edges, concave polygons, etc, especially for stroke-style and stroke-and-fill style painters. So add a GM case to avoid potential rendering errors.
...
R=bsalomon@google.com , robertphillips@google.com
Author: yunchao.he@intel.com
Review URL: https://codereview.chromium.org/80483002
git-svn-id: http://skia.googlecode.com/svn/trunk@12413 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-27 01:24:53 +00:00
commit-bot@chromium.org
2e86551cf9
Fold bench source file list into bench.gyp.
...
It is one less file and doesn't make things much worse.
BUG=None
TEST=./gyp_skia
R=mtklein@google.com
Author: tfarina@chromium.org
Review URL: https://codereview.chromium.org/83703004
git-svn-id: http://skia.googlecode.com/svn/trunk@12412 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-27 00:44:03 +00:00
mtklein@google.com
73afd3709f
Add missing SkIntToScalars.
...
BUG=
Review URL: https://codereview.chromium.org/89663003
git-svn-id: http://skia.googlecode.com/svn/trunk@12411 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-27 00:04:15 +00:00
commit-bot@chromium.org
72ca2654ef
Fixed bad memory access
...
BUG=323595
R=senorblanco@google.com , reed@google.com , sugoi@google.com , senorblanco@chromium.org
Author: sugoi@chromium.org
Review URL: https://codereview.chromium.org/88643004
git-svn-id: http://skia.googlecode.com/svn/trunk@12410 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-26 23:52:20 +00:00
bungeman@google.com
1eeeaabfdc
Ever yet even more rebaslines for r12400.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@12409 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-26 23:37:01 +00:00
mtklein@google.com
09f2579109
DM: add --tileGrid
...
BUG=
R=epoger@google.com
Review URL: https://codereview.chromium.org/88563003
git-svn-id: http://skia.googlecode.com/svn/trunk@12408 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-26 23:36:51 +00:00
bungeman@google.com
49360dfa61
Remove unused fields from SkGlyphCache.
...
Review URL: https://codereview.chromium.org/89423003
git-svn-id: http://skia.googlecode.com/svn/trunk@12407 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-26 23:17:46 +00:00
bungeman@google.com
4d9f094349
Yet even more rebaslines for r12400.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@12406 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-26 23:15:51 +00:00
bungeman@google.com
8e637f0b7e
Even more rebaslines for r12400.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@12405 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-26 22:58:30 +00:00
bungeman@google.com
91ddcb365d
More rebaslines for r12400.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@12404 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-26 22:26:51 +00:00
bungeman@google.com
60b19b5dae
Rebasline for r12400.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@12403 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-26 22:15:49 +00:00
mtklein@google.com
ca5bb87a31
DM: write failed comparison mode .pngs one more level deep in the tree.
...
E.g. instead of having to compare
/tmp/dm/565/optimizations.png
vs.
/tmp/dm/replay/optimizations_565.png
it's now
/tmp/dm/565/optimizations.png
vs.
/tmp/dm/replay/565/optimizations.png
This lets working with skdiff go a lot more smoothly.
BUG=
R=bsalomon@google.com
Review URL: https://codereview.chromium.org/88773002
git-svn-id: http://skia.googlecode.com/svn/trunk@12402 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-26 22:06:12 +00:00
senorblanco@chromium.org
d8f82a4c44
Enhance SkDropShadowImageFilter to support separate X & Y sigmas, and crop rect. This required a new flavour of the constructor.
...
This is driven by the feDropShadow filter effect in SVG, which unlike the shorthand version accepts separate X & Y sigmas.
Covered by new GM dropshadowimagefilter.
R=reed@google.com
Review URL: https://codereview.chromium.org/88243004
git-svn-id: http://skia.googlecode.com/svn/trunk@12401 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-26 21:52:38 +00:00
bungeman@google.com
7435f34b47
Minimal changes to not crash GPU with color fonts.
...
Review URL: https://codereview.chromium.org/88993003
git-svn-id: http://skia.googlecode.com/svn/trunk@12400 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-26 20:43:27 +00:00
commit-bot@chromium.org
3daa1aed7a
Support linking skia statically on Android
...
Support linking skia statically on Android. Skia symbols should be
exported by the app library, to the extent that skia_launcher needs
them.
Syncs libskia_android.so to the device only if it exists.
R=djsollen@google.com
Author: kkinnunen@nvidia.com
Review URL: https://codereview.chromium.org/61893008
git-svn-id: http://skia.googlecode.com/svn/trunk@12399 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-26 20:39:11 +00:00
mtklein@google.com
ee21a3e395
DM: some refactoring
...
- rename ComparisonTask to ChecksumTask
- have ChecksumTask handle all the checksum-checking
- turn on all extra modes by default
- simplify progress output to a countdown
BUG=
R=bsalomon@google.com
Review URL: https://codereview.chromium.org/88543002
git-svn-id: http://skia.googlecode.com/svn/trunk@12398 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-26 18:52:31 +00:00
epoger@google.com
d7255b6ae4
rebaseline_server: make --reload work in git checkout
...
(SkipBuildbotRuns)
R=rmistry@google.com
Review URL: https://codereview.chromium.org/86343002
git-svn-id: http://skia.googlecode.com/svn/trunk@12397 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-26 17:59:28 +00:00
rmistry@google.com
7affd1fd6a
Removing 3 more SKPs to fix BenchPictures in Debug
...
git-svn-id: http://skia.googlecode.com/svn/trunk@12396 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-26 17:29:49 +00:00
rmistry@google.com
69968a3e84
Removed 3 more SKPs that were failing in Debug
...
git-svn-id: http://skia.googlecode.com/svn/trunk@12395 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-26 16:26:16 +00:00
rmistry@google.com
c56b179c7c
Removed desk_wowwiki.skp. Whitespace change to trigger rebuilds.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@12394 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-26 15:46:14 +00:00
rmistry@google.com
560cfc4877
Buildbot SKPs have been refreshed. Whitespace change to trigger rebuilds.
...
git-svn-id: http://skia.googlecode.com/svn/trunk@12393 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-26 14:43:01 +00:00
commit-bot@chromium.org
11f392ed53
Revert "Revert "remove kA1_Config, as it is no longer supported""
...
This reverts commit 36d712f2d4c5c79719280ad95523e6aaa88b068e.
BUG=
R=rmistry@google.com , mtklein@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/86483002
git-svn-id: http://skia.googlecode.com/svn/trunk@12392 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-26 12:51:57 +00:00
commit-bot@chromium.org
6300f4d1f3
Add 'skiapict' magic bytes to SkPicture format.
...
Testing: out/Debug/tests && out/Release/gm --replay --serialize
BUG=
R=fmalita@google.com , reed@google.com , fmalita@chromium.org
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/27408002
git-svn-id: http://skia.googlecode.com/svn/trunk@12391 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-26 12:46:59 +00:00
commit-bot@chromium.org
7f78611271
Clean up 4 old bytes per paint.
...
BUG=
R=reed@google.com
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/27370003
git-svn-id: http://skia.googlecode.com/svn/trunk@12390 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-26 12:46:52 +00:00
skia.committer@gmail.com
ec18ce7df6
Sanitizing source files in Housekeeper-Nightly
...
git-svn-id: http://skia.googlecode.com/svn/trunk@12389 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-26 07:02:21 +00:00
commit-bot@chromium.org
ce33d60187
Adding more validation
...
- Added a way to check that the number of inputs of a filter is not more than a filter expects
- Added validation of reftype in SkBitmap::unflatten()
- Added validation on fKD (diffuse lighting constant) and fKS (specular lighting constant) to make sure that they are always non-negative numbers
- Added validation of SkPerlinNoiseShader::fType and SkPerlinNoiseShader::fNumOctaves
BUG=
R=reed@google.com , senorblanco@google.com , mtklein@google.com , senorblanco@chromium.org , sugoi@google.com
Author: sugoi@chromium.org
Review URL: https://codereview.chromium.org/83343003
git-svn-id: http://skia.googlecode.com/svn/trunk@12388 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-25 21:46:31 +00:00
reed@google.com
72e7808d62
Revert "remove kA1_Config, as it is no longer supported"
...
This reverts commit 2d72d8b242eac6e9d30228f5b0a407236491c369.
git-svn-id: http://skia.googlecode.com/svn/trunk@12387 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-25 20:54:56 +00:00
commit-bot@chromium.org
aae7c2a5b7
Export GrGLCreateNullInterface for use in Chromium compositor unit tests.
...
R=bsalomon@google.com
Author: mvujovic@adobe.com
Review URL: https://codereview.chromium.org/86353002
git-svn-id: http://skia.googlecode.com/svn/trunk@12386 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-25 20:39:27 +00:00
commit-bot@chromium.org
4b413c8bb1
remove SkFloatToScalar macro
...
BUG=
R=reed@google.com , djsollen@google.com
Author: caryclark@google.com
Review URL: https://codereview.chromium.org/85463005
git-svn-id: http://skia.googlecode.com/svn/trunk@12385 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-25 19:44:07 +00:00
reed@google.com
2a1f4464d1
remove kA1_Config, as it is no longer supported
...
BUG=
R=djsollen@google.com
Review URL: https://codereview.chromium.org/83093005
git-svn-id: http://skia.googlecode.com/svn/trunk@12384 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-25 18:58:29 +00:00
commit-bot@chromium.org
7578b3efc6
Add logan to android_setup.sh
...
R=djsollen@google.com , bsalomon@google.com , robertphillips@google.com
Author: borenet@google.com
Review URL: https://codereview.chromium.org/82523006
git-svn-id: http://skia.googlecode.com/svn/trunk@12383 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-25 18:54:44 +00:00
robertphillips@google.com
c1ca941ff1
Rebaseline lingering (Ubuntu13) image for r12357
...
https://codereview.chromium.org/85203004/
git-svn-id: http://skia.googlecode.com/svn/trunk@12382 2bbb7eff-a529-9590-31e7-b0007b416f81
2013-11-25 18:13:33 +00:00