AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
10,606 Commits 1 Branch 0 Tags 544 MiB
8a13588b6f
Commit Graph

10606 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
commit-bot@chromium.org
8a13588b6f Stop discarding in frag shader when coverage is zero and stencil writes are enabled 
This fixes the corruption in the NVPR images here:
http://108.170.217.252:10117/builders/Test-Win8-ShuttleA-GTX660-x86-Debug/builds/251/steps/CompareGMs/logs/stdio

caused by:

https://skia.googlesource.com/skia.git/+/65ee5f424cb4dabd453268902c00086605d77c1d

The stencil path step writes inside and outside the clip when the clip is implemented by
a coverage effect. The path cover step then doesn't write outside of the clip because the FS
discards. This leaves stencil values outside of the clip non-zero which messed up subsequent
path or clip draws to those samples.

R=robertphillips@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13320 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-05 16:29:12 +00:00
reed@google.com
76f10a3bd9 remove SkCanvas::createCompatibleDevice, and add SkCanvas::newSurface 
BUG=skia:
R=bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13319 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-05 15:32:21 +00:00
robertphillips@google.com
cb6adecd4d Clean up SkPictureRecord.cpp 
https://codereview.chromium.org/153983007/



git-svn-id: http://skia.googlecode.com/svn/trunk@13318 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-05 14:05:38 +00:00
robertphillips@google.com
30555b4c34 Wider perf trigger range for N4 and N7 perf improvements 
https://codereview.chromium.org/141013019/



git-svn-id: http://skia.googlecode.com/svn/trunk@13317 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-05 13:35:56 +00:00
skia.committer@gmail.com
1dab403e44 Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@13316 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-05 03:01:48 +00:00
commit-bot@chromium.org
076f078a5e Add magnifier to rebaseline server. 
NOTRY=true
BUG=skia:1917
R=epoger@google.com

Author: rmistry@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13315 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-04 22:45:40 +00:00
commit-bot@chromium.org
967dee32ef Make SkFontMgr interface const. 
COLLABORATOR=mtklein@chromium.org
BUG=skia:
R=reed@google.com, bungeman@google.com, mtklein@chromium.org

