aboutsummaryrefslogtreecommitdiffhomepage
path: root/gyp/most.gyp
Commit message (Collapse)AuthorAge
* remove all GYP filesGravatar Hal Canary2017-02-06
| | | | | | | Change-Id: I66e4fb028664f1e20cd307da0a784ff5d7b9eb5e Reviewed-on: https://skia-review.googlesource.com/8056 Commit-Queue: Hal Canary <halcanary@google.com> Reviewed-by: Mike Klein <mtklein@chromium.org>
* cleanup dead nanomsg and build_overridesGravatar mtklein2016-08-27
| | | | | | | | BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2287013003 TBR= Review-Url: https://codereview.chromium.org/2287013003
* Stub in Mac viewer code.Gravatar jvanverth2016-07-19
| | | | | | | | | BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2164683002 patch from issue 2164683002 at patchset 1 (http://crrev.com/2164683002#ps1) Review-Url: https://codereview.chromium.org/2167503002
* Try fix the mac build bot after removing Android SampleAppGravatar liyuqian2016-07-06
| | | | | | | BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2117793002 Review-Url: https://codereview.chromium.org/2117793002
* initial checkin of SkSL compilerGravatar ethannicholas2016-07-01
| | | | | | | | BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1984363002 CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot Review-Url: https://codereview.chromium.org/1984363002
* Revert of Remove Android SampleApp (patchset #5 id:80001 of ↵Gravatar rmistry2016-06-24
| | | | | | | | | | | | | | | | | | | | | | | | https://codereview.chromium.org/2096683002/ ) Reason for revert: Testing to see if this CL caused the failures in Build-Mac-Clang-Arm7-Debug-Android Original issue's description: > Remove Android SampleApp > > BUG=skia: > GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2096683002 > > Committed: https://skia.googlesource.com/skia/+/41bb5b40e71411ee39538399ea125986ec760a90 TBR=djsollen@google.com,liyuqian@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review-Url: https://codereview.chromium.org/2099693002
* Remove Android SampleAppGravatar liyuqian2016-06-23
| | | | | | | BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2096683002 Review-Url: https://codereview.chromium.org/2096683002
* Enable viewer in non-Vulkan buildsGravatar jvanverth2016-06-17
| | | | | | | | BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2067023002 Committed: https://skia.googlesource.com/skia/+/746b792a9aad1230ab69158a51c49b2e5437d95b Review-Url: https://codereview.chromium.org/2067023002
* Revert of Enable viewer in non-Vulkan builds (patchset #2 id:20001 of ↵Gravatar egdaniel2016-06-15
| | | | | | | | | | | | | | | | | | | | | | | | https://codereview.chromium.org/2067023002/ ) Reason for revert: breaking compile bots Original issue's description: > Enable viewer in non-Vulkan builds > > BUG=skia: > GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2067023002 > > Committed: https://skia.googlesource.com/skia/+/746b792a9aad1230ab69158a51c49b2e5437d95b TBR=djsollen@google.com,jvanverth@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review-Url: https://codereview.chromium.org/2072563002
* Enable viewer in non-Vulkan buildsGravatar jvanverth2016-06-15
| | | | | | | BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2067023002 Review-Url: https://codereview.chromium.org/2067023002
* Remove VisualBench and its Android implementation.Gravatar djsollen2016-05-27
| | | | | | GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2018603003 Review-Url: https://codereview.chromium.org/2018603003
* Move VisualBench_APK and SampleApp_APK to "everything" targetGravatar borenet2016-05-16
| | | | | | | BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1986433002 Review-Url: https://codereview.chromium.org/1986433002
* Rename VulkanViewer to Viewer, take 2.Gravatar jvanverth2016-05-04
| | | | | | | | | Also puts Window and Application in sk_app namespace. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1945103003 Review-Url: https://codereview.chromium.org/1945103003
* Revise WSI setup.Gravatar jvanverth2016-04-21
| | | | | | | | - Set up present queue creation correctly. - Move WSI functions to VulkanTestContext. GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1899213002 Review URL: https://codereview.chromium.org/1899213002
* VulkanViewer on AndroidGravatar djsollen2016-04-21
| | | | | | GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1903253003 Review URL: https://codereview.chromium.org/1903253003
* Get skiaserve working on Windows.Gravatar brianosman2016-04-20
| | | | | | | BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1903203003 Review URL: https://codereview.chromium.org/1903203003
* First pass at VulkanViewerGravatar jvanverth2016-04-06
| | | | | | | BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1848833005 Review URL: https://codereview.chromium.org/1848833005
* Create explicit microhttpd.gypGravatar joshualitt2016-03-09
| | | | | | | Committed: https://skia.googlesource.com/skia/+/80993639dfb8bcd26633ba1c3b7334f3ef7f6eb8 GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1779903002 Review URL: https://codereview.chromium.org/1779903002
* Revert of Create explicit microhttpd.gyp (patchset #6 id:100001 of ↵Gravatar joshualitt2016-03-09
| | | | | | | | | | | | | | | | | | | | https://codereview.chromium.org/1779903002/ ) Reason for revert: breaking per commit housekeeper Original issue's description: > Create explicit microhttpd.gyp > > Committed: https://skia.googlesource.com/skia/+/80993639dfb8bcd26633ba1c3b7334f3ef7f6eb8 TBR=bungeman@google.com,jcgregorio@google.com,ethannicholas@google.com,joshualitt@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/1781853002
* Create explicit microhttpd.gypGravatar joshualitt2016-03-09
| | | | Review URL: https://codereview.chromium.org/1779903002
* Add SkDrawPosTextHCommand JSON, fix skiaserve build.Gravatar bungeman2016-03-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds SkDrawPosTextHCommand ::fromJSON and ::toJSON. Both SkDrawPosTextCommand and SkDrawPosTextHCommand's ::toJSON write the correct number of positions, preventing reading uninitialized memory. The microhttpd build is now done in the build tree as opposed to in a temporary directory. The microhttpd build script uses os.path.join so that absolute paths do not confuse the build. This allows compatibility with the cmake gyp generator as CMake likes to pass absolute paths. The microhttpd gyp target is now marked as 'none' since it is not a 'static_library' target (which directs gyp to compile sources into a static library). The dependencies to the action are updated to the minimum required for sane re-building. The everything gyp target now depends on the skiaserve gyp target. This means that when using skia_build_server=1, building 'most' will build skiaserve, but when skia_build_server is not defined the skiaserve target will still be available if specified manually. The old json.gyp is removed as it currently does not build anything. All of the files currently referenced by it as sources no longer exist. Review URL: https://codereview.chromium.org/1775203002
* Initial support for turning Skia draws into a JSON document and vice versa.Gravatar ethannicholas2016-01-26
| | | | | | | | GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1636563002 Committed: https://skia.googlesource.com/skia/+/3cb582f688822461efa5a034e18008bf2f11e4f8 Review URL: https://codereview.chromium.org/1636563002
* Revert of Initial support for turning Skia draws into a JSON document and ↵Gravatar msarett2016-01-25
| | | | | | | | | | | | | | | | | | | | | vice versa. (patchset #3 id:80001 of https://codereview.chromium.org/1636563002/ ) Reason for revert: Breaking the CMake build. Original issue's description: > Initial support for turning Skia draws into a JSON document and vice versa. > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1636563002 > > Committed: https://skia.googlesource.com/skia/+/3cb582f688822461efa5a034e18008bf2f11e4f8 TBR=jcgregorio@google.com,joshualitt@google.com,mtklein@google.com,ethannicholas@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/1637643002
* Initial support for turning Skia draws into a JSON document and vice versa.Gravatar ethannicholas2016-01-25
| | | | | | GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1636563002 Review URL: https://codereview.chromium.org/1636563002
* First rough draft of skiaserveGravatar joshualitt2016-01-22
| | | | | | | | | Please excuse the mess while we iterate BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1621753002 Review URL: https://codereview.chromium.org/1621753002
* Modify kilobench to run each sample in its own processGravatar joshualitt2016-01-15
| | | | | | | BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1594553003 Review URL: https://codereview.chromium.org/1594553003
* Add skeleton for kilobench experimentsGravatar joshualitt2016-01-14
| | | | | | | BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1582903002 Review URL: https://codereview.chromium.org/1582903002
* Add new fuzz binary.Gravatar mtklein2016-01-13
| | | | | | | | | This is designed to have short startup time, for maximum fuzzing throughput. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1589563002 Review URL: https://codereview.chromium.org/1589563002
* Remove experimental/PdfViewerGravatar halcanary2015-08-04
| | | | | | | | Motivation: maintaining this code doesn't seem worth the time, since no one seems to be using it. If someone wants to use it in the future, just revert this CL. Review URL: https://codereview.chromium.org/1266093003
* Visual bench on native androidGravatar joshualitt2015-06-12
| | | | | | BUG=skia: Review URL: https://codereview.chromium.org/1164403002
* CL to add setFullscreen and setVsync to SkWindowGravatar joshualitt2015-05-27
| | | | | | BUG=skia: Review URL: https://codereview.chromium.org/1151333004
* Add copyright headers to remaining gyp files.Gravatar scroggo2015-03-25
| | | | | | | | Prevents some PRESUBMIT errors. TBR=mtklein@google.com Review URL: https://codereview.chromium.org/1035523003
* move HelloWorld to be a peer of SampleAppGravatar caryclark2015-02-02
| | | | | | | | This is working towards making a simple example part of the buildbot compile step and removing SkExamples from the experimental directory. This works on Mac, Windows, and Linux but isn't complete for Android, ChromeOS and iOS. Review URL: https://codereview.chromium.org/886413004
* Revert "Revert "delete old things!""Gravatar bsalomon2015-01-20
| | | | | | | | | This reverts commit 8b4489b6e696ce4b1abbffa9b2cbd0d3bfdeb387. Delete gm and other unused files TBR=mtklien@google.com Review URL: https://codereview.chromium.org/856103002
* Revert "delete old things!"Gravatar Brian Salomon2015-01-16
| | | | | | | | | | | | This reverts commit 15b125d40122e966bd723d23e82c3224b1da4898. NOTREECHECKS=true original change breaks android tree BUG=skia: Review URL: https://codereview.chromium.org/848073005
* delete old things!Gravatar bsalomon2015-01-16
| | | | | | NOTREECHECKS=true Review URL: https://codereview.chromium.org/855003006
* Revert of Make nanobench and dm be usable from Chromium build (patchset #5 ↵Gravatar jcgregorio2014-11-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | id:80001 of https://codereview.chromium.org/657373002/) Reason for revert: Causing breakages on Mac build. Original issue's description: > Make nanobench and dm be usable from Chromium build > > Move the app logic for each app as follows: > > <app>.cpp -- the file which contains main(). Embedders that compile > their own apps, such as ios shell, upcoming Chromium dm etc, do not use this. > > <app>_main.cpp -- the main logic of the Skia test application. This will be > used by Skia -compiled apps as well as embedder -compiled apps. > > <app>_main.h -- the API for the main logic. This will be > used by Skia -compiled apps as well as embedder -compiled apps. > > This way (the upcoming) Chromium dm can setup its Chromium-specific setup > in custom main(), and then call dm_main(), without the need of any > SK_BUILD_FOR_XXXX defines controlling whether the tool defines main or not. > > BUG=skia:2992 > > Committed: https://skia.googlesource.com/skia/+/c092d3bdab5f723576cc0346cea3ee282a9cb444 TBR=mtklein@chromium.org,mtklein@google.com,borenet@google.com,kkinnunen@nvidia.com NOTREECHECKS=true NOTRY=true BUG=skia:2992 Review URL: https://codereview.chromium.org/724073002
* Make nanobench and dm be usable from Chromium buildGravatar kkinnunen2014-11-13
| | | | | | | | | | | | | | | | | | | | | Move the app logic for each app as follows: <app>.cpp -- the file which contains main(). Embedders that compile their own apps, such as ios shell, upcoming Chromium dm etc, do not use this. <app>_main.cpp -- the main logic of the Skia test application. This will be used by Skia -compiled apps as well as embedder -compiled apps. <app>_main.h -- the API for the main logic. This will be used by Skia -compiled apps as well as embedder -compiled apps. This way (the upcoming) Chromium dm can setup its Chromium-specific setup in custom main(), and then call dm_main(), without the need of any SK_BUILD_FOR_XXXX defines controlling whether the tool defines main or not. BUG=skia:2992 Review URL: https://codereview.chromium.org/657373002
* Stop building tests.Gravatar mtklein2014-08-04
| | | | | | | | | BUG=skia: R=borenet@google.com, mtklein@google.com Author: mtklein@chromium.org Review URL: https://codereview.chromium.org/423073011
* update pathops core and testsGravatar caryclark2014-07-18
| | | | | | | | | | split out skpclip (the test of 1M pictures) into its own project TBR=reed Author: caryclark@google.com Review URL: https://codereview.chromium.org/400033002
* ios fixesGravatar caryclark2014-07-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | skia_ios.mm Get the app's Documents directory and pass use it to set the resource path. This is a quick hack which will be replaced by a new application that is a tiny shim around a command line tool. SkImageEncoder.h SkForceLinking.cpp SkImageDecoder_CG.cpp Add support for FORCE_LINKING so iOS sees the PNG encoder and others. SkFloatBits.cpp SkPoint.cpp Handle denormalized numbers that are floored by the iOS ARM processor. SkImageDecoder_iOS.mm Remove empty encoder factory. SkTouchGesture.cpp Return early on empty state on touch rather than aborting (crashing) JpegTest.cpp Hal via stackoverflow.com says partial jpegs can be gray as well. skia_test.cpp Remove crash handler call for now to avoid link failure. OverwriteLine.h Remove fancy line overwrite for iOS. Resources.cpp Add interface to set resource directory based on runtime query. BUG=skia:2736 skia:2737 skia:2738 R=reed@google.com, halcanary@google.com, mtklein@google.com, tfarina@chromium.org Author: caryclark@google.com Review URL: https://codereview.chromium.org/373383003
* Add nanobench, a fresh look at our microbenchmark harness.Gravatar mtklein2014-06-25
| | | | | | | | | | | | | out/Release/nanobench runs 4-5x faster on my Z620 and ~2x faster on my N5 than out/Release/bench with the same configs. (Debug isn't really comparable. I haven't added the Debug -> single loop check.) BUG=skia: R=djsollen@google.com, mtklein@google.com Author: mtklein@chromium.org Review URL: https://codereview.chromium.org/347443002
* Add nanomsg to third_party, with some demos.Gravatar mtklein2014-06-16
| | | | | | | | | | | | | | | 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
* remove bit rotted gyp from mostGravatar commit-bot@chromium.org2014-05-22
| | | | | | | | | | | | | BUG=skia:2597 R=epoger@google.com TBR=epoger NOTRY=true Author: caryclark@google.com Review URL: https://codereview.chromium.org/297823004 git-svn-id: http://skia.googlecode.com/svn/trunk@14857 2bbb7eff-a529-9590-31e7-b0007b416f81
* get iOS building againGravatar commit-bot@chromium.org2014-04-05
| | | | | | | | | | | | | | | | | | | | | | 1) Disable SampleApp. Seems like it's totally horked? SkOSFile_iOS.mm is missing about half the functions needed, and SkOSFile_stdio.cpp is double-providing the others. 2) Drop armv6. 3) Switch from putting headers in sources to putting the corresponding directories in includes. 4) Force cast the type of glShaderSource. Something to do with GR_GL_USE_NEW_SHADER_SOURCE_SIGNATURE? After all this, env CC=clang CXX=clang++ GYP_DEFINES=skia_os=ios make builds for me. BUG=skia:2363 R=bsalomon@google.com, epoger@google.com, mtklein@google.com Author: mtklein@chromium.org Review URL: https://codereview.chromium.org/226413005 git-svn-id: http://skia.googlecode.com/svn/trunk@14069 2bbb7eff-a529-9590-31e7-b0007b416f81
* Let DM work without a GPU.Gravatar commit-bot@chromium.org2014-03-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Testing: /m/s/skia (dm) $ d dm; and env GYP_DEFINES=skia_gpu=0 d dm ninja: Entering directory `out/Debug' ninja: no work to do. (294 GMs, 620 benches) x 4 configs, 245 tests 4507 tasks leftUnsupported vertex-color/texture xfer mode. Unsupported vertex-color/texture xfer mode. 0 tasks left 416.53user 9.86system 0:47.43elapsed 898%CPU (0avgtext+0avgdata 13353376maxresident)k 0inputs+0outputs (0major+3579906minor)pagefaults 0swaps ninja: Entering directory `out/Debug' [909/909] LINK dm (287 GMs, 612 benches) x 4 configs, 227 tests 0 tasks left 365.24user 7.71system 0:14.55elapsed 2562%CPU (0avgtext+0avgdata 14718912maxresident)k 0inputs+0outputs (0major+3328269minor)pagefaults 0swaps BUG=skia: R=bsalomon@google.com, mtklein@google.com Author: mtklein@chromium.org Review URL: https://codereview.chromium.org/213093004 git-svn-id: http://skia.googlecode.com/svn/trunk@13960 2bbb7eff-a529-9590-31e7-b0007b416f81
* Build Skia for a bare-bones embedded Linux system.Gravatar commit-bot@chromium.org2014-02-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Motivation: I have downloaded a barebones Linux system built for 64-bit ARM from linaro.org and a ARMv8 Foundation Model from arm.com to run it on. This will let us build and test Skia on ARM64 before we aquire hardware to allow that. This CL introduces the changes to the build files necessary to build Skia on a barebones embedded Linux system. I tested it with the aarch64 GCC compiler provided by linaro.org. Changes: Add a "barelinux" target_os for the DEPS file. Add an optional git download of zlib. Changes to gyp files: these changes abstract out libpng, libz, and giflib so that images.gyp doesn't know whether they are static or dynamically linked. I also add the variables skia_giflib_static, skia_libpng_static, skia_zlib_static, and skia_freetype_static, all of which default to false but when set to true will override the behavior of the giflib, libpng, zlib, and freetype build targets to require them to build statically. Also, the skia_no_fontconfig variable turns off use of the fontconfig service. Scripts in platform_tools/barelinux/bin: arm64_download - this script downloads the Linaro's ARMv8 Aarch64 toolchain and minimal embedded Linux system as well as ARM's foundation model. The required files are mirrored on Google Cloud. The script then starts a emulated Arm64 Linux system in the background. After the boot is complete, you can SSH into the system at port 8022 via user@localhost. The SSH key will be downloaded into the working directery as well. download_deps - Uses gclient to download Skia's dependencies for a bare Linux system (the normal dependecies plus giflib, libpng, and zlib.) barelinux_make - this script builds a version of skia that does not depend on external libraries, perfect for putting in an embedded system running Linux. Assumes you have run download_deps first. To test: To build a barelinux target, use the barelinux_make script. To build for a armv8 system: skia_arch_type=arm arm_neon=0 armv7=1 armv8=1 arm_thumb=0 skia_arch_width=64 and set the CC and CXX variables to point at the cross-compiler downloaded by arm64_download. R=djsollen@google.com, scroggo@google.com, borenet@google.com Author: halcanary@google.com Review URL: https://codereview.chromium.org/152513007 git-svn-id: http://skia.googlecode.com/svn/trunk@13570 2bbb7eff-a529-9590-31e7-b0007b416f81
* Move DM from everything to most, to build it by default.Gravatar commit-bot@chromium.org2014-01-08
| | | | | | | | | | | BUG= R=reed@google.com Author: mtklein@google.com Review URL: https://codereview.chromium.org/127423003 git-svn-id: http://skia.googlecode.com/svn/trunk@12962 2bbb7eff-a529-9590-31e7-b0007b416f81
* Remove the comments settings for vim tab width and expansion variables.Gravatar commit-bot@chromium.org2013-12-02
| | | | | | | | | | | | | | | | | | These add unnecessary bloat for everyone to carry around, so we just remove them now. The same change was made in chromium by Tony in http://codereview.chromium.org/7310019 - crrev.com/92046 BUG=None TEST=./gyp_skia R=mtklein@google.com Author: tfarina@chromium.org Review URL: https://codereview.chromium.org/92673003 git-svn-id: http://skia.googlecode.com/svn/trunk@12443 2bbb7eff-a529-9590-31e7-b0007b416f81
* pathops work in progressGravatar caryclark@google.com2013-11-01
| | | | | | | | BUG= Review URL: https://codereview.chromium.org/52653002 git-svn-id: http://skia.googlecode.com/svn/trunk@12089 2bbb7eff-a529-9590-31e7-b0007b416f81