AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
13,278 Commits 1 Branch 0 Tags 544 MiB
cdf2db90d9
Commit Graph

210 Commits

Author SHA1 Message Date
mtklein
bce540ca8f Don't call out -lstdc++ -lm explicitly. 
BUG=skia:
R=bungeman@google.com, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/440643004
 2014-08-04 11:10:16 -07:00
halcanary
f91b47ff9e Revert of Memory improvements to render_pdfs; better DM pool size defaults (https://codereview.chromium.org/433063002/) 
Reason for revert:
breaking android tests

Original issue's description:
> Memory improvements to render_pdfs; better DM pool size defaults
>
> Make SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE equal to
> skia_resource_cache_mb_limit, if that value is >0 (true for some
> low-memory Android devices).
>
> render_pdfs test program uses lazy decoding (and the discardable
> memory pool).
>
> BUG=skia:2743
>
> Committed: https://skia.googlesource.com/skia/+/66058b614d9c8cb63c24b1c779dd1a9a80752217

R=djsollen@google.com, mtklein@google.com
TBR=djsollen@google.com, mtklein@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2743

Author: halcanary@google.com

Review URL: https://codereview.chromium.org/418173012
 2014-08-01 11:54:48 -07:00
halcanary
66058b614d Memory improvements to render_pdfs; better DM pool size defaults 
Make SK_DEFAULT_GLOBAL_DISCARDABLE_MEMORY_POOL_SIZE equal to
skia_resource_cache_mb_limit, if that value is >0 (true for some
low-memory Android devices).

render_pdfs test program uses lazy decoding (and the discardable
memory pool).

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

Author: halcanary@google.com

Review URL: https://codereview.chromium.org/433063002
 2014-08-01 09:25:11 -07:00
djsollen
21769c5249 Update NEON compiler defines to use SK_ prefix 
BUG=skia:2785
R=mtklein@google.com

Author: djsollen@google.com

Review URL: https://codereview.chromium.org/433513004
 2014-08-01 05:32:32 -07:00
djsollen
bc89329fb5 Enable the SSSE3 compile time check on all platforms (4th attempt) 
BUG=skia:2746
R=bungeman@google.com, robertphillips@google.com, mtklein@google.com

Author: djsollen@google.com

Review URL: https://codereview.chromium.org/414033002
 2014-07-24 13:53:56 -07:00
bungeman
2da0f85488 Revert of Enable the SSSE3 compile time check on all platforms. (https://codereview.chromium.org/403583002/) 
Reason for revert:
This is blocking the roll. Chromium Windows trybots (like win_chromium_x64_rel) are crashing in the SSSE3 code (for example SkCanvasVideoRenderTest.CroppedFrame).

Original issue's description:
> Enable the SSSE3 compile time check on all platforms (3rd attempt)
>
> BUG=skia:2746
>
> Committed: https://skia.googlesource.com/skia/+/933834851f9d48fbd85b728cc92e1f0134bfaa4e

R=halcanary@google.com, mtklein@google.com, djsollen@google.com
TBR=djsollen@google.com, halcanary@google.com, mtklein@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2746

Author: bungeman@google.com

Review URL: https://codereview.chromium.org/418523002
 2014-07-23 11:28:18 -07:00
scroggo
c0bc913451 Introduce skia_pic gyp variable. 
skia_pic tells ninja to use -fPIC when building for position
independent code.

Set skia_pic to true when building our existing targets that
require position independent code.

Also use skia_pic when building for Android.

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

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/406613003
 2014-07-22 12:09:30 -07:00
djsollen
933834851f Enable the SSSE3 compile time check on all platforms (3rd attempt) 
BUG=skia:2746
R=halcanary@google.com, mtklein@google.com

Author: djsollen@google.com

Review URL: https://codereview.chromium.org/403583002
 2014-07-22 07:20:18 -07:00
Derek Sollenberger
eccbfec18a Fix broken android framework builds where 32-bit MIPS compilers lack 64-bit __sync operators. 
R=mtklein@google.com, reed@google.com, scroggo@google.com

Review URL: https://codereview.chromium.org/398153002
 2014-07-16 15:51:39 -04:00
Derek Sollenberger
122f9ecef8 Remove outdated compiler restrictions. 
R=scroggo@google.com

Review URL: https://codereview.chromium.org/394263002
 2014-07-16 15:20:01 -04:00
halcanary
9c6878be37 Revert of Enable the SSSE3 compile time check on all platforms. (https://codereview.chromium.org/391693004/) 
Reason for revert:
windows fail

Original issue's description:
> Enable the SSSE3 compile time check on all platforms.
>
> BUG=skia:2746
>
> Committed: https://skia.googlesource.com/skia/+/ee349531446ae2a8336b0903e05d0b2150d2131f

R=mtklein@google.com, djsollen@google.com
TBR=djsollen@google.com, mtklein@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2746

Author: halcanary@google.com

Review URL: https://codereview.chromium.org/390063002
 2014-07-14 08:32:18 -07:00
djsollen
ee34953144 Enable the SSSE3 compile time check on all platforms. 
BUG=skia:2746
R=mtklein@google.com

Author: djsollen@google.com

Review URL: https://codereview.chromium.org/391693004
 2014-07-14 07:58:42 -07:00
scroggo
55d316eaba Remove last SK_SUPPORT_LEGACY_SHADER_LOCALMATRIX. 
Should have been included in https://codereview.chromium.org/379323002
but it was overlooked. As of that CL, the flag does not do anything.

BUG=skia:1976
R=reed@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/390033002
 2014-07-14 07:58:34 -07:00
djordje.pesut
6336f7c225 MIPS: added optimization for SkRGB16_Opaque_Blitter::blitMask 
gaint is ~30%

R=djsollen@google.com

Author: djordje.pesut@imgtec.com

Review URL: https://codereview.chromium.org/357693002
 2014-07-14 07:48:11 -07:00
mtklein
4d1605a8d6 Enable tools/CrashHandler again. 
- Defaults to on the bots, triggered off CHROME_HEADLESS=1 in the environment.
  - Defaults off otherwise.
  - Can be enabled by setting CHROME_HEADLESS=1 (weird) or GYP_DEFINES=skia_crash_handler=1.

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

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/383813002
 2014-07-10 14:16:04 -07:00
scroggo
ecce60bad6 Build Android with SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG. 
This flag will be used on Android when built for the framework,
as well as when built for the WebView. Setting this flag for
Android means our tests can fully test CanvasStateTest.

Fix CanvasStateTest. It has bit-rotted since disabling
SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG.

Splitting off from https://codereview.chromium.org/372003002/ ,
as it seems self-contained.

BUG=b/15693384
R=djsollen@google.com, reed@google.com, mtklein@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/375943003
 2014-07-09 07:26:40 -07:00
mtklein
0b544ae222 Add SkRacy 
SkRacy<T> is a zero-overhead wrapper for a T, except it also
silences race warnings when TSAN is running.

Here we apply in several classes.  In SkMatrix and SkPathRef,
we use it to opportunistically cache some idempotent work.

In SkPixelRef, we wrap the genIDs.  We think the worst that
can happen here is we'll increment the global next-genID a
few times instead of once when we go to get another ID.

BUG=skia:

Committed: https://skia.googlesource.com/skia/+/d5e3e6ae1b3434ad1158f441902ff65f1eeaa3a7

CQ_EXTRA_TRYBOTS=tryserver.skia:Canary-Chrome-Ubuntu13.10-Ninja-x86_64-ToT-Trybot,Canary-Chrome-Win7-Ninja-x86-SharedLib_ToT-Trybot,Test-Ubuntu13.10-GCE-NoGPU-x86_64-Release-TSAN-Trybot
R=reed@google.com, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/371363004
 2014-07-08 19:37:47 -07:00
reed
58f1e925fd remove unneeded flags for android 
R=scroggo@google.com

Author: reed@google.com

Review URL: https://codereview.chromium.org/369683004
 2014-07-07 13:48:59 -07:00
mtklein
aca3d84940 Remove SK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK. 
Skia no longer looks at this define.  It's as if it's always set now.

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

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/368953005
 2014-07-07 12:33:27 -07:00
qiankun.miao
d312a04ffa Enable 32/64-bit gyp switch on Android 
Select 32/64-bit Skia build according skia_arch_width on Android.

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

Author: qiankun.miao@intel.com

Review URL: https://codereview.chromium.org/369813003
 2014-07-07 09:47:24 -07:00
mtklein
170e00d640 Have Clang builders build in C++11 mode. 
This ought to get us a little ahead on the transition.  Only minor fixes
are needed.  The one in MemoryBench is the most interesting: what used
to unambiguously be interpreted as concatenating two string literals is
now also ambiguously a user-defined literal; adding a space
disambiguates.

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

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/361723002
 2014-06-30 12:33:11 -07:00
bsalomon
da07a08367 Make LTCG optional on windows builds. 
R=mtklein@google.com

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/335123010
 2014-06-26 12:56:28 -07:00
reed
6518eaaefa remove legacy moz flags 
NOTRY=True
R=george@mozilla.com, scroggo@google.com

Author: reed@google.com

Review URL: https://codereview.chromium.org/342803002
 2014-06-18 14:05:22 -07:00
scroggo
f01a6c3663 In Android framework, make tools depend on jsoncpp 
Always build the tools with JSON, but either build our own
or use the system's.

Rename skia_build_json_writer to skia_use_system_jsoncpp,
since we now always build with JSON.

Remove SK_BUILD_JSON_WRITER, which was only there so
we could build without JSON it in the framework.

BUG=skia:2448
R=djsollen@google.com, reed@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/303913002
 2014-06-18 10:31:40 -07:00
Brian Salomon
08fe01362d Try to roll angle again. 
BUG=skia:2272

NOTRY=True
NOTREECHECKS=True
R=reed@google.com

Review URL: https://codereview.chromium.org/306483014
 2014-06-17 17:28:17 -04:00
mtklein
24ad096540 Silence warnings about using offsetof on near-POD structs. 
This is coming up with SkMatrix, which is POD according to GCC >= 4.6
but not before (specifically, not at GCC 4.4).

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

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/339193002
 2014-06-17 11:47:40 -07:00
reed
0349864b75 remove SK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE -- not needed 
BUG=skia:
R=scroggo@google.com

Author: reed@google.com

Review URL: https://codereview.chromium.org/332163005
 2014-06-16 15:18:25 -07:00
reed
4585144956 remove SK_SUPPORT_LEGACY_DEVICE_CONFIG code 
BUG=skia:
R=djsollen@google.com

Author: reed@google.com

Review URL: https://codereview.chromium.org/327263002
 2014-06-11 07:17:11 -07:00
djordje.pesut
632a4546b0 MIPS: added optimization for functions from SkBlitRow. 
gain is ~40%

following function are optimized:
  S32_D565_Blend
  S32A_D565_Opaque_Dither
  S32_D565_Opaque_Dither
  S32_D565_Blend_Dither
  S32A_D565_Opaque
  S32A_D565_Blend
  S32_Blend_BlitRow32

R=djsollen@google.com, teodora.petrovic@gmail.com

Author: djordje.pesut@imgtec.com

Review URL: https://codereview.chromium.org/326913004
 2014-06-11 06:56:10 -07:00
djordje.pesut
aaf1df632d MIPS: modified gypi files to support build 
R=teodora.petrovic@gmail.com, djsollen@google.com

Author: djordje.pesut@imgtec.com

Review URL: https://codereview.chromium.org/304903003
 2014-06-06 14:09:12 -07:00
mtklein
59ef7704f1 Revert of Try TSAN blacklist for SkGLContextHelper::init. (https://codereview.chromium.org/309823004/) 
Reason for revert:
the bot's clang doesn't know -fsanitize-blacklist

Original issue's description:
> Try TSAN blacklist for SkGLContextHelper::init.
>
> Submitting to test this; this particular problem only happens on the bot.
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/ab2ec19b975a898d4ee2278ddad7d4268f134478

R=mtklein@chromium.org
TBR=mtklein@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Author: mtklein@google.com

Review URL: https://codereview.chromium.org/314543002
 2014-06-02 19:34:20 -07:00
mtklein
ab2ec19b97 Try TSAN blacklist for SkGLContextHelper::init. 
Submitting to test this; this particular problem only happens on the bot.

BUG=skia:
R=mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/309823004
 2014-06-02 19:11:06 -07:00
krajcevski
8c111f783f Change #def to be opt-out 
R=jvanverth@google.com, robertphillips@google.com

Author: krajcevski@google.com

Review URL: https://codereview.chromium.org/308143008
 2014-06-02 13:51:34 -07:00
jvanverth
1940df968d Allow access to device config for Moz2d. 
BUG=skia:2633
R=robertphillips@google.com, borenet@google.com, george@mozilla.com

Author: jvanverth@google.com

Review URL: https://codereview.chromium.org/304273009
 2014-06-02 12:27:26 -07:00
robertphillips
a2551ffbc7 Remove legacy Picture-recording flags from Android build 
R=scroggo@google.com

Author: robertphillips@google.com

Review URL: https://codereview.chromium.org/304333002
 2014-06-02 12:09:30 -07:00
krajcevski
9c0e629c64 Initial work to get ETC1 data up to the GPU 
Committed: http://code.google.com/p/skia/source/detail?r=15001

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

Author: krajcevski@google.com

Review URL: https://codereview.chromium.org/302783002
 2014-06-02 07:38:15 -07:00
commit-bot@chromium.org
22a1d96ca3 New file for simpler updating of Android defines. 
When building Skia for the Android framework, we will now read a
file which only includes defines. This will make it easier for
people deprecating APIs to add the guard to Android.

R=reed@google.com, djsollen@google.com, bungeman@google.com

Author: scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@15013 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 21:53:01 +00:00
commit-bot@chromium.org
a3264e53ee Revert "Revert of setConfig -> setInfo (https://codereview.chromium.org/308683005/)" 
This reverts commit eecaea4148805834f223681f70b6488ceba12d09.

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

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14989 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 13:26:10 +00:00
commit-bot@chromium.org
e3c400f1bd Set the default discardable pool size for Android framework. 
BUG=skia:2389
R=halcanary@google.com

Author: scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14939 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-28 21:44:05 +00:00
commit-bot@chromium.org
64f6d15451 Use SkAtomics_sync on Android 
Every doc I've found about using Android's atomics says, "stop".

"* A handful of basic atomic operations.  The appropriate pthread
 * functions should be used instead of these whenever possible."

"... we recommend stopping from using these functions entirely. Very fortunately, GCC provides handy intrinsics functions that work with very reasonable performance and always provide a full barrier."

As far as I can tell, there's no code generation change here: both the __sync atomics and the android_ atomics use full memory barriers.  (And now with this all unified, it'll be easier to get the real wins by switching everything to __atomic atomics, which are like __sync atomics but allow control over memory barriers.)

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

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14896 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-27 15:55:35 +00:00
commit-bot@chromium.org
815d3600e9 Remove -mfpmath=sse for clang, which does it automatically and sometimes is annoyed by it. 
BUG=skia:

NOTREECHECKS=true
R=mtklein@google.com

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14812 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-20 19:42:03 +00:00
commit-bot@chromium.org
6a106ce251 SSE2 everywhere. 
As of M35, Chrome will require SSE2 on Linux (it already did on Windows, and
requires SSSE3 on Macs).  Android already requires SSE2 for x86 chips.

This effectively just forces it on for 32-bit Linux builds; everyone else already had it.

BUG=skia:

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

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

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14811 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-20 19:02:55 +00:00
commit-bot@chromium.org
6379129229 Revert of SSE2 everywhere. (https://codereview.chromium.org/294963002/) 
Reason for revert:
Making GM run fewer tests than expected?

Original issue's description:
> SSE2 everywhere.
>
> As of M35, Chrome will require SSE2 on Linux (it already did on Windows, and
> requires SSSE3 on Macs).  Android already requires SSE2 for x86 chips.
>
> This effectively just forces it on for 32-bit Linux builds; everyone else already had it.
>
> BUG=skia:
>
> Committed: http://code.google.com/p/skia/source/detail?r=14800

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

Author: mtklein@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14803 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-20 15:27:35 +00:00
commit-bot@chromium.org
28f070d2a4 SSE2 everywhere. 
As of M35, Chrome will require SSE2 on Linux (it already did on Windows, and
requires SSSE3 on Macs).  Android already requires SSE2 for x86 chips.

This effectively just forces it on for 32-bit Linux builds; everyone else already had it.

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

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14800 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-20 14:54:09 +00:00
commit-bot@chromium.org
941ff78d79 Remove legacy constructor for blur draw looper. 
Now that Android no longer uses the constructor, remove it, along
with the flag.

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

Author: scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14797 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-20 14:53:32 +00:00
commit-bot@chromium.org
61744ec1d2 Generate bench/Android.mk from gyp. 
For now, remove json functionality and do not depend on json. This
allows us to build and run until solving skbug.com/2448.

bench/DeferredSurfaceCopyBench.cpp:
Include GrRenderTarget last, so SK_SUPPORT_GPU will be set properly.

bench/ResultsWriter.h:
bench/benchmain.cpp:
Remove JSONResultsWriter when SK_BUILD_JSON_WRITER is not defined,
which is the case for the Android framework build.

gyp/bench.gyp:
Depend on skia and cutils (for android_atomic_inc etc).

gyp/common_conditions.gypi:
Define SK_BUILD_JSON_WRITER when skia_build_json_writer is set.

gyp/common_variables.gypi:
Add a flag for skia_build_json_writer, and set it only when
skia_android_framework is not set.

gyp/jsoncpp.gyp:
Do not build jsoncpp when skia_build_json_writer is not defined.
include/utils/SkJSONCPP.h:
Do not include json headers when SK_BUILD_JSON_WRITER is not defined.

platform_tools/android/bin/gyp_to_android.py:
Generate bench/Android.mk.

platform_tools/android/gyp_gen/gypd_parser.py:
Skip dest_dir when checking for include_dirs.

platform_tools/android/gyp_gen/makefile_writer.py:
Build bench/Android.mk when building external/skia.

platform_tools/android/gyp_gen/tool_makefile_writer.py:
Add a parameter for putting the binary into /data/local/tmp.

BUG=skia:2447
BUG=skia:2448
R=halcanary@google.com, reed@google.com

Author: scroggo@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14760 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-16 13:15:41 +00:00
commit-bot@chromium.org
92cea277d7 Remove legacy SkLayerRasterizer flag for Android. 
Android's uses of SkLayerRasterizer have been cleaned up and no longer require
the legacy API. Remove the flag for Android.
We still have to keep the legacy API around until Mozilla have cleaned up their
uses.

BUG=skia:2187
R=reed@google.com, djsollen@google.com

Author: dominikg@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14710 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-13 14:47:17 +00:00
djsollen@google.com
7e9fedade8 Fix the android framework build as it still uses mutable local matrices. 
R=reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14706 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-13 13:35:04 +00:00
commit-bot@chromium.org
199cf69575 Fix Moz2D build 
BUG=skia:2221
R=george@mozilla.com, reed@google.com

Author: borenet@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14647 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-08 15:29:57 +00:00
commit-bot@chromium.org
50ca12be56 Statically initialize those zero-size singletons. 
This way GCC/Clang don't generate the magic static code to call the
pointless T::T() once in a threadsafe way.  = {} is plenty initialized.

BUG=skia:2378

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

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

Author: mtklein@chromium.org

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14626 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-07 19:56:27 +00:00