AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
12,858 Commits 1 Branch 0 Tags 544 MiB
4ae94ffce5
Commit Graph

1851 Commits

Author SHA1 Message Date
mtklein
4ed75287ae Move BenchTimer to tools as Timer 
This breaks a bunch of circular dependencies between tools and gm and bench.

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

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/344213003
 2014-06-20 10:31:49 -07:00
krajcevski
f461a8fdf6 Simple GPU based dithering: 
If dithering is turned on, apply an effect that filters the pixel through
the following pipeline:

for each channel c:
  1. Compute quantized colors [low, high] that c is between
  2. Pick high by flipping a coin weighted by (c - low)

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

Author: krajcevski@google.com

Review URL: https://codereview.chromium.org/321253002
 2014-06-19 14:14:06 -07:00
bsalomon
8b2fac4b25 Cache the GrEffect used for text rendering in GrBitmapTextContext. 
R=jvanverth@google.com

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/338093005
 2014-06-19 14:13:45 -07:00
tfarina
f168b86d7f Remove Sk prefix from some bench classes. 
This idea came while commenting on
https://codereview.chromium.org/343583005/

Since SkBenchmark, SkBenchLogger and SkGMBench are not part of the Skia library,
they should not have the Sk prefix.

BUG=None
TEST=make all
R=mtklein@google.com

Author: tfarina@chromium.org

Review URL: https://codereview.chromium.org/347823004
 2014-06-19 12:32:29 -07:00
vandebo
0f9bad01b0 [PDF] Fix font embedding restrictions. 
Stop using restricted font outlines and honor don't subset restriction.

Resubmit of r12600.

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

Author: vandebo@chromium.org

Review URL: https://codereview.chromium.org/334443002
 2014-06-19 11:05:39 -07:00
mtklein
3f73e8c8d5 CrashHandler for Windows. 
Plus, print out assertion failures on Windows,
and some little tweaks to CrashHandler on other platforms for consistency.

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

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/340523007
 2014-06-19 07:41:59 -07:00
tfarina
bcbc1788b4 Refactor how we handle resources path in Tests. 
This idea emerged while doing https://codereview.chromium.org/321723002/
(commit 880914c35c).

BUG=None
TEST=make tests && out/Debug/tests
R=mtklein@google.com

Author: tfarina@chromium.org

Review URL: https://codereview.chromium.org/346453002
 2014-06-18 14:32:49 -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
mtklein
30e6e2af14 Add basic stacktrace handler using libunwind. 
This means we will all have to apt-get install libunwind8-dev on Linux.  Mac comes with everything we need already.

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

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/343583005
 2014-06-18 11:44:18 -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
mtklein
db6346a5b1 Revert of Add SSE4 optimization of S32A_Opaque_Blitrow (https://codereview.chromium.org/289473009/) 
NOTREECHECKS=true
NOTRY=true

Reason for revert:
Valgrind bot's seeing this code use uninitialized memory, and it's somehow blocking our roll into Chrome too:

> ld: warning: could not create compact unwind for
S32A_Opaque_BlitRow32_SSE4_asm:
> stack subq instruction is too different from dwarf stack size
> [10339/10982 | 3247.792] PACKAGE FRAMEWORK "Chromium Framework.framework",
> POSTBUILDS
> FAILED: ./gyp-mac-tool package-framework "Chromium Framework.framework" A &&
> (export
> BUILT_PRODUCTS_DIR=/Volumes/data/b/build/slave/mac_gpu/build/src/out/Release;
> export CONFIGURATION=Release; export CONTENTS_FOLDER_PATH="Chromium
> Framework.framework/Versions/A"; export
> DYLIB_INSTALL_NAME_BASE=@executable_path/../Versions/37.0.2056.0; export
> EXECUTABLE_NAME="Chromium Framework"; export EXECUTABLE_PATH="Chromium
> Framework.framework/Versions/A/Chromium Framework"; export
> FULL_PRODUCT_NAME="Chromium Framework.framework"; export
> INFOPLIST_PATH="Chromium Framework.framework/Versions/A/Resources/Info.plist";
> export
LD_DYLIB_INSTALL_NAME="@executable_path/../Versions/37.0.2056.0/Chromium
> Framework.framework/Chromium Framework"; export MACH_O_TYPE=mh_dylib; export
> PRODUCT_NAME="Chromium Framework"; export
> PRODUCT_TYPE=com.apple.product-type.framework; export
>
SDKROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk;
> export
>
SRCROOT=/Volumes/data/b/build/slave/mac_gpu/build/src/out/Release/../../chrome;
> export SOURCE_ROOT="${SRCROOT}"; export
> TARGET_BUILD_DIR=/Volumes/data/b/build/slave/mac_gpu/build/src/out/Release;
> export TEMP_DIR="${TMPDIR}"; export
UNLOCALIZED_RESOURCES_FOLDER_PATH="Chromium
> Framework.framework/Versions/A/Resources"; export WRAPPER_NAME="Chromium
> Framework.framework"; (cd ../../chrome && ../build/mac/tweak_info_plist.py
> "--breakpad=1" "--breakpad_uploads=0" "--keystone=0" "--scm=1"
> "--branding=Chromium" && ln -fns Versions/Current/Libraries
> "${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/Libraries" &&
> tools/build/mac/verify_order _ChromeMain
> "${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}"); G=$?; ((exit $G) || rm -rf
> 'Chromium Framework.framework') && exit $G) && touch "Chromium
> Framework.framework"
> tools/build/mac/verify_order: unordered symbols in
> /Volumes/data/b/build/slave/mac_gpu/build/src/out/Release/Chromium
> Framework.framework/Versions/A/Chromium Framework:
> S32A_Opaque_BlitRow32_SSE4_asm
> _S32A_Opaque_BlitRow32_SSE4_asm
> ninja: build stopped: subcommand failed.

