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

11162 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
senorblanco@chromium.org
d5104782f6 New baselines for imagefiltersscaled and lighting GMs. 
TBR=jcgregorio@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13878 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-20 17:41:32 +00:00
commit-bot@chromium.org
e32eeec7bf add some debugging for bug skia:2313 
(SkipBuildbotRuns)
BUG=skia:2313
NOTREECHECKS=True
NOTRY=True
R=borenet@google.com

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13877 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-20 17:32:27 +00:00
commit-bot@chromium.org
579942387b rebaseline_server: serve JSON from static file, rather than generating it live 
BUG=skia:1455, skia:2230
NOTREECHECKS=True
NOTRY=True
R=borenet@google.com

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13876 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-20 17:27:46 +00:00
bsalomon@google.com
69e5350398 More gpu rebaselines 
Review URL: https://codereview.chromium.org/204353006

git-svn-id: http://skia.googlecode.com/svn/trunk@13875 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-20 15:35:33 +00:00
commit-bot@chromium.org
b42105a4a2 rebaseline_server: image URLs are relative to JSON file's location 
BUG=skia:1455, skia:2230
NOTREECHECKS=True
NOTRY=True
R=borenet@google.com

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13874 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-20 15:27:34 +00:00
senorblanco@chromium.org
130dc91b93 Rebaseline minor pixel diffs from recent GPU changes. 
TBR=bsalomon

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13873 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-20 15:24:39 +00:00
bsalomon@google.com
180e36abf6 Revert "hide Config8888 entirely". Broke a bunch of builds. 
This reverts commit fa11c49cc11a6c9ebafbf9c59e118917f9b3cc56.

Revert "Sanitizing source files in Housekeeper-Nightly" to make the above revert clean.

This reverts commit b5787422c8eb2a27a9576777597fd9e06784acdb.

TBR=reed@google.com
TBR=jcgregorio@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13872 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-20 13:26:45 +00:00
skia.committer@gmail.com
be41d38f1c Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@13871 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-20 03:02:31 +00:00
bungeman@google.com
a95a066f4a Fix Windows build break introduced in r13864. 
Need SkToBool(...).



git-svn-id: http://skia.googlecode.com/svn/trunk@13870 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-19 23:26:50 +00:00
commit-bot@chromium.org
b470c2140c Silence warning after f5e315ccf1. 
(clang 3.3):