Author: mtklein@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13314 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-04 22:35:01 +00:00
robertphillips@google.com
0807ede86d Compilation fix for r13311 (Update SkPictureRecord to allow some ops to be written separately - https://codereview.chromium.org/153883002/) 
git-svn-id: http://skia.googlecode.com/svn/trunk@13313 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-04 20:35:55 +00:00
robertphillips@google.com
f48a90c06f Ignore failures on GalaxyNexus and NexusS 
https://codereview.chromium.org/154223002/



git-svn-id: http://skia.googlecode.com/svn/trunk@13312 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-04 20:26:04 +00:00
robertphillips@google.com
5a63f24558 Update SkPictureRecord to allow some ops to be written separately 
https://codereview.chromium.org/153883002/



git-svn-id: http://skia.googlecode.com/svn/trunk@13311 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-04 20:07:50 +00:00
commit-bot@chromium.org
0f53122f89 Fix crash in bench when "--mode record" is used 
R=mtklein@google.com

Author: robertphillips@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13310 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-04 19:32:37 +00:00
commit-bot@chromium.org
ea6e14a382 TSAN: use somewhat pithier SK_ANNOTATE_UNPROTECTED_READ. 
This is a little bit better practice to be i than the existing SK_ANNOTATE_BENIGN_RACE, as UNPROTECTED_READ will only ignore reads, not writes.

Tag SkRefCnt::unique() as a safe unprotected read like SkOnce's double-checked locking.

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

Author: mtklein@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13309 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-04 18:00:23 +00:00
commit-bot@chromium.org
8df32b978f Added root deletion code to fix valgrind error 
BUG=skia:
R=robertphillips@google.com

Author: sugoi@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13308 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-04 17:49:54 +00:00
reed@google.com
fdbd504950 remove kGL_Capability (unused) 
BUG=skia:
R=bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13307 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-04 17:49:52 +00:00
commit-bot@chromium.org
65ee5f424c Use GrConvexPolyEffect when clip is a single convex polygon 
BUG=skia:2051

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

R=robertphillips@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13306 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-04 17:49:48 +00:00
reed@google.com
d52a99703b fix int->scalar warning 
git-svn-id: http://skia.googlecode.com/svn/trunk@13305 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-04 16:14:58 +00:00
scroggo@google.com
eb6295044b Gyp file changes for the android framework. 
Split off from https://codereview.chromium.org/140503007/.

The eventual goal is to create our Android.mk from gyp. This patch
adds an option for skia_android_framework with the right settings.
The follow-up (https://codereview.chromium.org/140503007/) will
use scripts to create the final makefile.

gyp/android_deps.gyp:
Use different dependencies for the framework than for building Skia
normally.

gyp/android_framework_lib.gyp:
Like skia_lib, specifies the minimum needed for building Skia, in this
case for the framework.

gyp/common_conditions.gypi:
Add settings specific to skia_android_framework. In some cases this
means turning off flags and defines.

gyp/common.gypi
Turn off SK_DEBUG and SK_DEVELOPER when building for the framework.
This allows the framework to create a single makefile which can be
modified to add SK_DEBUG and SK_DEVELOPER as desired.

gyp/common_variables.gypi:
Add skia_android_framework.

gyp/core.gyp:
Don't depend on cpufeatures, and add the cutils library for
skia_android_framework.

gyp/freetype.gyp:
skia_android_framework-specific options:
Don't include freetype_static as a dependency.
Include the proper folders.
Include the android library.

gyp/images.gyp:
Don't export libjpeg as a dependency for targets that include images
for the framework.
Also reorder image decoders to match the Android order, leaving our
most commonly used ones last (and therefore first in the chain for
trying them).

gyp/libwebp.gyp:
Use the system webp when building for the Android framework. Specify
the correct settings for the framework.

gyp/opts.gyp:
Specify a default set of files to compile when there are no possible
optimizations.

gyp/pdf.gyp:
Add dependencies for Android framework.

gyp/zlib.gyp:
Include the zlib folder, and undefine SK_ZLIB_INCLUDE.

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

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

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13304 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-04 16:08:48 +00:00
reed@google.com
6fcd28ba1d fix samplefuzz, fix some 32/64bit warnings 
git-svn-id: http://skia.googlecode.com/svn/trunk@13303 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-04 16:03:51 +00:00
reed@google.com
28183b4043 remove (unused by chrome) SkDeferredCanvas(device) factory signature 
BUG=skia:
R=junov@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13302 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-04 15:34:10 +00:00
reed@google.com
11db6fa9b9 convert gm tool to use surfaces instead of devices 
BUG=skia:
R=bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13301 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-04 15:30:57 +00:00
commit-bot@chromium.org
b511be5a9b Add rect clip to convex_poly_clip GM 
BUG=skia:2051
R=robertphillips@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13300 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-04 15:09:16 +00:00
reed@google.com
372b7a4f56 remove redundant GrContext parameter to NewRenderTargetDirect 
BUG=skia:
R=bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13299 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-04 14:58:30 +00:00
scroggo@google.com
1c9bd55ea3 Gyp file changes for the android framework. 
Split off from https://codereview.chromium.org/140503007/.

The eventual goal is to create our Android.mk from gyp. This patch
adds an option for skia_android_framework with the right settings.
The follow-up (https://codereview.chromium.org/140503007/) will
use scripts to create the final makefile.

gyp/android_deps.gyp:
Use different dependencies for the framework than for building Skia
normally.

gyp/android_framework_lib.gyp:
Like skia_lib, specifies the minimum needed for building Skia, in this
case for the framework.

gyp/common_conditions.gypi:
Add settings specific to skia_android_framework. In some cases this
means turning off flags and defines.

gyp/common.gypi
Turn off SK_DEBUG and SK_DEVELOPER when building for the framework.
This allows the framework to create a single makefile which can be
modified to add SK_DEBUG and SK_DEVELOPER as desired.

gyp/common_variables.gypi:
Add skia_android_framework.

gyp/core.gyp:
Don't depend on cpufeatures, and add the cutils library for
skia_android_framework.

gyp/freetype.gyp:
skia_android_framework-specific options:
Don't include freetype_static as a dependency.
Include the proper folders.
Include the android library.

gyp/images.gyp:
Don't export libjpeg as a dependency for targets that include images
for the framework.
Also reorder image decoders to match the Android order, leaving our
most commonly used ones last (and therefore first in the chain for
trying them).

gyp/libwebp.gyp:
Use the system webp when building for the Android framework. Specify
the correct settings for the framework.

gyp/opts.gyp:
Specify a default set of files to compile when there are no possible
optimizations.

gyp/pdf.gyp:
Add dependencies for Android framework.

gyp/zlib.gyp:
Include the zlib folder, and undefine SK_ZLIB_INCLUDE.

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

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13298 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-04 14:50:20 +00:00
reed@google.com
1bc6c6aa7e change benchmark to use surfaces instead of devices to specify its backends 
BUG=skia:
R=mtklein@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13297 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-04 14:02:44 +00:00
skia.committer@gmail.com
e456a4284a Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@13296 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-04 03:01:56 +00:00
senorblanco@chromium.org
f4e1a7614d More bot whack-a-mole: fix Win build. 
BUG=skia:
TBR=fmalita@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13295 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-04 00:28:46 +00:00
fmalita@google.com
ec7c35d015 Speculative build fix after r13292. 
TBR=senorblanco@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13294 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-03 23:25:32 +00:00
senorblanco@chromium.org
58d1466c77 Fix skia_gpu=0 build. 
BUG=skia:
TBR=bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13293 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-03 22:36:39 +00:00
senorblanco@chromium.org
aba651c3f1 Fix image filter crop offsets for GPU path. 
This is the GPU-side version of
https://codereview.chromium.org/112803004/.
Also factored the crop offset unit test into a function, so we can
call it with both CPU & GPU devices.

R=bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13292 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-03 22:22:16 +00:00
fmalita@google.com
29af1f35d7 Whitespace change to test the DownloadSKImageFiles fix. 
TBR=borenet@google.com
NOTRY=true

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13291 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-03 21:50:06 +00:00
commit-bot@chromium.org
db009577ad fix script so that the error is actually printed if ant is not installed 
R=scroggo@google.com, hcm@google.com

Author: djsollen@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13290 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-03 21:20:09 +00:00
commit-bot@chromium.org
4b5ad7fcd7 remove tools/test_rendering.py and tools/test_pictures.py 
BUG=skia:2035
R=borenet@google.com

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13289 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-03 21:19:04 +00:00
bsalomon@google.com
d3066bd9b4 Revert of Use GrConvexPolyEffect when clip is a single convex polygon (https://codereview.chromium.org/151523005/) 
Reason for revert:
unit tests crashing on windows?

Original issue's description:
> Use GrConvexPolyEffect when clip is a single convex polygon
>
> BUG=skia:2051
>
> Committed: http://code.google.com/p/skia/source/detail?r=13286

TBR=robertphillips@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2051

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13288 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-03 20:09:56 +00:00
commit-bot@chromium.org
2859f9fbf3 rename tracing parameter to be more consistent with other methods 
BUG=skia:
R=bsalomon@google.com

Author: humper@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13287 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-03 19:47:13 +00:00
commit-bot@chromium.org
e89d903378 Use GrConvexPolyEffect when clip is a single convex polygon 
BUG=skia:2051
R=robertphillips@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13286 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-03 19:42:42 +00:00
commit-bot@chromium.org
8c6f4b3261 Adding int cast to prevent warning 
BUG=skia:
R=fmalita@google.com, fmalita@chromium.org, bsalomon@google.com, bsalomon@chromium.org

Author: sugoi@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13285 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-03 19:40:32 +00:00
commit-bot@chromium.org
da5c6d64b0 don't initialize the default Skia tracer if one has already been provided 
BUG=skia:
R=bsalomon@google.com

Author: humper@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13284 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-03 19:36:20 +00:00
commit-bot@chromium.org
3458a1736f clean up a couple of parameters in the tracing interface 
BUG=skia:
R=bsalomon@google.com

Author: humper@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13283 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-03 18:09:32 +00:00
commit-bot@chromium.org
c22d139808 Initial QuadTree implementation 
In an effort to find a faster bounding box hierarchy than the R-Tree, a QuadTree has been implemented here.
For now, the QuadTree construction is generally faster than the R-Tree and the queries are a bit slower, so overall, SKP local tests showed QuadTree performance similar to the R-Tree performance.

Tests and bench are included in this cl.

At this point, I'd like to be able to commit this in order to more easily use the bots to test multiple configurations and a larger number of SKPs. The R-Tree BBH is still used by default so this change shouldn't affect chromium.

BUG=skia:
R=junov@chromium.org, junov@google.com, senorblanco@google.com, senorblanco@chromium.org, reed@google.com, sugoi@google.com, fmalita@google.com

Author: sugoi@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13282 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-03 18:08:33 +00:00
fmalita@google.com
c048afc3df Rebaseline imagefiltersgraph_gpu (Test-Mac10.6-MacMini4.1-GeForce320M-x86-Release) 
BUG=skia:2118
TBR=senorblanco@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13281 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-03 17:58:31 +00:00
commit-bot@chromium.org
c6ba74cb56 hopefully last set of rebaselines for blurrect 
BUG=skia:2108
R=epoger@google.com
TBR=epoger

Author: humper@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13280 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-03 15:11:48 +00:00
commit-bot@chromium.org
6adce6783c Allow GMs to be used as benchmarks. Make convex_poly_clip opt in. 
R=reed@google.com

Author: bsalomon@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13279 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-03 14:48:17 +00:00
commit-bot@chromium.org
ccfe7b8ae7 Whitespace change to test the new PRESUBMIT authors check 
BUG=skia:2072
NOTRY=true
TBR=
(SkipBuildbotRuns)

Author: rmistry@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13278 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-03 14:29:55 +00:00
commit-bot@chromium.org
745e08caf2 Check if the issue owner is in the AUTHORS file in PRESUBMIT.py 
BUG=skia:2072
NOTRY=true
(SkipBuildbotRuns)

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

Author: rmistry@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13277 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-03 14:18:32 +00:00
robertphillips@google.com
7017288811 Fix valgrind issue in SkBase64Test.cpp 
https://codereview.chromium.org/152153002/



git-svn-id: http://skia.googlecode.com/svn/trunk@13276 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-01 15:45:23 +00:00
robertphillips@google.com
78319ced50 Performance trigger rebaselines 
https://codereview.chromium.org/151833004/



git-svn-id: http://skia.googlecode.com/svn/trunk@13275 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-01 15:44:30 +00:00
skia.committer@gmail.com
ba12448568 Sanitizing source files in Housekeeper-Nightly 
git-svn-id: http://skia.googlecode.com/svn/trunk@13274 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-02-01 03:01:57 +00:00
tfarina@chromium.org
bbff20855f Split GrUnitTests.cpp into two separate unit tests. 
GrUnitTests is too generic. Instead we split this file between the two
APIs being tested there, GrTBSearch and GrBinHashKey.

BUG=None
TEST=tests -m GrTBSearchTest && tests -m GrBinHashKeyTest
R=brian@thesalomons.net, robertphillips@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13273 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-31 21:48:52 +00:00
commit-bot@chromium.org
e254310a55 add SkCanvas constructor that explicitly creates no_config with dimensions 
BUG=skia:
R=scroggo@google.com, halcanary@google.com

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13272 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-31 19:42:58 +00:00
commit-bot@chromium.org
2fc672dd46 Adding Chromium authors to the AUTHORS file. 
Some Googlers commit code into Skia using their chromium.org accounts.
The Chromium AUTHORS file has a similar entry:
http://src.chromium.org/viewvc/chrome/trunk/src/AUTHORS

(SkipBuildbotRuns)

NOTRY=true
BUG=skia:2072
R=hcm@google.com

Author: rmistry@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13271 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-01-31 19:12:43 +00:00