Original issue's description:
> Add SSE4 optimization of S32A_Opaque_Blitrow
>
> Adds optimization of Skia S32A_Opaque_Blitrow blitter using SSE4.2 SIMD
> instruction set. Special case for when alpha is zero or opaque.
>
> Performance increase of 10%-400% compared to the existing SSE2
> optimization (measured on Silvermont architecture).
> Noticeable in ~25 different skia bench subtests, especially in
> bitmap_8888_*, repeatTile_*, and morph_*.
>
> bitmap_8888_A - 100% faster
> bitmap_8888_A_source_transparent - 250% faster
> bitmap_8888_A_source_opaque - 25% faster
> bitmap_8888_A_scale_bicubic - 75% faster
>
> Signed-off-by: Henrik Smiding <henrik.smiding@intel.com>
>
> Committed: https://skia.googlesource.com/skia/+/e2527b147679b0c43019fae7d59cc3777d2d097e
>
> Committed: https://skia.googlesource.com/skia/+/b5c281e1e06af3be804309877de1dac6145686b9

R=reed@google.com, tomhudson@google.com, djsollen@google.com, joakim.landberg@intel.com, henrik.smiding@intel.com, mtklein@chromium.org

Author: mtklein@google.com

Review URL: https://codereview.chromium.org/336413007
 2014-06-17 17:37:05 -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
887f3979f0 Add EXPERIMENTAL_beginRecording() for SkRecord-based recording. 
The interesting stuff is in SkPictureRecorder.{h,cpp}.  The rest is mostly moving SkRecord from its own directories into core to avoid circular dependencies in GYP.

After plumbing SkRecord all the way through in Picture, I'll delete its old entry point include/record/SkRecording.h.  For now it and record.gypi need to stay where they are to keep Chrome building.

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

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/331573004
 2014-06-17 12:08:16 -07: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
henrik.smiding
b5c281e1e0 Add SSE4 optimization of S32A_Opaque_Blitrow 
Adds optimization of Skia S32A_Opaque_Blitrow blitter using SSE4.2 SIMD
instruction set. Special case for when alpha is zero or opaque.

Performance increase of 10%-400% compared to the existing SSE2
optimization (measured on Silvermont architecture).
Noticeable in ~25 different skia bench subtests, especially in
bitmap_8888_*, repeatTile_*, and morph_*.

bitmap_8888_A - 100% faster
bitmap_8888_A_source_transparent - 250% faster
bitmap_8888_A_source_opaque - 25% faster
bitmap_8888_A_scale_bicubic - 75% faster

Signed-off-by: Henrik Smiding <henrik.smiding@intel.com>

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

R=reed@google.com, mtklein@google.com, tomhudson@google.com, djsollen@google.com, joakim.landberg@intel.com

Author: henrik.smiding@intel.com

Review URL: https://codereview.chromium.org/289473009
 2014-06-17 11:32:47 -07:00
reed
859b92448b move some headers out of public 
patch from issue 338263003

BUG=skia:
R=mtklein@google.com

Author: reed@google.com

Review URL: https://codereview.chromium.org/339183002
 2014-06-17 09:04:45 -07:00
reed
c3b3266b7d hide SkBitmap::Config entirely (behind a flag) 
patch from issue 339463002

TBR=

I think the NoGPU failure is unrelated, so ignoring
NOTRY=True

Author: reed@google.com

Review URL: https://codereview.chromium.org/340533002
 2014-06-17 08:38:31 -07:00
