aboutsummaryrefslogtreecommitdiffhomepage
path: root/dm/DM.cpp
Commit message (Collapse)AuthorAge
* Revert of Switch SkJpegCode to libjpeg-turbo (patchset #29 id:750001 of ↵Gravatar jvanverth2015-07-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://codereview.chromium.org/1180983002/) Reason for revert: DEPS roll failing Original issue's description: > Add libjpeg-turbo library (depends on yasm) > Mangle external function names to avoid conflict with libjpeg > Take advantage of direct color conversion (RGBA, BGRA, 565) > Prepare to use jpeg_skip_scanlines (when it is upstreamed) > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/b60c3f8291529303299262dba19b1a896060bd2d > > Committed: https://skia.googlesource.com/skia/+/f8bf9181d7b0463c8e371755cfbb9ece90b34fc5 > > Committed: https://skia.googlesource.com/skia/+/e9e3ee33f30c14c31afd5fc3fe4dda7f15783c75 > > Committed: https://skia.googlesource.com/skia/+/40141b57f061fbfcc2fa38da942d9efe25aca4d0 TBR=scroggo@google.com,djsollen@google.com,emmaleer@google.com,msarett@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1226543003
* Revert of Remove SkThread.h, include SkMutex.h or SkAtomics.h as ↵Gravatar jvanverth2015-07-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | appropriate. (patchset #4 id:60001 of https://codereview.chromium.org/1215393002/) Reason for revert: Breaking the roll. E.g. on android_chromium_gn_compile_dbg: FAILED: /b/build/goma/gomacc ../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++ -MMD -MF obj/skia/ext/libskia.SkMemory_new_handler.o.d -DV8_DEPRECATION_WARNINGS -DCLD_VERSION=1 -DENABLE_NOTIFICATIONS -DENABLE_BROWSER_CDMS -DENABLE_PRINTING=1 -DENABLE_BASIC_PRINTING=1 -DDONT_EMBED_BUILD_METADATA -DUSE_OPENSSL=1 -DUSE_OPENSSL_CERTS=1 -DNO_TCMALLOC -DDISABLE_NACL -DENABLE_CONFIGURATION_POLICY -DENABLE_SUPERVISED_USERS=1 -DENABLE_AUTOFILL_DIALOG=1 -DUSE_PROPRIETARY_CODECS -DV8_USE_EXTERNAL_STARTUP_DATA -DVIDEO_HOLE=1 -DMOBILE_SAFE_BROWSING -DSAFE_BROWSING_SERVICE -DCHROMIUM_BUILD -D_FILE_OFFSET_BITS=64 -DANDROID -DHAVE_SYS_UIO_H -DCOMPONENT_BUILD -D__GNU_SOURCE=1 -D_DEBUG -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -DSKIA_IMPLEMENTATION=1 -DSK_ARM_HAS_OPTIONAL_NEON -DSK_GAMMA_APPLY_TO_A8 -DSK_GAMMA_EXPONENT=1.4 -DSK_GAMMA_CONTRAST=0.0 -DSK_DEFAULT_FONT_CACHE_LIMIT=1048576 -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSKIA_DLL -DGR_GL_IGNORE_ES3_MSAA=0 -DSK_SUPPORT_GPU=1 -DSK_BUILD_FOR_ANDROID -DUSE_CHROMIUM_SKIA -DXML_STATIC -I../.. -Igen -I../../third_party/skia/include/private -I../../third_party/skia/src/core -I../../third_party/skia/src/image -I../../third_party/skia/src/opts -I../../third_party/skia/src/pdf -I../../third_party/skia/src/ports -I../../third_party/skia/src/sfnt -I../../third_party/skia/src/utils -I../../third_party/skia/src/lazy -I../../skia/config -I../../skia/ext -I../../third_party/skia/include/c -I../../third_party/skia/include/config -I../../third_party/skia/include/core -I../../third_party/skia/include/effects -I../../third_party/skia/include/images -I../../third_party/skia/include/lazy -I../../third_party/skia/include/pathops -I../../third_party/skia/include/pdf -I../../third_party/skia/include/pipe -I../../third_party/skia/include/ports -I../../third_party/skia/include/utils -I../../third_party/skia/include/gpu -I../../third_party/skia/src/gpu -I../../third_party/zlib -I../../third_party/expat/files/lib -I../../third_party/freetype-android/include -I../../third_party/freetype-android/src/include -I../../third_party/android_tools/ndk/sources/android/cpufeatures -fno-strict-aliasing -march=armv7-a -mfloat-abi=softfp -mtune=generic-armv7-a -mthumb -mthumb-interwork -fno-tree-sra -fno-caller-saves -funwind-tables -fPIC -pipe -ffunction-sections -funwind-tables -fno-short-enums -finline-limit=64 -mfpu=vfpv3-d16 -isystem../../third_party/android_tools/ndk/sources/cxx-stl/llvm-libc++/libcxx/include -isystem../../third_party/android_tools/ndk/sources/cxx-stl/llvm-libc++abi/libcxxabi/include -isystem../../third_party/android_tools/ndk/sources/android/support/include -fvisibility=hidden --sysroot=/b/build/slave/android_chromium_gn/build/src/third_party/android_tools/ndk/platforms/android-16/arch-arm -Os -fdata-sections -ffunction-sections -fomit-frame-pointer -g1 -Wno-format -Wendif-labels -Werror -Wno-missing-field-initializers -Wno-unused-parameter -Wno-psabi -Wno-extra -Wno-ignored-qualifiers -Wno-type-limits -Wno-unused-local-typedefs -fno-threadsafe-statics -fvisibility-inlines-hidden -std=gnu++11 -fno-rtti -fno-exceptions -Wno-deprecated -Wno-narrowing -Wno-literal-suffix -Wno-error=c++0x-compat -Wno-non-virtual-dtor -Wno-sign-promo -c ../../skia/ext/SkMemory_new_handler.cpp -o obj/skia/ext/libskia.SkMemory_new_handler.o ../../skia/ext/SkMemory_new_handler.cpp:12:52: fatal error: third_party/skia/include/core/SkThread.h: No such file or directory #include "third_party/skia/include/core/SkThread.h" Original issue's description: > Remove SkThread.h, include SkMutex.h or SkAtomics.h as appropriate. > > SkThread.h doesn't do anything anymore execept include those two, > and thankfully, it doesn't seem to be mentioned outside Skia. > > No public API changes. > TBR=reed@google.com > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/c50acf2321d7a934c80d754e9cbe936dfb8eb4cc TBR=mtklein@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1214603003
* Add libjpeg-turbo library (depends on yasm)Gravatar msarett2015-07-01
| | | | | | | | | | | | | | | | Mangle external function names to avoid conflict with libjpeg Take advantage of direct color conversion (RGBA, BGRA, 565) Prepare to use jpeg_skip_scanlines (when it is upstreamed) BUG=skia: Committed: https://skia.googlesource.com/skia/+/b60c3f8291529303299262dba19b1a896060bd2d Committed: https://skia.googlesource.com/skia/+/f8bf9181d7b0463c8e371755cfbb9ece90b34fc5 Committed: https://skia.googlesource.com/skia/+/e9e3ee33f30c14c31afd5fc3fe4dda7f15783c75 Review URL: https://codereview.chromium.org/1180983002
* Remove SkThread.h, include SkMutex.h or SkAtomics.h as appropriate.Gravatar mtklein2015-07-01
| | | | | | | | | | | | SkThread.h doesn't do anything anymore execept include those two, and thankfully, it doesn't seem to be mentioned outside Skia. No public API changes. TBR=reed@google.com BUG=skia: Review URL: https://codereview.chromium.org/1215393002
* Revert of Switch SkJpegCode to libjpeg-turbo (patchset #28 id:710001 of ↵Gravatar msarett2015-07-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://codereview.chromium.org/1180983002/) Reason for revert: Broke iOS build. Original issue's description: > Add libjpeg-turbo library (depends on yasm) > Mangle external function names to avoid conflict with libjpeg > Take advantage of direct color conversion (RGBA, BGRA, 565) > Prepare to use jpeg_skip_scanlines (when it is upstreamed) > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/b60c3f8291529303299262dba19b1a896060bd2d > > Committed: https://skia.googlesource.com/skia/+/f8bf9181d7b0463c8e371755cfbb9ece90b34fc5 > > Committed: https://skia.googlesource.com/skia/+/e9e3ee33f30c14c31afd5fc3fe4dda7f15783c75 TBR=scroggo@google.com,djsollen@google.com,emmaleer@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1213093003
* Add libjpeg-turbo library (depends on yasm)Gravatar msarett2015-07-01
| | | | | | | | | | | | | | Mangle external function names to avoid conflict with libjpeg Take advantage of direct color conversion (RGBA, BGRA, 565) Prepare to use jpeg_skip_scanlines (when it is upstreamed) BUG=skia: Committed: https://skia.googlesource.com/skia/+/b60c3f8291529303299262dba19b1a896060bd2d Committed: https://skia.googlesource.com/skia/+/f8bf9181d7b0463c8e371755cfbb9ece90b34fc5 Review URL: https://codereview.chromium.org/1180983002
* Revert of Switch SkJpegCode to libjpeg-turbo (patchset #25 id:680001 of ↵Gravatar msarett2015-06-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://codereview.chromium.org/1180983002/) Reason for revert: yasm is leaking memory :(. https://uberchromegw.corp.google.com/i/client.skia/builders/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN/builds/926/steps/build%20dm/logs/stdio Original issue's description: > Add libjpeg-turbo library (depends on yasm) > Mangle external function names to avoid conflict with libjpeg > Take advantage of direct color conversion (RGBA, BGRA, 565) > Prepare to use jpeg_skip_scanlines (when it is upstreamed) > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/b60c3f8291529303299262dba19b1a896060bd2d > > Committed: https://skia.googlesource.com/skia/+/f8bf9181d7b0463c8e371755cfbb9ece90b34fc5 TBR=scroggo@google.com,djsollen@google.com,emmaleer@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1214023003
* Add libjpeg-turbo library (depends on yasm)Gravatar msarett2015-06-29
| | | | | | | | | | | | Mangle external function names to avoid conflict with libjpeg Take advantage of direct color conversion (RGBA, BGRA, 565) Prepare to use jpeg_skip_scanlines (when it is upstreamed) BUG=skia: Committed: https://skia.googlesource.com/skia/+/b60c3f8291529303299262dba19b1a896060bd2d Review URL: https://codereview.chromium.org/1180983002
* remove SkInstCntGravatar mtklein2015-06-26
| | | | | | | | | | | | | | It's been outclassed by Valgrind and leak sanitizer, and it seems to be causing problems for external folks building Skia. I'm not sure why our own builds seem unaffected. Latest thread: https://groups.google.com/forum/#!topic/skia-discuss/oj9FsQwwSF0 BUG=skia: Review URL: https://codereview.chromium.org/1217573002
* Revert of Switch SkJpegCode to libjpeg-turbo (patchset #11 id:540001 of ↵Gravatar mtklein2015-06-24
| | | | | | | | | | | | | | | | | | | | | | | | | https://codereview.chromium.org/1180983002/) Reason for revert: https://uberchromegw.corp.google.com/i/client.skia.compile/builders/Build-Ubuntu-GCC-MipsDSP2-Debug-Android/builds/1136/steps/build%20most/logs/stdio Original issue's description: > Add libjpeg-turbo library (depends on yasm) > Mangle external function names to avoid conflict with libjpeg > Take advantage of direct color conversion (RGBA, BGRA, 565) > Prepare to use jpeg_skip_scanlines (when it is upstreamed) > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/b60c3f8291529303299262dba19b1a896060bd2d TBR=scroggo@google.com,djsollen@google.com,emmaleer@google.com,msarett@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1199253006
* Add libjpeg-turbo library (depends on yasm)Gravatar msarett2015-06-24
| | | | | | | | | | Mangle external function names to avoid conflict with libjpeg Take advantage of direct color conversion (RGBA, BGRA, 565) Prepare to use jpeg_skip_scanlines (when it is upstreamed) BUG=skia: Review URL: https://codereview.chromium.org/1180983002
* Add SkWebpCodec, for decoding .webp images.Gravatar scroggo2015-06-18
| | | | | | | | | | | Based on SkImageDecoder_libwebp. TODO: Support YUV? (Longer term - may influence our API for SkImageGenerator) BUG=skia:3257 Review URL: https://codereview.chromium.org/1044433002
* call portable font cleanup only once at app endGravatar caryclark2015-06-15
| | | | | | R=mtklein@google.com Review URL: https://codereview.chromium.org/1180593005
* Update DM to respect blacklists for testsGravatar djsollen2015-06-12
| | | | Review URL: https://codereview.chromium.org/1173363011
* DM testing for skipping and scalingGravatar msarett2015-06-11
| | | | | | BUG=skia: Review URL: https://codereview.chromium.org/1175993005
* Today's gm include many differences caused by platform font implementations.Gravatar caryclark2015-06-10
| | | | | | | | | | | | | | | This experiment replaces the label used in the aaxfermodes gm with aliased text generated from paths common to all platforms. Since there is no way today to generate all dm output from trybots, this will be checked in to confirm that this strategy provides simpler output across devices. This does not introduce a new public interface; instead, dm uses a extern backdoor to install the SkTypeface::CreateFromName handler. Review URL: https://codereview.chromium.org/1163283002
* Add prelog flag to DMGravatar bsalomon2015-06-04
| | | | Review URL: https://codereview.chromium.org/1158263004
* New CodeSrc* draw mode kScanline_Subset_ModeGravatar emmaleer2015-05-27
| | | | | | | | | kScanline_Subset_Mode decodes the image in subsets using a scanline decoder. The number of subsets can be specified by changing the constant divisor. The number of subsets is equal to divisor*divisor. Review URL: https://codereview.chromium.org/1157153003
* implement --quiet for DMGravatar reed2015-05-19
| | | | | | BUG=skia: Review URL: https://codereview.chromium.org/1139413003
* Do we still need this DOUBLE_LOOP feature?Gravatar mtklein2015-05-06
| | | | | | | | | If so, let's do it this way so it works for all source types and doesn't need to be chosen at compile time. BUG=skia: Review URL: https://codereview.chromium.org/1129693003
* DM: add a Via to simulate SP pictures.Gravatar mtklein2015-05-05
| | | | | | | | | | Will use this to test the other CL that adds small SkPicture implementations. Not quite sure why patch_primitive doesn't draw the same in 8888 and sp-8888, but everything else does, so I'm not going to let that hold me back for now. BUG=skia: Review URL: https://codereview.chromium.org/1126613005
* add deferred config to DMGravatar reed2015-05-05
| | | | | | BUG=skia: Review URL: https://codereview.chromium.org/1113273006
* DM+nanobench: print both current and max RSS.Gravatar mtklein2015-04-30
| | | | | | | | | | | | | | | | | out/Debug/dm: ( 360/380 MB 2112) 396ms gpu gm xfermodes out/Release/nanobench: 32/33 MB 1659 2.46µs 2.55µs 2.54µs 2.67µs 2% ▄▄▄▅▅▃▂▁▂█ gpu gradient_conicalZero_clamp_hicolor out/Debug/nanobench: 42/42 MB desk_css3gradients.skp_1 8888 BUG=skia: NOTREECHECKS=true Review URL: https://codereview.chromium.org/1115203002
* Requires a minor API change to pass the color table to getScanlineDecoder, ↵Gravatar msarett2015-04-29
| | | | | | | | as we do with getPixels(). BUG=skia:3722 Review URL: https://codereview.chromium.org/1061713007
* Add source-data sharding to DM.Gravatar mtklein2015-04-27
| | | | | | | | | | E.g. out/Debug/dm --shards 4 --shard 1 This shards all inputs, GMs, SKPs, tests, etc. BUG=skia: Review URL: https://codereview.chromium.org/1109813002
* DM: failure to canary a sink is now fatal.Gravatar mtklein2015-04-21
| | | | | | | | | | | This requires we remove NVPR from the default set of configs, as we only find out at runtime that it's not available. All the other defaults will either be compiled in and supported, or not compiled in and non-fatally skipped as unknown configs. BUG=skia: Review URL: https://codereview.chromium.org/1100773003
* SkJpegCodecGravatar msarett2015-04-15
| | | | | | | | | | | | Enables basic decoding for jpegs Includes rewinding 565, YUV, and Jpeg encoding are not yet implemented BUG=skia:3257 Review URL: https://codereview.chromium.org/1076923002
* cleanup codec names being produced by dm and uploaded to goldGravatar djsollen2015-04-14
| | | | Review URL: https://codereview.chromium.org/1072933004
* Fixing use of initialized memory.Gravatar msarett2015-04-14
| | | | | | | | Disabling scanline decoding to kIndex8 until it can be implemented. BUG=skia:3715 Review URL: https://codereview.chromium.org/1082923002
* ***Disables swizzles to 565.Gravatar msarett2015-04-09
| | | | | | | | | | | | | | | | | | | | | | | We may want to enable swizzles to 565 for images that are encoded in a format similar to 565, however, we do not want to take images that decode naturally to kN32 and then convert them to 565. ***Enable swizzles to kIndex_8. For images encoded in a color table format, we suggest that they be decoded to kIndex_8. When we decode, we only allow conversion to kIndex_8 if it matches the suggested color type (except wbmp which seems good as is). ***Modify dm to test images that decode to kIndex_8. BUG=skia:3257 BUG=skia:3440 Review URL: https://codereview.chromium.org/1055743003
* Move uninteresting MD5 check to after adding it to JSON.Gravatar mtklein2015-04-07
| | | | | | BUG=skia:3676 Review URL: https://codereview.chromium.org/1067053002
* Add a Via to DM that records into two pictures and draws using the second.Gravatar mtklein2015-04-07
| | | | | | | | | I'm going to start hacking on SkCanvas a bit to allow a fast reset method, and I want to have some testing checking me. BUG=skia: Review URL: https://codereview.chromium.org/1062043004
* Add --uninterestingHashesFile to DMGravatar borenet2015-04-03
| | | | | | | | | The file is expected to contain a list of strings. If the hash for any result is in this file, don't write an image for it. BUG=skia:3521 Review URL: https://codereview.chromium.org/1059363002
* Doesn't usually matter for well-formed blacklists,Gravatar mtklein2015-04-03
| | | | | | | | but helps us not run off the end. BUG=skia: Review URL: https://codereview.chromium.org/1059243002
* Update DM to allow Src's to have optional options.Gravatar djsollen2015-04-03
| | | | Review URL: https://codereview.chromium.org/1059513002
* Remove all code related to NaClGravatar borenet2015-04-02
| | | | | | | BUG=skia:3600 DOCS_PREVIEW= https://skia.org/?cl=1036283002 Review URL: https://codereview.chromium.org/1036283002
* Creating a new wrapper for gif decoderGravatar msarett2015-04-01
| | | | | | | BUG=skia:3257 BUG=skia:3534 Review URL: https://codereview.chromium.org/1022673011
* SkCodec: add wbmp classGravatar halcanary2015-03-27
| | | | Review URL: https://codereview.chromium.org/1006583005
* C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla}Gravatar mtklein2015-03-25
| | | | | | | | | NOPRESUBMIT=true BUG=skia: DOCS_PREVIEW= https://skia.org/?cl=1037793002 Review URL: https://codereview.chromium.org/1037793002
* Test scanline decoding in DM.Gravatar scroggo2015-03-25
| | | | | | BUG=skia:3475 Review URL: https://codereview.chromium.org/999173010
* Add copyright headers DM.Gravatar scroggo2015-03-25
| | | | Review URL: https://codereview.chromium.org/1037713003
* Enabling ico decoding with use of png and bmp decodersGravatar msarett2015-03-25
| | | | | | | | BUG=skia:3257 NOPRESUBMIT=true Review URL: https://codereview.chromium.org/1011343003
* Revert of Enabling ico decoding with use of png and bmp decoders (patchset ↵Gravatar tomhudson2015-03-24
| | | | | | | | | | | | | | | | | | | | | | #10 id:280001 of https://codereview.chromium.org/1011343003/) Reason for revert: Reverting on suspicion of massive bot failures - possible command line too long? Original issue's description: > Enabling ico decoding with use of png and bmp decoders > > BUG=skia:3257 > > Committed: https://skia.googlesource.com/skia/+/15bfd075d38e4422a477e22940d06a137f66cc97 TBR=scroggo@google.com,reed@google.com,djsollen@google.com,msarett@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia:3257 Review URL: https://codereview.chromium.org/1022843005
* Enabling ico decoding with use of png and bmp decodersGravatar msarett2015-03-24
| | | | | | BUG=skia:3257 Review URL: https://codereview.chromium.org/1011343003
* Some usability ideas around SkTHash.Gravatar mtklein2015-03-20
| | | | | | | | | | | | | | - By default, use new SkGoodHash to hash keys, which is: * for 4 byte values, use SkChecksum::Mix, * for SkStrings, use SkChecksum::Murmur3 on the data, * for other structs, shallow hash the struct with Murmur3. - Expand SkChecksum::Murmur3 to support non-4-byte-aligned data. - Add const foreach() methods. - Have foreach() take a functor, which allows lambdas. BUG=skia: Review URL: https://codereview.chromium.org/1021033002
* Run CodecSrc DM.Gravatar scroggo2015-03-19
| | | | | | | | | | | Rather than making SkCodec an option instead of SkImageDecoder, create a separate CodecSrc. This allows us to compare the two. For both CodecSrc and ImageSrc, do not decode to a gpu backend. BUG=skia:3475 Review URL: https://codereview.chromium.org/978823002
* Display currently running tests as the keepalive message.Gravatar mtklein2015-03-18
| | | | | | | | | | | | | | | | | | | | ... ( 466MB 550) 31.9ms gpu gm colorwheelnative ( 466MB 549) 50.1ms gpu gm colorwheel ( 468MB 548) 512ms gpu gm colortype_xfermodes Currently running: unit test PathOpsRectsThreaded unit test PathOpsSimplifyDegeneratesThreaded unit test PathOpsSimplifyQuadralateralsThreaded gpu gm colortype ( 468MB 547) 90.8ms gpu gm colortype ( 469MB 546) 2.03s unit test PathOpsSimplifyDegeneratesThreaded ... BUG=skia: Review URL: https://codereview.chromium.org/1017903002
* DM: display current memory usage (instead of peak) when available.Gravatar mtklein2015-03-12
| | | | | | | | | | | | | | | Seems strictly more useful. This implements Mac and Windows, which seemed easy. Don't know how to do this on Linux yet. BUG=skia: CQ_EXTRA_TRYBOTS=client.skia:Test-Mac10.9-MacMini6.2-HD4000-x86_64-Debug-Trybot NOTREECHECKS=true TBR=halcanary@google.com Review URL: https://codereview.chromium.org/990723002
* Rejigger keep-alive thread so TSAN and LSAN don't complain.Gravatar mtklein2015-03-12
| | | | | | BUG=skia: Review URL: https://codereview.chromium.org/1006443002
* DM: add keepalive for Valgrind bot.Gravatar mtklein2015-03-12
| | | | | | BUG=skia: Review URL: https://codereview.chromium.org/998263003