aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* rebaseline pictureshader GM on GPUGravatar bsalomon@google.com2014-05-20
| | | | | | Review URL: https://codereview.chromium.org/294103003 git-svn-id: http://skia.googlecode.com/svn/trunk@14810 2bbb7eff-a529-9590-31e7-b0007b416f81
* Centralize decision about whether to do bicubic filtering, and fallbacks to ↵Gravatar commit-bot@chromium.org2014-05-20
| | | | | | | | | | | | mip, bilerp, or nearest R=robertphillips@google.com, humper@google.com Author: bsalomon@google.com Review URL: https://codereview.chromium.org/282293004 git-svn-id: http://skia.googlecode.com/svn/trunk@14809 2bbb7eff-a529-9590-31e7-b0007b416f81
* Changed JSON formatting more, workaround bug where SkStringPrintf causes ↵Gravatar commit-bot@chromium.org2014-05-20
| | | | | | | | | | | | | encoding issues BUG=skia: R=bensong@google.com, jcgregorio@google.com, reed@google.com, bsalomon@google.com Author: kelvinly@google.com Review URL: https://codereview.chromium.org/294093002 git-svn-id: http://skia.googlecode.com/svn/trunk@14808 2bbb7eff-a529-9590-31e7-b0007b416f81
* formalize named picture versionsGravatar commit-bot@chromium.org2014-05-20
| | | | | | | | | | | BUG=skia: R=mtklein@google.com, robertphillips@google.com Author: reed@google.com Review URL: https://codereview.chromium.org/291913004 git-svn-id: http://skia.googlecode.com/svn/trunk@14807 2bbb7eff-a529-9590-31e7-b0007b416f81
* Revert ""Revert of eliminate config param -- it was always self's config ↵Gravatar commit-bot@chromium.org2014-05-20
| | | | | | | | | | | | | | | (https://codereview.chromium.org/246513002/)""" This reverts commit 3dbceb4f8283b2fb1728d0daf010d036099a2eae. BUG=skia: R=bsalomon@google.com, robertphillips@google.com Author: reed@google.com Review URL: https://codereview.chromium.org/291163005 git-svn-id: http://skia.googlecode.com/svn/trunk@14806 2bbb7eff-a529-9590-31e7-b0007b416f81
* Rebaseline poppler (for me) and pictureshader/bleed on GPU (for Brian).Gravatar commit-bot@chromium.org2014-05-20
| | | | | | | | | | | BUG=skia: R=mtklein@google.com Author: mtklein@chromium.org Review URL: https://codereview.chromium.org/284313009 git-svn-id: http://skia.googlecode.com/svn/trunk@14805 2bbb7eff-a529-9590-31e7-b0007b416f81
* Add function to get both min and max scale factors from matrixGravatar commit-bot@chromium.org2014-05-20
| | | | | | | | | | R=reed@google.com, jvanverth@google.com Author: bsalomon@google.com Review URL: https://codereview.chromium.org/298473002 git-svn-id: http://skia.googlecode.com/svn/trunk@14804 2bbb7eff-a529-9590-31e7-b0007b416f81
* Revert of SSE2 everywhere. (https://codereview.chromium.org/294963002/)Gravatar commit-bot@chromium.org2014-05-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Since we're only using it on Linux now, just require poppler as a system ↵Gravatar commit-bot@chromium.org2014-05-20
| | | | | | | | | | | | | | | | | dependency. The Ubuntu package needed is libpoppler-cpp-dev. iconv and fontconfig were only used as Poppler dependencies. bson_c is also unused. BUG=skia: R=reed@google.com, rmistry@google.com, borenet@google.com, halcanary@google.com, mtklein@google.com Author: mtklein@chromium.org Review URL: https://codereview.chromium.org/294683003 git-svn-id: http://skia.googlecode.com/svn/trunk@14802 2bbb7eff-a529-9590-31e7-b0007b416f81
* Preserve GrContext's matrix when calling SkShader::asNewEffect.Gravatar commit-bot@chromium.org2014-05-20
| | | | | | | | | | R=robertphillips@google.com Author: bsalomon@google.com Review URL: https://codereview.chromium.org/298713002 git-svn-id: http://skia.googlecode.com/svn/trunk@14801 2bbb7eff-a529-9590-31e7-b0007b416f81
* SSE2 everywhere.Gravatar commit-bot@chromium.org2014-05-20
| | | | | | | | | | | | | | | | 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
* Add Memcpy32 bench.Gravatar commit-bot@chromium.org2014-05-20
| | | | | | | | | | | | | | | | | | | This compares 32-bit copies using memcpy, autovectorization, and when SSE2 is available, aligned and unaligned SSE2. Running this on my desktop (Intel(R) Xeon(R) CPU E5-2690 0 @ 2.90GHz), I see all four perform essentially the same, except Clang's autovectorization looks a little better than GCC's. memcpy is calling libc 2.19's __memcpy_sse2_unaligned. BUG=skia: R=reed@google.com, qiankun.miao@intel.com, mtklein@google.com Author: mtklein@chromium.org Review URL: https://codereview.chromium.org/290533002 git-svn-id: http://skia.googlecode.com/svn/trunk@14799 2bbb7eff-a529-9590-31e7-b0007b416f81
* Rename SkMatrix::get(Max|Min)Stretch to get(Min|Max)ScaleGravatar commit-bot@chromium.org2014-05-20
| | | | | | | | | | R=reed@google.com Author: bsalomon@google.com Review URL: https://codereview.chromium.org/295713002 git-svn-id: http://skia.googlecode.com/svn/trunk@14798 2bbb7eff-a529-9590-31e7-b0007b416f81
* Remove legacy constructor for blur draw looper.Gravatar commit-bot@chromium.org2014-05-20
| | | | | | | | | | | | | 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
* Rebaselines for gpu dashingGravatar commit-bot@chromium.org2014-05-20
| | | | | | | | | | | | | | NOTREECHECKS=True NOTRY=True R=bsalomon@google.com TBR=bsalomon@google.com BUG=skia: Author: egdaniel@google.com Review URL: https://codereview.chromium.org/291893004 git-svn-id: http://skia.googlecode.com/svn/trunk@14796 2bbb7eff-a529-9590-31e7-b0007b416f81
* "Revert of eliminate config param -- it was always self's config ↵Gravatar reed@google.com2014-05-20
| | | | | | | | (https://codereview.chromium.org/246513002/)"" This reverts commit 65b9f33cab9f53821720f982667412e56a340093. git-svn-id: http://skia.googlecode.com/svn/trunk@14795 2bbb7eff-a529-9590-31e7-b0007b416f81
* bench rebase after 3b9e8beGravatar commit-bot@chromium.org2014-05-20
| | | | | | | | | | | | R=robertphillips@google.com TBR=robertphillips@google.com NOTRY=true Author: bensong@google.com Review URL: https://codereview.chromium.org/289283005 git-svn-id: http://skia.googlecode.com/svn/trunk@14794 2bbb7eff-a529-9590-31e7-b0007b416f81
* Sanitizing source files in Housekeeper-NightlyGravatar skia.committer@gmail.com2014-05-20
| | | | git-svn-id: http://skia.googlecode.com/svn/trunk@14793 2bbb7eff-a529-9590-31e7-b0007b416f81
* Add missing include in SkBlurImage optimizationGravatar commit-bot@chromium.org2014-05-19
| | | | | | | | | | | | | | | | | Adds the missing include for smmintrin.h in the SkBlurImage_opts_SSE2.cpp file. Signed-off-by: Henrik Smiding <henrik.smiding@intel.com> BUG=chromium:374796 TEST=Unknown R=tomhudson@chromium.org, vapier@chromium.org, reed@chromium.org, bsalomon@chromium.org, dgreid@chromium.org, dgarrett@chromium.org, michaelpg@chromium.org, vandebo@chromium.org Author: henrik.smiding@intel.com Review URL: https://codereview.chromium.org/290923002 git-svn-id: http://skia.googlecode.com/svn/trunk@14792 2bbb7eff-a529-9590-31e7-b0007b416f81
* Update valgrind suppression fileGravatar commit-bot@chromium.org2014-05-19
| | | | | | | | | | | BUG=skia: R=bsalomon@google.com Author: egdaniel@google.com Review URL: https://codereview.chromium.org/292453010 git-svn-id: http://skia.googlecode.com/svn/trunk@14791 2bbb7eff-a529-9590-31e7-b0007b416f81
* Pass in GrContext instead of SkGpuDevice for dashing and Sk2GrPaint conversionGravatar commit-bot@chromium.org2014-05-19
| | | | | | | | | | | BUG=skia: R=bsalomon@google.com Author: egdaniel@google.com Review URL: https://codereview.chromium.org/292773002 git-svn-id: http://skia.googlecode.com/svn/trunk@14790 2bbb7eff-a529-9590-31e7-b0007b416f81
* fix utf32 text in subpixel modeGravatar commit-bot@chromium.org2014-05-19
| | | | | | | | | | | BUG=skia:2568 R=scroggo@google.com, anders@kilohearts.com Author: reed@google.com Review URL: https://codereview.chromium.org/290893003 git-svn-id: http://skia.googlecode.com/svn/trunk@14789 2bbb7eff-a529-9590-31e7-b0007b416f81
* fix off-by-one error in texture coordinate calculations for rrect gpuGravatar commit-bot@chromium.org2014-05-19
| | | | | | | | | | | | | blur; output now matches CPU BUG= R=bsalomon@google.com Author: humper@google.com Review URL: https://codereview.chromium.org/292773003 git-svn-id: http://skia.googlecode.com/svn/trunk@14788 2bbb7eff-a529-9590-31e7-b0007b416f81
* bench rebase after 71db882Gravatar commit-bot@chromium.org2014-05-19
| | | | | | | | | | | | R=robertphillips@google.com, fmalita@google.com TBR=robertphillips@google.com NOTRY=true Author: fmalita@chromium.org Review URL: https://codereview.chromium.org/299453002 git-svn-id: http://skia.googlecode.com/svn/trunk@14787 2bbb7eff-a529-9590-31e7-b0007b416f81
* Add gzip encoding responses.Gravatar commit-bot@chromium.org2014-05-19
| | | | | | | | | | | BUG=skia: R=mtklein@google.com Author: jcgregorio@google.com Review URL: https://codereview.chromium.org/298433002 git-svn-id: http://skia.googlecode.com/svn/trunk@14786 2bbb7eff-a529-9590-31e7-b0007b416f81
* Revert "Revert of eliminate config param -- it was always self's config ↵Gravatar commit-bot@chromium.org2014-05-19
| | | | | | | | | | | | (https://codereview.chromium.org/246513002/)" TBR=bsalomon@google.com Author: reed@google.com Review URL: https://codereview.chromium.org/290883005 git-svn-id: http://skia.googlecode.com/svn/trunk@14785 2bbb7eff-a529-9590-31e7-b0007b416f81
* Changed JSON formatting to fit BigQuery requirementsGravatar commit-bot@chromium.org2014-05-19
| | | | | | | | | | | BUG=skia: R=bensong@google.com, jcgregorio@google.com Author: kelvinly@google.com Review URL: https://codereview.chromium.org/290903002 git-svn-id: http://skia.googlecode.com/svn/trunk@14784 2bbb7eff-a529-9590-31e7-b0007b416f81
* Move zooming into its own component, imported via HTML Imports.Gravatar commit-bot@chromium.org2014-05-19
| | | | | | | | | | | | | | | Also, start building our own polyfill library (polyfill.js) using Grunt and Bower. Finally, refactor all the web pages so that the common header and footer material comes from templates. BUG=skia: R=mtklein@google.com Author: jcgregorio@google.com Review URL: https://codereview.chromium.org/292433002 git-svn-id: http://skia.googlecode.com/svn/trunk@14783 2bbb7eff-a529-9590-31e7-b0007b416f81
* Try out SkMatrix::Concat.Gravatar commit-bot@chromium.org2014-05-19
| | | | | | | | | | | | | This should RVO to the same as doing it on the stack with setConcat. BUG=skia: R=reed@google.com, mtklein@google.com Author: mtklein@chromium.org Review URL: https://codereview.chromium.org/293693002 git-svn-id: http://skia.googlecode.com/svn/trunk@14782 2bbb7eff-a529-9590-31e7-b0007b416f81
* gradient api sans (deprecated) unitmapperGravatar commit-bot@chromium.org2014-05-19
| | | | | | | | | | | BUG=skia: R=robertphillips@google.com Author: reed@google.com Review URL: https://codereview.chromium.org/293643004 git-svn-id: http://skia.googlecode.com/svn/trunk@14781 2bbb7eff-a529-9590-31e7-b0007b416f81
* bench rebase after 8216506Gravatar commit-bot@chromium.org2014-05-19
| | | | | | | | | | | | R=robertphillips@google.com, fmalita@google.com TBR=robertphillips@google.com NOTRY=true Author: fmalita@chromium.org Review URL: https://codereview.chromium.org/289413003 git-svn-id: http://skia.googlecode.com/svn/trunk@14780 2bbb7eff-a529-9590-31e7-b0007b416f81
* make render_pictures properly handle empty expectations fileGravatar commit-bot@chromium.org2014-05-19
| | | | | | | | | | | | | note that this changes the parameters taken by ImageResultsAndExpectations::Parse() BUG=skia:1942 R=scroggo@google.com Author: epoger@google.com Review URL: https://codereview.chromium.org/289063010 git-svn-id: http://skia.googlecode.com/svn/trunk@14779 2bbb7eff-a529-9590-31e7-b0007b416f81
* Don't clobber initial transform with SetMatrix.Gravatar commit-bot@chromium.org2014-05-19
| | | | | | | | | | | BUG=skia:2378 R=reed@google.com, mtklein@google.com, robertphillips@google.com Author: mtklein@chromium.org Review URL: https://codereview.chromium.org/290883004 git-svn-id: http://skia.googlecode.com/svn/trunk@14778 2bbb7eff-a529-9590-31e7-b0007b416f81
* Real fix for Widnows build errors for GrDashingEffectGravatar commit-bot@chromium.org2014-05-19
| | | | | | | | | | | | | | NOTREECHECKS=True NOTRY=True R=bsalomon@google.com TBR=bsalomon@google.com BUG=skia: Author: egdaniel@google.com Review URL: https://codereview.chromium.org/291903002 git-svn-id: http://skia.googlecode.com/svn/trunk@14777 2bbb7eff-a529-9590-31e7-b0007b416f81
* Fix build error for windows for Dashing CLGravatar commit-bot@chromium.org2014-05-19
| | | | | | | | | | | | | | NOTREECHECKS=True NOTRY=True R=bsalomon@google.com TBR=bsalomon@google.com BUG=skia: Author: egdaniel@google.com Review URL: https://codereview.chromium.org/291803004 git-svn-id: http://skia.googlecode.com/svn/trunk@14776 2bbb7eff-a529-9590-31e7-b0007b416f81
* Add Dashing gpu effect for simple dashed linesGravatar commit-bot@chromium.org2014-05-19
| | | | | | | | | | | BUG=skia: R=bsalomon@google.com Author: egdaniel@google.com Review URL: https://codereview.chromium.org/274673004 git-svn-id: http://skia.googlecode.com/svn/trunk@14775 2bbb7eff-a529-9590-31e7-b0007b416f81
* This adds a checkbox to the debugger to allow seeing the effect pathops has ↵Gravatar commit-bot@chromium.org2014-05-19
| | | | | | | | | | | | | | on the clip. A new tab shows the C code that the pathops generate. Once in place, this CL found a bug in the pathops code where it was not handling empty clip stack elements correctly. The Cl also has the change to SkCanvas to fix this bug. R=robertphillips@google.com, reed@google.com Author: caryclark@google.com Review URL: https://codereview.chromium.org/282283002 git-svn-id: http://skia.googlecode.com/svn/trunk@14774 2bbb7eff-a529-9590-31e7-b0007b416f81
* Add choke point for performing a fake endRecordingGravatar commit-bot@chromium.org2014-05-19
| | | | | | | | | | | | | | My goal here was to add a single location where we could patch up the created PicturePlayback. Unfortunately, the complexity of the recording process (e.g., the BBH) makes this quite complex. I will investigate altering the behavior of SkPicturePlayback to account for a potentially unbalanced set of saves/saveLayers. R=reed@google.com Author: robertphillips@google.com Review URL: https://codereview.chromium.org/283333007 git-svn-id: http://skia.googlecode.com/svn/trunk@14773 2bbb7eff-a529-9590-31e7-b0007b416f81
* Ensure playing back a picture always balances saves and restoresGravatar commit-bot@chromium.org2014-05-19
| | | | | | | | | | | | | | This "fixes" the legacy interface's possible creation of pictures with unbalanced save/restores. The Android dox will need to be updated once/if this lands. R=reed@google.com, scroggo@google.com Author: robertphillips@google.com Review URL: https://codereview.chromium.org/286033005 git-svn-id: http://skia.googlecode.com/svn/trunk@14772 2bbb7eff-a529-9590-31e7-b0007b416f81
* Fix generation tests.Gravatar commit-bot@chromium.org2014-05-16
| | | | | | | | | | | | | | R=epoger@google.com TBR=epoger NOTRY=true BUG=skia:2565 Author: scroggo@google.com Review URL: https://codereview.chromium.org/284313007 git-svn-id: http://skia.googlecode.com/svn/trunk@14771 2bbb7eff-a529-9590-31e7-b0007b416f81
* make buildbot_globals.py read global_variables.json file from googlesourceGravatar commit-bot@chromium.org2014-05-16
| | | | | | | | | | | | BUG=skia:2564 NOTRY=True R=borenet@google.com Author: epoger@google.com Review URL: https://codereview.chromium.org/291563008 git-svn-id: http://skia.googlecode.com/svn/trunk@14770 2bbb7eff-a529-9590-31e7-b0007b416f81
* Fix windows build.Gravatar commit-bot@chromium.org2014-05-16
| | | | | | | | | | | | | | Windows won't let me insert #ifdefs inside macro expansion. R=borenet@google.com TBR=borenet NOTRY=true Author: scroggo@google.com Review URL: https://codereview.chromium.org/289853003 git-svn-id: http://skia.googlecode.com/svn/trunk@14769 2bbb7eff-a529-9590-31e7-b0007b416f81
* Generate Android.mk for DM.Gravatar commit-bot@chromium.org2014-05-16
| | | | | | | | | | | | | | | | | ifdef out code that won't build where we don't have jsoncpp. Include ctype instead of string.h for tolower. Depends on https://codereview.chromium.org/282053002/ BUG=skia:2447 R=mtklein@google.com Author: scroggo@google.com Review URL: https://codereview.chromium.org/290603002 git-svn-id: http://skia.googlecode.com/svn/trunk@14768 2bbb7eff-a529-9590-31e7-b0007b416f81
* Generate gm/Android.mk, minus JSON.Gravatar commit-bot@chromium.org2014-05-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running gyp_to_android.py, generate the makefile for gm. For now, remove json functionality and do not depend on json. This allows us to build and run until solving skbug.com/2448. gm/gm_expectations.cpp: gm/gm_expectations.h: gm/gmmain.cpp: Remove all json functionality when SK_BUILD_JSON_WRITER is not defined. This flag is not defined when SK_BUILD_FOR_ANDROID is defined. gyp/gm.gyp: Depend on skia and cutils. platform_tools/android/bin/gyp_to_android.py: Generate gm/Android.mk. platform_tools/android/gyp_gen/makefile_writer.py: Build gm/Android.mk when building external/skia. Depends on https://codereview.chromium.org/282053002/ BUG=skia:2447 BUG=skia:2448 R=epoger@google.com Author: scroggo@google.com Review URL: https://codereview.chromium.org/281303003 git-svn-id: http://skia.googlecode.com/svn/trunk@14767 2bbb7eff-a529-9590-31e7-b0007b416f81
* Greenify bench bot Perf-Win7-ShuttleA-HD2000-x86-Release at build 2272Gravatar commit-bot@chromium.org2014-05-16
| | | | | | | | | | | | R=bsalomon@google.com TBR=bsalomon@google.com NOTRY=true Author: bensong@google.com Review URL: https://codereview.chromium.org/290183002 git-svn-id: http://skia.googlecode.com/svn/trunk@14766 2bbb7eff-a529-9590-31e7-b0007b416f81
* Fix Gpu texture creation bugGravatar commit-bot@chromium.org2014-05-16
| | | | | | | | | | | | | | When creating a resizedTexture on a device that doesn't support non power of 2 tile (Tegras), we were creating the new stretched texture but were not actually saving the result BUG=skia:2561 R=bsalomon@google.com, robertphillips@google.com, jvanverth@google.com Author: egdaniel@google.com Review URL: https://codereview.chromium.org/284303005 git-svn-id: http://skia.googlecode.com/svn/trunk@14765 2bbb7eff-a529-9590-31e7-b0007b416f81
* Disable poppler on Windows since it no longer compiles in VS2013Gravatar commit-bot@chromium.org2014-05-16
| | | | | | | | | | R=borenet@google.com Author: robertphillips@google.com Review URL: https://codereview.chromium.org/285293008 git-svn-id: http://skia.googlecode.com/svn/trunk@14764 2bbb7eff-a529-9590-31e7-b0007b416f81
* Revert of remove unused (by clients) SkUnitMapper ↵Gravatar commit-bot@chromium.org2014-05-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (https://codereview.chromium.org/283273002/) Reason for revert: does not address all legacy callsites in chrome. e.g. [13:45:32.091872] ../../ui/native_theme/native_theme_base.cc:608:76: error: no matching function for call to ‘SkGradientShader::CreateLinear(SkPoint [3], SkColor [3], NULL, int, SkShader::TileMode, NULL)’ [13:45:32.091919] gradient_bounds, colors, NULL, 3, SkShader::kClamp_TileMode, NULL)); Original issue's description: > remove unused (by clients) SkUnitMapper > > BUG=skia: > > Committed: http://code.google.com/p/skia/source/detail?r=14761 R=robertphillips@google.com, scroggo@google.com, george@mozilla.com TBR=george@mozilla.com, robertphillips@google.com, scroggo@google.com NOTREECHECKS=true NOTRY=true BUG=skia: Author: reed@google.com Review URL: https://codereview.chromium.org/287063009 git-svn-id: http://skia.googlecode.com/svn/trunk@14763 2bbb7eff-a529-9590-31e7-b0007b416f81
* Rebase for https://codereview.chromium.org/283803003/Gravatar commit-bot@chromium.org2014-05-16
| | | | | | | | | | | | | | NOTREECHECKS=True NOTRY=True R=bsalomon@google.com TBR=bsalomon@google.com BUG=skia: Author: egdaniel@google.com Review URL: https://codereview.chromium.org/291483008 git-svn-id: http://skia.googlecode.com/svn/trunk@14762 2bbb7eff-a529-9590-31e7-b0007b416f81
* remove unused (by clients) SkUnitMapperGravatar commit-bot@chromium.org2014-05-16
| | | | | | | | | | | BUG=skia: R=robertphillips@google.com, scroggo@google.com, george@mozilla.com Author: reed@google.com Review URL: https://codereview.chromium.org/283273002 git-svn-id: http://skia.googlecode.com/svn/trunk@14761 2bbb7eff-a529-9590-31e7-b0007b416f81