mtklein
a272d6d065 Move SkStringUtils.h to src/core. 
Doesn't need to be in include/.

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

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/335413004
 2014-06-17 07:42:35 -07:00
mtklein
d6043b20b6 Add nanomsg to third_party, with some demos. 
This isn't something I want to make part of Skia, but just a substrate to build cross-process demos on top of.  If I client were to use Skia cross-process, they'd drop their own IPC system in here.

If you're not familiar, nanomsg (nanomsg.org) is the next-gen zeromq (zeromq.org), from the same author, righting all his design wrongs from zeromq.

It's a lot like the lower half of mojo, dealing with making the connections and getting messages reliably from A to B.  Think, better sockets, and it spans nicely across in-process (with zero-copy), inter-process, and TCP.

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

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/294873004
 2014-06-16 20:21:06 -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
tfarina
055cf91416 Delete unused path_utils.* component. 
filter tool includes it but isn't using, and nobody else seems to
be using it either. So just remove it now.

BUG=None
TEST=make filter
R=mtklein@google.com

Author: tfarina@chromium.org

Review URL: https://codereview.chromium.org/324273002
 2014-06-14 04:50:04 -07:00
reed
f252f64f17 hide virtuals on device for width/height/isopaque 
R=bsalomon@google.com
NOTREECHECKS=True

Author: reed@chromium.org

Review URL: https://codereview.chromium.org/334993002
 2014-06-14 04:24:57 -07:00
kkinnunen
cb9a2c8934 Extract "text align proc" functions as reusable classes 
Extract "text align proc" as reusable classes. These classes need to be used
when writing GrTextContext subclasses.

Moves "text align proc" code that is duplicated in SkDraw and
SkBitmapTextContext to SkDrawProcs.h and SkTextMapState.h. This functionality is
also used in the new GrStencilAndCoverTextContext.

Creates new functor classes SkTextAlignProc and SkTextAlignProcScalar which
represent the previous "text align procs".

Moves TextMapState from SkDraw to SkTextMapStateProc and make it similar functor.

The transform should be comparable in speed, as the compiler can and does avoid
the call and eliminate some of the branches.

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

Author: kkinnunen@nvidia.com

Review URL: https://codereview.chromium.org/335573002
 2014-06-12 23:06:28 -07:00
reed
bfefc7c95f hide Config in SkImageDecoder -- use SkColorType instead 
patch from issue 334613003

TBR=scroggo

Author: reed@chromium.org

Review URL: https://codereview.chromium.org/334793002
 2014-06-12 17:40:00 -07:00
robertphillips
02830f0448 Remove SkPicture SK_SUPPORT_LEGACY_RECORDING_FLAG flag 
Chromium/Blink should no longer need this flag after:

Chromium: Remove use of kUsePathBoundsForClip_RecordingFlag https://codereview.chromium.org/322123002/

Blink: Remove use of kUsePathBoundsForClip_RecordingFlag https://codereview.chromium.org/326953002/

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

Author: robertphillips@google.com

Review URL: https://codereview.chromium.org/328343002
 2014-06-12 12:56:58 -07:00
tfarina
da4ed3289e Cleanup: Delete sk_tools::make_filepath() in favor of SkOSPath::SkPathJoin(). 
BUG=None
TEST=make tools tests && out/Debug/tests
R=epoger@google.com

Author: tfarina@chromium.org

Review URL: https://codereview.chromium.org/327403002
 2014-06-12 08:50:56 -07:00
jvanverth
66c9582d1b Fix a number of issues with iOS build. 
Set pointer to root view in window (for SampleApp)
Set up the correct function pointer for GL multisampling
Remove use of SkBitmap::setConfig()
Remove incomplete iOS implementation of SkFILE (use SkOSFile for now)

R=caryclark@google.com, reed@google.com, bsalomon@google.com, tfarina@chromium.org

Author: jvanverth@google.com

Review URL: https://codereview.chromium.org/322403007
 2014-06-11 13:59:22 -07:00
krajcevski
2b310e46eb Texture compression unit tests along with a couple of bug fixes 
R=robertphillips@google.com

Author: krajcevski@google.com

Review URL: https://codereview.chromium.org/330453005
 2014-06-11 12:26:49 -07:00
egdaniel
d58a0ba9cf Push dash checks into GrContext. 
Add class to hold stroke and dash info.

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

Author: egdaniel@google.com

Review URL: https://codereview.chromium.org/311183002
 2014-06-11 10:30:05 -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
egdaniel
a22ea18823 Move Dashing filterPath to a dashing utils file 
From inside GrContext, we have a need to create an SkPath an original path and
some dashing info. We do not have access to the original path effect so we need
a way to make the FilterPath function accessible outside of the effect. So I moved
the core filterPath code (and all need helper functions) out of SkDashPathEffect
and created a SkDashPath in utils to store these helper functions.