../tools/PictureRenderer.cpp:350:13: error: variable 'hash' is used uninitialized whenever 'if' condition is false
      [-Werror,-Wsometimes-uninitialized]
        if (!generatedHash) {
            ^~~~~~~~~~~~~~
../tools/PictureRenderer.cpp:354:53: note: uninitialized use occurs here
        jsonSummaryPtr->add(outputFilename.c_str(), hash);
                                                    ^~~~
../tools/PictureRenderer.cpp:350:9: note: remove the 'if' if its condition is always true
        if (!generatedHash) {
        ^~~~~~~~~~~~~~~~~~~~
../tools/PictureRenderer.cpp:334:18: note: initialize the variable 'hash' to silence this warning
    uint64_t hash;
                 ^
                  = 0

The warning is wrong, but the compiler does have a point: generatedHash is always false at that point.

R=epoger@google.com

Author: fmalita@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13869 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-19 22:58:52 +00:00
commit-bot@chromium.org
1c30818f66 fix non-gpu build 
BUG=
R=bungeman@google.com
TBR=bungeman@google.com

Author: humper@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13868 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-19 22:54:40 +00:00
commit-bot@chromium.org
2472b3219e Only use analytic effect-based clipping when AA is required by at least one element. 
BUG=352718
R=robertphillips@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13867 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-19 21:26:35 +00:00
commit-bot@chromium.org
eb9547c1d6 stub for ganesh veto 
BUG=skia:
R=bsalomon@google.com, nduca@chromium.org

Author: humper@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13866 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-19 21:24:25 +00:00
commit-bot@chromium.org
e14792d99f hide Config8888 entirely 
BUG=skia:
R=bsalomon@google.com

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13865 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-19 21:20:24 +00:00
commit-bot@chromium.org
d8a57af725 Adding a new SkSurface factory for generating surfaces from the scratch texture pool. 
TEST=Surface unit test
BUG=crbug.com/351798
R=bsalomon@google.com, robertphillips@google.com, reed@google.com

Author: junov@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13864 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-19 21:19:16 +00:00
senorblanco@chromium.org
b9c95978c6 Use rounding to 8888 in lighting filters, raster path. 
when converting float -> 8-bit BGRA in lighting filters, use rounding
rather than floor(). This makes the GPU and raster paths match more
closely (as tested by Blink test
feDiffuseLighting-linearrgb-lighting-color.svg).

Will affect the LSB of lighting, imagefiltersscaled GMs.

R=junov@chromium.org
BUG=skia:

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13863 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-19 19:44:41 +00:00
commit-bot@chromium.org
8e13a159f3 Fixed cross compilation with mingw. 
Tested in Mozilla source tree. I tried to use skia build system, but it's up to the task for cross compilation.

SkHRESULT.cpp - Use proper file name (that matters on case sensitive OSes)

SkAtomics_win.h - Don't use pragma intrinsic on GCC (this causes massive warnings)

SkOSFile_win.cpp - This one is tricky. GCC doesn't allow (void*) casts in template argument constants and INVALID_HANDLE_VALUE looks like this:
((HANDLE)(LONG_PTR)-1)
where HANDLE is typedefed to void*. Changed the code to use LONG_PTR as template argument and cast it when needed.

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

Author: cjacek@gmail.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13862 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-19 19:28:00 +00:00
commit-bot@chromium.org
bdc772ebbe Add quiet mode to lua_pictures. 
This allows:

for i in {0..5}; do
    out/Debug/lua_pictures -q --skpPath $SKP_PATH -l $SCRIPT --modulo $i 6
done

to generate output similar to what telemetry will generate.

R=reed@google.com

Author: robertphillips@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13861 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-19 19:23:17 +00:00
senorblanco@chromium.org
b7b7eb32f4 Fix accessBitmap() with deferred clear, GPU path. 
When accessBitmap() is called on a GPU device which has deferred clear,
and no drawing has been done, force the clear before returning the
bitmap.

This is covered by the top right test case in the imagefilterscropexpand
GM, where an offset image filter is drawn but the resulting bitmap is
cropped out, resulting in no drawing to the offscreen. It should be
empty, but without this fix it results in garbage (previous scratch
texture contents).

BUG=skia:
R=bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13860 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-19 18:24:04 +00:00
commit-bot@chromium.org
f5e315ccf1 add --writeChecksumBasedFilenames flag to render_pictures 
BUG=skia:1455,skia:2230
R=robertphillips@google.com, robertphillips@chromium.org

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13859 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-19 17:26:07 +00:00
commit-bot@chromium.org
fffb2cd463 Revert of SkPaint: eliminate some dead bytes in 64-bit build. (https://codereview.chromium.org/203203003/) 
Reason for revert:
Causing RunTest failures on Android.

Original issue's description:
> SkPaint: eliminate some dead bytes in 64-bit build.
>
> + memcpy-based copy constructor was hiding this gap -> manual copy constructor.
> + Split tests for finer-grained failures.
>
> BUG=skia:
>
> Committed: http://code.google.com/p/skia/source/detail?r=13856

R=reed@google.com, mtklein@google.com, mtklein@chromium.org
TBR=mtklein@chromium.org, mtklein@google.com, reed@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Author: jcgregorio@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13858 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-19 14:36:29 +00:00
commit-bot@chromium.org
2aae29832a Whitespace change to verify that buildbot scripts are fixed. 
BUG=skia:2312
NOTRY=true
NOTREECHECKS=true
R=rmistry@google.com

Author: borenet@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13857 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-19 14:22:18 +00:00
commit-bot@chromium.org
fa4dc2c4cb SkPaint: eliminate some dead bytes in 64-bit build. 
+ memcpy-based copy constructor was hiding this gap -> manual copy constructor.
+ Split tests for finer-grained failures.

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

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13856 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-19 11:42:34 +00:00
skia.committer@gmail.com
2002d881e8 Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@13855 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-19 03:02:22 +00:00
senorblanco@chromium.org
3604853488 Rebaseline imagefiltersscaled GM. 
Rebaseline imagefiltersscaled GM for new test cases added in
https://code.google.com/p/skia/source/detail?r=13798.

TBR=jcgregorio@google.com
BUG=skia:

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13854 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-18 17:59:47 +00:00
commit-bot@chromium.org
70512af9dd Add a means of extracting active operations from SkPicture 
For the "pull forward" task I will be comparing the two cases:
  analyze the whole skp and use the BBH information
  analyze only the active portion of the skp

In the first case we need a way to get the BBH information out of the picture in order to extract the relevant portions of the whole-skp analysis. This adds caching of the active ops so that work isn't duplicated between when the optimization path queries for that information and when the usual draw path queries for it.

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

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

Author: robertphillips@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13853 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-18 17:45:32 +00:00
commit-bot@chromium.org
af5346a39c Add reg test for http://crbug.com/348821 
BUG=348821
R=reed@google.com, mtklein@google.com

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13852 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-18 17:38:34 +00:00
commit-bot@chromium.org
e5957f67d0 update comment on setShader to clarify alpha-bitmap behavior in bitmapshaders 
BUG=skia:2293
R=bsalomon@google.com, yunchao.he@intel.com

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13851 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-18 16:28:12 +00:00
robertphillips@google.com
14bdd527ee Revert of r13836 due to Chromium cc_unittests failures 
https://codereview.chromium.org/203333005/



git-svn-id: http://skia.googlecode.com/svn/trunk@13850 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-18 13:56:09 +00:00
commit-bot@chromium.org
92362383a4 Remove SkCanvas matrix ops return value. 
The internal SkMatrix ops can no longer fail -> we can remove the bool
return value.

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

Author: fmalita@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13849 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-18 12:51:48 +00:00
commit-bot@chromium.org
2077427227 Put SimpleOffsetFilter on heap. 
Effects want to live on the heap!

BUG=skia:
R=senorblanco@chromium.org, dominikg@chromium.org, scroggo@google.com, mtklein@google.com

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13848 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-18 10:28:27 +00:00
commit-bot@chromium.org
a1dfa0cf05 Slightly faster quadtree searching 
BUG=skia:2125
R=tomhudson@google.com, mtklein@google.com, robertphillips@google.com, reed@google.com

Author: iancottrell@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13847 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-18 09:07:27 +00:00
commit-bot@chromium.org
341241d567 short-term fix for RunToolSelfTests 
BUG=skia:2307
NOTREECHECKS=True
NOTRY=True
R=bensong@google.com
TBR=bensong

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13846 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-18 05:41:33 +00:00
skia.committer@gmail.com
db0c875377 Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@13845 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-18 03:02:11 +00:00
senorblanco@chromium.org
d9cdff67a4 Fix GPU displacement with expanding crop rects. 
Fix GPU displacement with expanding crop rects, and re-enable the
imagefilterscropexpand GM. There were two bugs: the result texture was
being created at input color bitmap size, not the cropped bounds size,
and the matrix in GrContext was not being set to identity before draw.

R=junov@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13844 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-17 23:41:40 +00:00
commit-bot@chromium.org
1301bf3abf add initial scraper for dashing 
BUG=skia:
R=bsalomon@google.com

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13843 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-17 23:09:47 +00:00
robertphillips@google.com
e4ff3e6fe8 Update SkXPSDevice.cpp too 
git-svn-id: http://skia.googlecode.com/svn/trunk@13842 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-17 22:34:32 +00:00
robertphillips@google.com
158001d6fc Windows build fix 
git-svn-id: http://skia.googlecode.com/svn/trunk@13841 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-17 22:09:34 +00:00
commit-bot@chromium.org
a713f9c6f6 add new readPixels with direct memory parameters 
BUG=skia:
R=scroggo@google.com, bsalomon@google.com, robertphillips@google.com, fmalita@google.com

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13840 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-17 21:31:26 +00:00
commit-bot@chromium.org
f338d7c860 Add nine patch type to SkRRect. 
BUG=skia:2181

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

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

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13839 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-17 21:17:30 +00:00
commit-bot@chromium.org
b1bcb21631 gen_bench_expectations to generate bench expectations files. 
BUG=skia:2225
NOTRY=true
R=borenet@google.com

Author: bensong@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13838 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-17 21:16:29 +00:00
commit-bot@chromium.org
bab3fc4c90 Revert of Add nine patch type to SkRRect. (https://codereview.chromium.org/196343015/) 
Reason for revert:
causes tests to have infinite loop

Original issue's description:
> Add nine patch type to SkRRect.
>
> BUG=skia:2181
>
> Committed: http://code.google.com/p/skia/source/detail?r=13833

R=robertphillips@google.com, reed@google.com
TBR=reed@google.com, robertphillips@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2181

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13837 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-17 19:47:40 +00:00
commit-bot@chromium.org
ecb745dba7 Add a means of extracting active operations from SkPicture 
For the "pull forward" task I will be comparing the two cases:
  analyze the whole skp and use the BBH information
  analyze only the active portion of the skp

In the first case we need a way to get the BBH information out of the picture in order to extract the relevant portions of the whole-skp analysis. This adds caching of the active ops so that work isn't duplicated between when the optimization path queries for that information and when the usual draw path queries for it.

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

Author: robertphillips@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13836 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-17 18:11:57 +00:00
commit-bot@chromium.org
4ef54f8d72 remove SK_SUPPORT_LEGACY_WRITEPIXELSCONFIG -- dead code 
BUG=skia:
R=halcanary@google.com

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13834 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-17 17:03:18 +00:00
commit-bot@chromium.org
761b8e5572 Add nine patch type to SkRRect. 
BUG=skia:2181
R=robertphillips@google.com, reed@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13833 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-17 15:39:01 +00:00
robertphillips@google.com
1c556dba15 Reverting r13831 (Add a means of extracting active operations from SkPicture) due to Mac compiler issue 
git-svn-id: http://skia.googlecode.com/svn/trunk@13832 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-17 15:10:02 +00:00
robertphillips@google.com
0b23f9e15f Add a means of extracting active operations from SkPicture 
https://codereview.chromium.org/195793010/



git-svn-id: http://skia.googlecode.com/svn/trunk@13831 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-17 14:56:13 +00:00
commit-bot@chromium.org
d1c85d2920 rebaseline_server: make intermediate JSON specify base urls for diff images 
BUG=skia:1919,skia:2230
NOTREECHECKS=True
NOTRY=True
R=rmistry@google.com

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13830 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-17 14:22:02 +00:00
bungeman@google.com
1d1f2347d3 SkFontStyleSet_DirectWrite::getStyle to properly handle NULL out params. 
R=reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13829 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-17 14:04:50 +00:00
commit-bot@chromium.org
be4825c873 Fix result order reliance 
The old tests presumed result order in a way was safe because SkPicture was sorting the paint calls.
This fixes the tests to not check result ordering, just presence

BUG=skia:
R=robertphillips@google.com

Author: iancottrell@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13828 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-03-17 12:14:48 +00:00