BUG=skia:

Committed: https://skia.googlesource.com/skia/+/576dcdc793a762ec63fbecdbfd5768066b548fe5

Author: egdaniel@google.com

Review URL: https://codereview.chromium.org/314623004
 2014-06-11 06:51:51 -07:00
krajcevski
5c2fca040e Add an LATC compressor to the A8 masks, and hide it behind an ifdef. 
R=robertphillips@google.com

Author: krajcevski@google.com

Review URL: https://codereview.chromium.org/326223002
 2014-06-10 17:25:28 -07:00
krajcevski
ae614409e4 Add texture compression utility 
R=robertphillips@google.com, egdaniel@google.com, halcanary@google.com, scroggo@google.com, reed@google.com

Author: krajcevski@google.com

Review URL: https://codereview.chromium.org/325733004
 2014-06-10 14:52:28 -07:00
reed
6c22573edb hide SkBitmap::setConfig 
patch from issue 325733002

TBR=scroggo

Author: reed@chromium.org

Review URL: https://codereview.chromium.org/322963002
 2014-06-09 19:52:07 -07:00
bsalomon
7c5c9da436 GM/bench for text draws with various parameters and clip rects. 
R=jvanverth@google.com, robertphillips@google.com

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/319053002
 2014-06-09 15:11:30 -07:00
cdalton
511923443f Generate path names on the client side 
Pre-allocates a range of path names and manages allocations within
that range on the client side. This allows us to generate new path
objects in a feed-forward manner that doesn't require round trips to
the GL server.

BUG=skia:
R=bsalomon@google.com, markkilgard@gmail.com

Author: cdalton@nvidia.com

Review URL: https://codereview.chromium.org/304403003
 2014-06-09 11:16:58 -07:00
robertphillips
e2b78a7131 Fix Chrome build after 9f1c241e (https://codereview.chromium.org/316143003/) 
Remove SkPicture::kUsePathBoundsForClip_RecordingFlag (https://codereview.chromium.org/316143003/) removed an SkPicture flag on which Chromium still relies.

R=scroggo@google.com
TBR=scroggo@google.com
NOTRY=true

Author: robertphillips@google.com

Review URL: https://codereview.chromium.org/325723002
 2014-06-09 07:05:05 -07:00
robertphillips
5713352a64 Chromium should no longer need the legacy SkCanvas::drawPicture interface 
With:
Switch Blink to using new Skia SkCanvas::drawPicture method - https://codereview.chromium.org/316863003/
Switch Chromium to new Skia SkCanvas::drawPicture method - https://codereview.chromium.org/315963003/

Chromium/Blink should no longer need this flag.

Note: this patch cannot be landed until the Blink change rolls into Chromium.

R=jvanverth@google.com

Author: robertphillips@google.com

Review URL: https://codereview.chromium.org/317193002
 2014-06-08 13:17:54 -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
reed
d71be5d78b remove SK_SUPPORT_LEGACY_SETCONFIG_INFO and SK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS from chrome 
TBR=
NOTRY=True

Author: reed@google.com

Review URL: https://codereview.chromium.org/320583003
 2014-06-06 09:02:22 -07:00
krajcevski
c250d2e4ab Initial KTX encoder 
The encoder comes with tests to check that the encoding/decoding
operations between ETC encoded bitmaps and ARGB bitmaps are sane.

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

Author: krajcevski@google.com

Review URL: https://codereview.chromium.org/312353003
 2014-06-06 06:16:28 -07:00
Ben Wagner
98875e1abd Rename SkFontHost_win_dw.cpp SkScalerContext. 
This is a continuation of https://codereview.chromium.org/314193002/ .

TBR=reed@google.com

Review URL: https://codereview.chromium.org/315173004
 2014-06-05 16:55:58 -04:00
bungeman
51daa25a2b Split SkFontHost_win_dw. 
Split SkFontHost_win_dw into FontMgr, Typeface, and ScalerContext.
This makes working on these files easier, and moves away from the legacy
FontHost naming.

R=reed@google.com

Author: bungeman@google.com

Review URL: https://codereview.chromium.org/314193002
 2014-06-05 13:38:45 -07:00
reed
6dd061f138 add SK_SUPPORT_LEGACY_COMPUTE_CONFIG_SIZE 
TBR=scroggo
NOTRY=True

Author: reed@google.com

Review URL: https://codereview.chromium.org/315263002
 2014-06-05 10:00:04 -07:00
jvanverth
71804cc303 Revert of Add SSE4 optimization of S32A_Opaque_Blitrow (https://codereview.chromium.org/289473009/) 
Reason for revert:
Buildbot failures on Mac 10.6 and Mac 10.7.

R=reed@google.com, mtklein@google.com, tomhudson@google.com, djsollen@google.com, joakim.landberg@intel.com, henrik.smiding@intel.com
TBR=reed@google.com
NOTRY=True

Original issue's description:
> Add SSE4 optimization of S32A_Opaque_Blitrow
>
> Adds optimization of Skia S32A_Opaque_Blitrow blitter using SSE4.2 SIMD
> instruction set. Special case for when alpha is zero or opaque.
>
> Performance increase of 10%-400% compared to the existing SSE2
> optimization (measured on Silvermont architecture).
> Noticeable in ~25 different skia bench subtests, especially in
> bitmap_8888_*, repeatTile_*, and morph_*.
>
> bitmap_8888_A - 100% faster
> bitmap_8888_A_source_transparent - 250% faster
> bitmap_8888_A_source_opaque - 25% faster
> bitmap_8888_A_scale_bicubic - 75% faster
>
> Signed-off-by: Henrik Smiding <henrik.smiding@intel.com>
>
> Committed: https://skia.googlesource.com/skia/+/e2527b147679b0c43019fae7d59cc3777d2d097e

Author: jvanverth@google.com

Review URL: https://codereview.chromium.org/311053009
 2014-06-05 08:19:23 -07:00
halcanary
5ec3d21714 remove ashmem from skia 
R=scroggo@google.com, djsollen@google.com

Author: halcanary@google.com

Review URL: https://codereview.chromium.org/319533004
 2014-06-05 08:16:34 -07:00
henrik.smiding
e2527b1476 Add SSE4 optimization of S32A_Opaque_Blitrow 
Adds optimization of Skia S32A_Opaque_Blitrow blitter using SSE4.2 SIMD
instruction set. Special case for when alpha is zero or opaque.

Performance increase of 10%-400% compared to the existing SSE2
optimization (measured on Silvermont architecture).
Noticeable in ~25 different skia bench subtests, especially in
bitmap_8888_*, repeatTile_*, and morph_*.

bitmap_8888_A - 100% faster
bitmap_8888_A_source_transparent - 250% faster
bitmap_8888_A_source_opaque - 25% faster
bitmap_8888_A_scale_bicubic - 75% faster

Signed-off-by: Henrik Smiding <henrik.smiding@intel.com>

R=reed@google.com, mtklein@google.com, tomhudson@google.com, djsollen@google.com, joakim.landberg@intel.com

Author: henrik.smiding@intel.com

Review URL: https://codereview.chromium.org/289473009
 2014-06-05 07:50:54 -07:00
robertphillips
c2fce56522 Add bench for rectanizers 
R=bsalomon@google.com, jvanverth@google.com

Author: robertphillips@google.com

Review URL: https://codereview.chromium.org/319523003
 2014-06-05 07:18:03 -07:00
krajcevski
9a3cdbb3d0 Two new benches for ETC1 bitmaps. 
First bench: Simply render from a compressed ETC1 bitmap. This is roughly
equal between compressed and uncompressed data.

Second bench: Notify the bitmap that the pixels have changed (that's right,
like a liar) to force a re-upload to the GPU. On this bench, decompressed
textures seem to inexplicably do an order of magnitude better than
compressed textures when it should be the other way around, but that
investigation is reserved for a future CL.

R=robertphillips@google.com

Author: krajcevski@google.com

Review URL: https://codereview.chromium.org/317023002
 2014-06-05 07:03:39 -07:00
robertphillips
1a0a86f072 Remove Android flag for legacy SkCanvas::drawPicture API 
Android should no longer need this flag

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

Author: robertphillips@google.com

Review URL: https://codereview.chromium.org/316933005
 2014-06-04 11:43:42 -07:00
Hal Canary
479bb60622 Remove SkImageRef and related functionality. 
From here on out, use SkDecodingImageGenerator+SkDiscardablePixelRef.

R=scroggo@google.com

Review URL: https://codereview.chromium.org/100183002
 2014-06-04 14:38:48 -04:00
egdaniel
ea902d9150 Add utils gypi file 
BUG=skia:
R=bsalomon@google.com, robertphillips@google.com

Author: egdaniel@google.com

Review URL: https://codereview.chromium.org/317733003
 2014-06-04 10:37:06 -07:00
fmalita
fe68617ec1 Relocate SK_IGNORE_CORRECT_HIGH_QUALITY_IMAGE_SCALE 
Temporarily move the flag into Chromium's repo, to facilitate
atomic remove-and-suppress-failures changes.

BUG=380686
R=humper@google.com
TBR=humper@google.com

Author: fmalita@chromium.org

Review URL: https://codereview.chromium.org/319533002
 2014-06-04 10:27:36 -07:00
egdaniel
90b8cafb6a Revert of Move Dashing filterPath to a dashing utils file (https://codereview.chromium.org/314623004/) 
Reason for revert:
Need to create utils.gypi file and update chrome

Original issue's description:
> Move Dashing filterPath to a dashing utils file
>
> From inside GrContext, we have a need to create an SkPath an original path and
> some dashing info. We do not have access to the original path effect so we need
> a way to make the FilterPath function accessible outside of the effect. So I moved
> the core filterPath code (and all need helper functions) out of SkDashPathEffect
> and created a SkDashPath in utils to store these helper functions.
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/576dcdc793a762ec63fbecdbfd5768066b548fe5

R=bsalomon@google.com, reed@google.com, rmistry@google.com
TBR=bsalomon@google.com, reed@google.com, rmistry@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Author: egdaniel@google.com

Review URL: https://codereview.chromium.org/317663003
 2014-06-04 09:59:08 -07:00
krajcevski
2dc337c3ae Add non power of two gm for ETC1 bitmap 
R=robertphillips@google.com

Author: krajcevski@google.com

Review URL: https://codereview.chromium.org/316813005
 2014-06-04 09:57:48 -07:00
egdaniel
576dcdc793 Move Dashing filterPath to a dashing utils file 
From inside GrContext, we have a need to create an SkPath an original path and
some dashing info. We do not have access to the original path effect so we need
a way to make the FilterPath function accessible outside of the effect. So I moved
the core filterPath code (and all need helper functions) out of SkDashPathEffect
and created a SkDashPath in utils to store these helper functions.

BUG=skia:
R=bsalomon@google.com, reed@google.com, rmistry@google.com

Author: egdaniel@google.com

Review URL: https://codereview.chromium.org/314623004
 2014-06-04 08:15:53 -07:00
robertphillips
9b14f26d0f Alter SkCanvas::drawPicture (devirtualize, take const SkPicture, take pointer) 
R=reed@google.com, bsalomon@google.com, mtklein@google.com

Author: robertphillips@google.com

Review URL: https://codereview.chromium.org/313613004
 2014-06-04 05:40:44 -07:00
reed
abc0733760 readd SK_SUPPORT_LEGACY_SETCONFIG_INFO -- missed a place in a blink test 
R=jvanverth@google.com
TBR=jvanverth
NOTRY=True

Author: reed@google.com

Review URL: https://codereview.chromium.org/316753002
 2014-06-03 16:51:10 -07:00
reed
9307073a7e remove unneeded flags SK_SUPPORT_LEGACY_SETCONFIG_INFO and SK_SUPPORT_LEGACY_DEVICE_CONFIG 
TBR=scroggo

Author: reed@google.com

Review URL: https://codereview.chromium.org/315733002
 2014-06-03 15:39:06 -07:00
mtklein
bec3634a4a Android: remove -lcutils dependency 
I believe we no longer depend on this after we ported our atomics to __sync.

Tested by running android_ninja.

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

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/318493002
 2014-06-03 15:38:18 -07:00
mtklein
30bf3e2ffc DM: add pdf 
BUG=skia:2598
R=halcanary@google.com, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/312873002
 2014-06-03 13:57:14 -07:00
robertphillips
795883e15b Fix neglected cleanup of SkTileGridPicture.h 
R=bsalomon@google.com

Author: robertphillips@google.com

Review URL: https://codereview.chromium.org/312803003
 2014-06-03 13:34:06 -07:00
krajcevski
99ffe24200 Initial KTX file decoder 
R=bsalomon@google.com, robertphillips@google.com, halcanary@google.com, reed@google.com

Author: krajcevski@google.com

Review URL: https://codereview.chromium.org/302333002
 2014-06-03 13:04:35 -07:00
reed
868074b50b remove SkBounder -- unused and unloved 
BUG=skia:
R=scroggo@google.com

Author: reed@google.com

Review URL: https://codereview.chromium.org/312553006
 2014-06-03 10:54:00 -07:00
kevin.petit
866b95d65d ARM Skia NEON patches - 38 - arm64 8888 blitters 
Enable NEON on arm64 for most 8888 blitters

This patch enables NEON optimisation for the Color32, S32_Blend,
S32A_Opaque blitters on arm64.

Here are the perf improvements vs the existing code:

Color32:
========

+-------+------------+------------+
| count | Cortex-A53 | Cortex-A57 |
+-------+------------+------------+
|     1 |     -2.39% |     23.78% |
+-------+------------+------------+
|     2 |     -5.46% |      8.88% |
+-------+------------+------------+
|     4 |     -4.74% |      4.89% |
+-------+------------+------------+
|     8 |     67.74% |    107.12% |
+-------+------------+------------+
|    16 |     40.03% |    101.20% |
+-------+------------+------------+
|    64 |     11.09% |     98.40% |
+-------+------------+------------+
|   256 |     -2.20% |     74.81% |
+-------+------------+------------+
|  1024 |     -4.28% |     78.90% |
+-------+------------+------------+

S32_Blend:
==========

+-------+------------+------------+
| count | Cortex-A53 | Cortex-A57 |
+-------+------------+------------+
|     1 |      7.84% |     -6.75% |
+-------+------------+------------+
|     2 |     28.95% |     39.77% |
+-------+------------+------------+
|     4 |      5.80% |      8.26% |
+-------+------------+------------+
|     8 |      1.35% |     33.80% |
+-------+------------+------------+
|    16 |     -2.13% |     41.13% |
+-------+------------+------------+
|    64 |     -4.91% |     42.84% |
+-------+------------+------------+
|   256 |     -6.53% |     48.72% |
+-------+------------+------------+
|  1024 |     -6.65% |     46.66% |
+-------+------------+------------+

S32A_Opaque:
============

+-------+------------+------------+
| count | Cortex-A53 | Cortex-A57 |
+-------+------------+------------+
|     1 |     -7.51% |    -19.06% |
+-------+------------+------------+
|     2 |     -5.02% |    -27.70% |
+-------+------------+------------+
|     4 |     15.38% |    -21.66% |
+-------+------------+------------+
|     8 |     -0.98% |      1.05% |
+-------+------------+------------+
|    16 |     -7.35% |      3.34% |
+-------+------------+------------+
|    64 |     50.53% |     94.63% |
+-------+------------+------------+
|   256 |     71.17% |    164.10% |
+-------+------------+------------+
|  1024 |     79.58% |    197.60% |
+-------+------------+------------+

Signed-off-by: Kevin 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/302283003
 2014-06-03 10:08:07 -07:00
robertphillips
dcf9ab14a1 Remove legacy picture recording 
This is unblocked now that Android no longer uses the old interface.

This is just the first step in cleaning this up. Future CLs will constify SkPicture access in SkCanvas and split up the SkPicture/SkPicturePlayback/SkPictureRecord trio.

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

Author: robertphillips@google.com

Review URL: https://codereview.chromium.org/313613002
 2014-06-03 10:04:47 -07:00
scroggo
14052a0b5a Allow chrome to use old version of installPixels. 
R=jvanverth@google.com, reed@google.com

Author: scroggo@google.com

Review URL: https://codereview.chromium.org/312703003
 2014-06-03 07:57:51 -07:00
reed
9b4353c845 remove unneeded flags 
TBR=

Author: reed@google.com

Review URL: https://codereview.chromium.org/316463002
 2014-06-03 05:31:01 -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
robertphillips
d537341e16 Move GrIPoint16 to SkIPoint16 (and remove GrPoint.h) 
R=bsalomon@google.com, reed@google.com

Author: robertphillips@google.com

Review URL: https://codereview.chromium.org/309683002
 2014-06-02 10:20:15 -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
robertphillips
901e96df69 Add Sample slide for Rectanizers 
R=jvanverth@google.com, bsalomon@google.com

Author: robertphillips@google.com

Review URL: https://codereview.chromium.org/303263005
 2014-06-02 07:15:18 -07:00
reed
a6a8f00a39 hide SkDevice::config() 
TBR=robertphilips

Author: reed@chromium.org

Review URL: https://codereview.chromium.org/302253002
 2014-06-02 05:45:32 -07:00
commit-bot@chromium.org
ed4dc2afaa remove SK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE 
R=scroggo@google.com

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@15016 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-31 21:47:03 +00: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
b4587957f7 Revert of remove SK_SUPPORT_LEGACY_ASIMAGEINFO and SK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS (https://codereview.chromium.org/308083010/) 
Reason for revert:
broke skia/ext/bitmap_platform_device_cairo.cc:44:56: error: no matching function for call to ‘SkBitmap::installPixels

Original issue's description:
> remove SK_SUPPORT_LEGACY_ASIMAGEINFO and SK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS
> 
> TBR=
> NOTRY=
> 
> Committed: http://code.google.com/p/skia/source/detail?r=15007

TBR=
NOTREECHECKS=true
NOTRY=true

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@15010 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 21:03:38 +00:00
commit-bot@chromium.org
1fd263edb3 remove SK_SUPPORT_LEGACY_ASIMAGEINFO and SK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS 
TBR=
NOTRY=

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@15007 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 20:47:13 +00:00
commit-bot@chromium.org
999cfd1076 Revert of Initial work to get ETC1 data up to the GPU (https://codereview.chromium.org/302783002/) 
Reason for revert:
ETC1 linking problems with chrome.

Original issue's description:
> 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
TBR=bsalomon@google.com, robertphillips@google.com
NOTREECHECKS=true
NOTRY=true

Author: krajcevski@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@15004 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 20:36:21 +00:00
commit-bot@chromium.org
af091a176d Initial work to get ETC1 data up to the GPU 
R=bsalomon@google.com, robertphillips@google.com

Author: krajcevski@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@15001 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 18:41:39 +00:00
commit-bot@chromium.org
7ae034d651 Test font created from paint 
This is meant to allow clients to migrate over to a SkFont api on canvas (e.g. drawText(text, font, paint)) while still permitting the current setters in paint (e.g. setTextSize, setFlags).

R=bungeman@google.com, eae@chromium.org, fmalita@google.com, fmalita@chromium.org

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14997 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 16:46:10 +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
559a8833f0 Fix the rendering error of SkDraw::drawVertices in gpu path for solid color. 
If both textures and vertex-colors are NULL, drawVertices should stroke hairlines with the paint's color.
This behavior is a useful debugging mode to visualize the mesh.

BUG=skia:2266
R=bsalomon@google.com, reed@google.com

Author: yunchao.he@intel.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14985 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-30 10:08:22 +00:00
commit-bot@chromium.org
1803f4eb34 new animated sample to show subpixel translate bug with high quality scaling 
BUG=1445
R=reed@google.com, robertphillips@google.com

Author: humper@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14981 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-29 22:01:08 +00:00
commit-bot@chromium.org
d0f824cfbd Revert of setConfig -> setInfo (https://codereview.chromium.org/308683005/) 
Reason for revert:
broke all Windows bots

Original issue's description:
> setConfig -> setInfo
>
> BUG=skia:
>
> Committed: http://code.google.com/p/skia/source/detail?r=14978

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

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14979 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-29 21:10:32 +00:00
commit-bot@chromium.org
986d681f3e setConfig -> setInfo 
BUG=skia:
R=robertphillips@google.com

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14978 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-29 20:47:53 +00:00
reed@google.com
5744bbee6f move SkImageGenerator.cpp from src/images to src/core 
git-svn-id: http://skia.googlecode.com/svn/trunk@14973 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-29 18:47:06 +00:00
commit-bot@chromium.org
ad854bf9c0 Add testing for Rectanizer-derived classes 
This in preparation for expanding the Rectanizer API for removing rects and adding a new derived class

R=jvanverth@google.com

Author: robertphillips@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14972 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-29 18:46:38 +00:00
commit-bot@chromium.org
ff33677ea4 add SK_SUPPORT_LEGACY_INSTALLPIXELSPARAMS 
TBR=
NOTRY=True

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14968 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-29 17:28:11 +00:00
commit-bot@chromium.org
37c772ae2d Reland https://codereview.chromium.org/286903025 
BUG=skia:
R=bensong@google.com, epoger@google.com

Author: kelvinly@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14966 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-29 17:10:24 +00:00
djsollen@google.com
6ee7a0903f cleanup gyp common_variables 
R=bungeman@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14965 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-29 17:00:28 +00:00
commit-bot@chromium.org
00f8d6c75d Revert "Revert of add colortable support to imagegenerator (https://codereview.chromium.org/304443003/)" 
Fix is to add colortable param to installPixels()

This reverts commit 924205aaf2.

BUG=skia:
R=scroggo@google.com, reed@chromium.org

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14958 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-29 15:57:20 +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
a32260db15 add flag to disable changes to image scaling to avoid breaking every single 
layout test on blink all at once.

BUG=
R=epoger@google.com
TBR=epoger
NOTRY=True
NOTREECHECKS=True

Author: humper@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14931 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-28 19:52:54 +00:00
commit-bot@chromium.org
f449156bd0 Make image scaling have floating point scales. Third attempt to land this 
due to some struggles with the CQ.  Original CL here:

https://codereview.chromium.org/298243003/

BUG=
R=bsalomon@google.com, epoger@google.com
TBR=bsalomon, epoger

Author: humper@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14920 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-28 17:30:02 +00:00
commit-bot@chromium.org
924205aaf2 Revert of add colortable support to imagegenerator (https://codereview.chromium.org/304443003/) 
Reason for revert:
failing tests

Original issue's description:
> add colortable support to imagegenerator
>
> BUG=skia:
>
> Committed: http://code.google.com/p/skia/source/detail?r=14916

R=halcanary@google.com, scroggo@google.com
TBR=halcanary@google.com, scroggo@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Author: reed@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@14917 2bbb7eff-a529-9590-31e7-b0007b416f81
 2014-05-28 16:16:08 +00:00