aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Adding SK_API to SkGLContextHelper and SkNullGLContext for use in blink unit ↵Gravatar commit-bot@chromium.org2014-01-17
| | | | | | | | | | | | | test component build BUG=skia: R=bsalomon@chromium.org Author: junov@chromium.org Review URL: https://codereview.chromium.org/141813002 git-svn-id: http://skia.googlecode.com/svn/trunk@13119 2bbb7eff-a529-9590-31e7-b0007b416f81
* Move GrGLExtensions from GrGLContextInfo to GrGLInterfaceGravatar commit-bot@chromium.org2014-01-17
| | | | | | | | | | | BUG=skia:2042 R=robertphillips@google.com Author: bsalomon@google.com Review URL: https://codereview.chromium.org/140823003 git-svn-id: http://skia.googlecode.com/svn/trunk@13118 2bbb7eff-a529-9590-31e7-b0007b416f81
* Add AUTHORS file for copyright trackingGravatar commit-bot@chromium.org2014-01-17
| | | | | | | | | | | BUG=skia: R=jcgregorio@google.com, rmistry@google.com Author: hcm@google.com Review URL: https://codereview.chromium.org/138413004 git-svn-id: http://skia.googlecode.com/svn/trunk@13117 2bbb7eff-a529-9590-31e7-b0007b416f81
* Adding SkPictureImageFilter to the fuzzerGravatar commit-bot@chromium.org2014-01-16
| | | | | | | | | | | BUG=skia: R=senorblanco@google.com, senorblanco@chromium.org, sugoi@google.com Author: sugoi@chromium.org Review URL: https://codereview.chromium.org/140993004 git-svn-id: http://skia.googlecode.com/svn/trunk@13116 2bbb7eff-a529-9590-31e7-b0007b416f81
* Remove GR_GL_IGNORE_ES3_MSAA.sGravatar commit-bot@chromium.org2014-01-16
| | | | | | | | | | R=jvanverth@google.com Author: bsalomon@google.com Review URL: https://codereview.chromium.org/140933005 git-svn-id: http://skia.googlecode.com/svn/trunk@13115 2bbb7eff-a529-9590-31e7-b0007b416f81
* Clear the canvas before drawing the gears.Gravatar commit-bot@chromium.org2014-01-16
| | | | | | | | | | | BUG=skia: R=robertphillips@google.com Author: jcgregorio@google.com Review URL: https://codereview.chromium.org/141113002 git-svn-id: http://skia.googlecode.com/svn/trunk@13114 2bbb7eff-a529-9590-31e7-b0007b416f81
* Make tools/submit_try saferGravatar commit-bot@chromium.org2014-01-16
| | | | | | | | | | | | | | | | | | | Using proc.wait() in combination with PIPE doesn't seem to be safe for large patches according to http://docs.python.org/2/library/subprocess.html. Moving to proc.communicate(). Signed-off-by: Kévin PETIT <kevin.petit@arm.com> BUG=skia: R=djsollen@google.com, borenet@google.com Author: kevin.petit.arm@gmail.com Review URL: https://codereview.chromium.org/141023003 git-svn-id: http://skia.googlecode.com/svn/trunk@13113 2bbb7eff-a529-9590-31e7-b0007b416f81
* Allow GrGLInterface factories in Chromium to continue to compile.Gravatar commit-bot@chromium.org2014-01-16
| | | | | | | | | | | BUG=skia:2042 TBR=jvanverth@google.com Author: bsalomon@google.com Review URL: https://codereview.chromium.org/136573003 git-svn-id: http://skia.googlecode.com/svn/trunk@13112 2bbb7eff-a529-9590-31e7-b0007b416f81
* Make GrGLContextInfo have private ptr to GrGLInterfaceGravatar commit-bot@chromium.org2014-01-16
| | | | | | | | | | | BUG=skia:2042 R=robertphillips@google.com Author: bsalomon@google.com Review URL: https://codereview.chromium.org/140843003 git-svn-id: http://skia.googlecode.com/svn/trunk@13111 2bbb7eff-a529-9590-31e7-b0007b416f81
* Missing #include "SkTemplates.h" for SkAutoTMalloc.Gravatar commit-bot@chromium.org2014-01-16
| | | | | | | | | | | BUG= R=halcanary@google.com Author: mtklein@google.com Review URL: https://codereview.chromium.org/137783021 git-svn-id: http://skia.googlecode.com/svn/trunk@13110 2bbb7eff-a529-9590-31e7-b0007b416f81
* quick fix for r13108Gravatar bsalomon@google.com2014-01-16
| | | | | | | | | | | BUG=skia:2042 NOTREECHECKS NOTRY TBR=robertphillips@google.com Review URL: https://codereview.chromium.org/135313004 git-svn-id: http://skia.googlecode.com/svn/trunk@13109 2bbb7eff-a529-9590-31e7-b0007b416f81
* Rename GrGLBinding->GrGLStandard, no longer a bitfieldGravatar commit-bot@chromium.org2014-01-16
| | | | | | | | | | | BUG=skia:2042 R=jvanverth@google.com Author: bsalomon@google.com Review URL: https://codereview.chromium.org/133413003 git-svn-id: http://skia.googlecode.com/svn/trunk@13108 2bbb7eff-a529-9590-31e7-b0007b416f81
* Hide bitmap rowbyes assert when LEGACY_ONLOCKPIXELSGravatar commit-bot@chromium.org2014-01-16
| | | | | | | | | | | | | | | | Motivation: without this, we break Blink. BUG=skia: NOTREECHECKS=true NOTRY=true R=robertphillips@google.com Author: halcanary@google.com Review URL: https://codereview.chromium.org/140903002 git-svn-id: http://skia.googlecode.com/svn/trunk@13107 2bbb7eff-a529-9590-31e7-b0007b416f81
* SK_API SkMallocPixelRefGravatar commit-bot@chromium.org2014-01-16
| | | | | | | | | | | | Motivation: make https://codereview.chromium.org/138393002/ work. R=reed@google.com, djsollen@google.com, bsalomon@google.com Author: halcanary@google.com Review URL: https://codereview.chromium.org/135853019 git-svn-id: http://skia.googlecode.com/svn/trunk@13106 2bbb7eff-a529-9590-31e7-b0007b416f81
* Sanitizing source files in Housekeeper-NightlyGravatar skia.committer@gmail.com2014-01-16
| | | | git-svn-id: http://skia.googlecode.com/svn/trunk@13105 2bbb7eff-a529-9590-31e7-b0007b416f81
* Move SkMessageBus::Get out of header, and retry crrev.com/106563002.Gravatar commit-bot@chromium.org2014-01-15
| | | | | | | | | | | BUG= R=bsalomon@google.com, kkinnunen@nvidia.com Author: mtklein@google.com Review URL: https://codereview.chromium.org/140053002 git-svn-id: http://skia.googlecode.com/svn/trunk@13104 2bbb7eff-a529-9590-31e7-b0007b416f81
* Factor out UnPreMultiplyPreservingByteOrderGravatar commit-bot@chromium.org2014-01-15
| | | | | | | | | | | BUG= R=reed@google.com Author: mtklein@google.com Review URL: https://codereview.chromium.org/130303005 git-svn-id: http://skia.googlecode.com/svn/trunk@13103 2bbb7eff-a529-9590-31e7-b0007b416f81
* Use MACOSX_DEPLOYMENT_TARGET instead of SDKROOT.Gravatar commit-bot@chromium.org2014-01-15
| | | | | | | | | | | | | | | | MACOSX_DEPLOYMENT_TARGET is the minimum unconditionally supported OS, which should just be 10.6 for us until Chrome changes. SDKROOT is the maximum conditionally supported OS, which defaults sanely to whatever's the latest SDK the machine has, so we don't need to mention it. BUG=skia: R=bungeman@google.com Author: mtklein@google.com Review URL: https://codereview.chromium.org/137793010 git-svn-id: http://skia.googlecode.com/svn/trunk@13102 2bbb7eff-a529-9590-31e7-b0007b416f81
* DM: don't change byte order when unpremultiplying to compare to PNGs.Gravatar commit-bot@chromium.org2014-01-15
| | | | | | | | | | | | | | | | | | | | We've already decoded the PNGs themselves into unpremultiplied bitmaps with native byte order. SkColor is just not the right choice unless you get lucky. dm -w /tmp/dm && dm -r /tmp/dm still works on Linux, and it's much closer to working on Mac: 0 tasks left, 2 failed Failures: matrixconvolution_gpu colormatrix_gpu BUG=skia: R=reed@google.com Author: mtklein@google.com Review URL: https://codereview.chromium.org/139943002 git-svn-id: http://skia.googlecode.com/svn/trunk@13101 2bbb7eff-a529-9590-31e7-b0007b416f81
* render_pictures: adjust unittests to show specific failuresGravatar commit-bot@chromium.org2014-01-15
| | | | | | | | | | | BUG=skia:2043,skia:2044 R=rmistry@google.com Author: epoger@google.com Review URL: https://codereview.chromium.org/139383004 git-svn-id: http://skia.googlecode.com/svn/trunk@13100 2bbb7eff-a529-9590-31e7-b0007b416f81
* Change to fuzzer for new constructorGravatar commit-bot@chromium.org2014-01-15
| | | | | | | | | | | BUG=skia: R=senorblanco@google.com, sugoi@google.com, senorblanco@chromium.org Author: sugoi@chromium.org Review URL: https://codereview.chromium.org/139613002 git-svn-id: http://skia.googlecode.com/svn/trunk@13099 2bbb7eff-a529-9590-31e7-b0007b416f81
* no need to refcnt colortables, since pixelrefs own themGravatar reed@google.com2014-01-15
| | | | | | | | | BUG=skia: R=halcanary@google.com, scroggo@google.com Review URL: https://codereview.chromium.org/139463007 git-svn-id: http://skia.googlecode.com/svn/trunk@13098 2bbb7eff-a529-9590-31e7-b0007b416f81
* Make GrGLInterface be context-specific on all platformsGravatar commit-bot@chromium.org2014-01-15
| | | | | | | | | | | BUG=skia:2042 R=robertphillips@google.com Author: bsalomon@google.com Review URL: https://codereview.chromium.org/137753005 git-svn-id: http://skia.googlecode.com/svn/trunk@13097 2bbb7eff-a529-9590-31e7-b0007b416f81
* Add new baselines for bitmapsource, dropshadowimagefilter, ↵Gravatar senorblanco@chromium.org2014-01-15
| | | | | | | | | | pictureimagefilter and resizeimagefilter GMs. TBR=djsollen Review URL: https://codereview.chromium.org/139513004 git-svn-id: http://skia.googlecode.com/svn/trunk@13096 2bbb7eff-a529-9590-31e7-b0007b416f81
* disable poplar/fontconfig by default on macGravatar commit-bot@chromium.org2014-01-15
| | | | | | | | | | | | BUG=skia:2045 NOTRY=true R=vandebo@chromium.org, mtklein@google.com Author: reed@google.com Review URL: https://codereview.chromium.org/139863002 git-svn-id: http://skia.googlecode.com/svn/trunk@13095 2bbb7eff-a529-9590-31e7-b0007b416f81
* rebaseline_server: ignore TSAN, ASAN, Valgrind botsGravatar commit-bot@chromium.org2014-01-15
| | | | | | | | | | | BUG=skia:2036 R=bsalomon@google.com Author: epoger@google.com Review URL: https://codereview.chromium.org/134643010 git-svn-id: http://skia.googlecode.com/svn/trunk@13094 2bbb7eff-a529-9590-31e7-b0007b416f81
* add asserts to validateGravatar reed@google.com2014-01-15
| | | | | | | | | BUG=skia: R=halcanary@google.com, scroggo@google.com Review URL: https://codereview.chromium.org/139063003 git-svn-id: http://skia.googlecode.com/svn/trunk@13093 2bbb7eff-a529-9590-31e7-b0007b416f81
* change isRect to return true for 3-sided rectangular pathsGravatar commit-bot@chromium.org2014-01-15
| | | | | | | | | | | BUG=skia: R=caryclark@google.com, yunchao.he@intel.com Author: reed@google.com Review URL: https://codereview.chromium.org/139483002 git-svn-id: http://skia.googlecode.com/svn/trunk@13092 2bbb7eff-a529-9590-31e7-b0007b416f81
* Roll fontconfig to 2.11.0 and reenable poppler on macGravatar commit-bot@chromium.org2014-01-15
| | | | | | | | | | R=mtklein@google.com, epoger@google.com Author: vandebo@chromium.org Review URL: https://codereview.chromium.org/138843002 git-svn-id: http://skia.googlecode.com/svn/trunk@13091 2bbb7eff-a529-9590-31e7-b0007b416f81
* Reland "Fix genID cloning bugs."Gravatar scroggo@google.com2014-01-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SkBitmap.cpp: When copyTo calls readPixels, only clone the genID if the resulting SkPixelRef has the same dimensions as the original. This catches a bug where copying an SkBitmap representing the subset of an SkPixelRef (which implements onReadPixels) would result in the copy sharing the genID. (Thanks to r6710, this case can only happen using setPixelRef, so the updated GpuBitmapCopyTest checks for that.) Move some unnecessary NULL checks to asserts. When copyTo performs a memcpy, only clone the genID if the resulting SkPixelRef has the same dimensions as the original. This catches a bug where copying an extracted SkBitmap with the same width as its original SkPixelRef would incorrectly have the same genID. Add a comment and assert in deepCopyTo, when cloning the genID, since that case correctly clones it. BitmapCopyTest.cpp: Pull redundant work out of the inner loop (setting up the source bitmaps and testing extractSubset). Create a new inner loop for extractSubset, to test copying the result to each different config. Extract a subset that has the same width as the original, to catch the bug mentioned above. Remove the reporter assert which checks for the resulting rowbytes. Add checks to ensure that copying the extracted subset changes the genID. GpuBitmapCopyTest: Create an SkBitmap that shares an existing SkPixelRef, but only represents a subset. This is to test the first call to cloneGenID in SkBitmap::copyTo. In this case, the genID should NOT be copied, since only a portion of the SkPixelRef was copied. Also test deepCopy on this subset. TestIndividualCopy now takes a parameter stating whether the genID should change in the copy. It also does a read back using the appropriate subset. It no longer differentiates between copyTo and deepCopyTo, since that distinction was only necessary for copying from/to configs other than 8888 (which are no longer being tested), where copyTo did a read back in 8888 and then drew the result to the desired config (resulting in an imperfect copy). BUG=skia:1742 Committed: http://code.google.com/p/skia/source/detail?r=13021 R=mtklein@google.com Review URL: https://codereview.chromium.org/112113005 git-svn-id: http://skia.googlecode.com/svn/trunk@13090 2bbb7eff-a529-9590-31e7-b0007b416f81
* Ignore out even if it's a symlink.Gravatar commit-bot@chromium.org2014-01-15
| | | | | | | | | | | R=halcanary@google.com BUG= Author: mtklein@google.com Review URL: https://codereview.chromium.org/139473002 git-svn-id: http://skia.googlecode.com/svn/trunk@13089 2bbb7eff-a529-9590-31e7-b0007b416f81
* [try 2] skpmaker: make the SKP more graphically interesting (add a border)Gravatar commit-bot@chromium.org2014-01-15
| | | | | | | | | | | | | | | relanding https://codereview.chromium.org/137993008/ BUG=skia:1942 NOTRY=True R=rmistry@google.com TBR=rmistry Author: epoger@google.com Review URL: https://codereview.chromium.org/139583002 git-svn-id: http://skia.googlecode.com/svn/trunk@13088 2bbb7eff-a529-9590-31e7-b0007b416f81
* Revert of skpmaker: make the SKP slightly more interesting (add a border) ↵Gravatar commit-bot@chromium.org2014-01-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | (https://codereview.chromium.org/137993008/) Reason for revert: broke http://108.170.217.252:10117/builders/Build-Mac10.6-GCC-x86-Debug/builds/2837 Original issue's description: > skpmaker: make the SKP slightly more interesting (add a border) > > This will help with render_pictures self-testing > BUG=skia:1942 > > Committed: http://code.google.com/p/skia/source/detail?r=13086 R=rmistry@google.com TBR=rmistry@google.com NOTREECHECKS=true NOTRY=true BUG=skia:1942 Author: epoger@google.com Review URL: https://codereview.chromium.org/139553002 git-svn-id: http://skia.googlecode.com/svn/trunk@13087 2bbb7eff-a529-9590-31e7-b0007b416f81
* skpmaker: make the SKP slightly more interesting (add a border)Gravatar commit-bot@chromium.org2014-01-15
| | | | | | | | | | | | This will help with render_pictures self-testing BUG=skia:1942 R=rmistry@google.com Author: epoger@google.com Review URL: https://codereview.chromium.org/137993008 git-svn-id: http://skia.googlecode.com/svn/trunk@13086 2bbb7eff-a529-9590-31e7-b0007b416f81
* Rebaseline complexclip_aa_layer image for Nexus 4Gravatar robertphillips@google.com2014-01-15
| | | | | | | | https://codereview.chromium.org/138273008/ git-svn-id: http://skia.googlecode.com/svn/trunk@13085 2bbb7eff-a529-9590-31e7-b0007b416f81
* When a picture lies about its size (i.e., claims to be 100x100 but only ever ↵Gravatar commit-bot@chromium.org2014-01-15
| | | | | | | | | | | | draws to 90x100) arbitrary pixel differences can appear in the undrawn portion. This is causing spurious differences to appear in the 8888 vs. gpu telemetry results. R=bsalomon@google.com Author: robertphillips@google.com Review URL: https://codereview.chromium.org/136553004 git-svn-id: http://skia.googlecode.com/svn/trunk@13084 2bbb7eff-a529-9590-31e7-b0007b416f81
* Sanitizing source files in Housekeeper-NightlyGravatar skia.committer@gmail.com2014-01-15
| | | | git-svn-id: http://skia.googlecode.com/svn/trunk@13083 2bbb7eff-a529-9590-31e7-b0007b416f81
* Implement a resize image filter. This is needed for the "filterRes" feature ↵Gravatar senorblanco@chromium.org2014-01-15
| | | | | | | | | | | | | | | | | in SVG filter effects, which specifies the required size for intermediate processing buffers. In order to make this work, we need to render the primitive at the given resolution (doable at the callsite in Blink), and then to resize the result to the actual on-screen size. The latter is where this filter comes in. It simply applies a scaling factor (and the current CTM) to its input, and draws its input bitmap at that size. R=reed@google.com Committed: https://code.google.com/p/skia/source/detail?r=13077 Reverted: https://code.google.com/p/skia/source/detail?r=13078 BUG= Review URL: https://codereview.chromium.org/136863006 git-svn-id: http://skia.googlecode.com/svn/trunk@13082 2bbb7eff-a529-9590-31e7-b0007b416f81
* use some helper Make functions to initialize SkImageInfoGravatar commit-bot@chromium.org2014-01-15
| | | | | | | | | | | BUG= R=halcanary@google.com, scroggo@google.com Author: reed@google.com Review URL: https://codereview.chromium.org/137993012 git-svn-id: http://skia.googlecode.com/svn/trunk@13081 2bbb7eff-a529-9590-31e7-b0007b416f81
* rebaseline blur related outputsGravatar commit-bot@chromium.org2014-01-15
| | | | | | | | | | | | | rebaseline for the differences introduced by https://codereview.chromium.org/105893003/ BUG= R=senorblanco@chromium.org, reed@google.com Author: zheng.xu@arm.com Review URL: https://codereview.chromium.org/136483002 git-svn-id: http://skia.googlecode.com/svn/trunk@13080 2bbb7eff-a529-9590-31e7-b0007b416f81
* Deprecate two more functions using SK_ATTR_DEPRECATED macro.Gravatar tfarina@chromium.org2014-01-15
| | | | | | | | | | BUG=None TEST=None R=reed@google.com, scroggo@google.com Review URL: https://codereview.chromium.org/136973007 git-svn-id: http://skia.googlecode.com/svn/trunk@13079 2bbb7eff-a529-9590-31e7-b0007b416f81
* Revert "Implement a resize image filter."Gravatar senorblanco@chromium.org2014-01-14
| | | | | | | | | | This reverts commit 3f996e31c7043929fc1553b9b5ecd6a82b5fe125 (r13077). TBR=reed Review URL: https://codereview.chromium.org/136793012 git-svn-id: http://skia.googlecode.com/svn/trunk@13078 2bbb7eff-a529-9590-31e7-b0007b416f81
* Implement a resize image filter. This is needed for the "filterRes" feature ↵Gravatar senorblanco@chromium.org2014-01-14
| | | | | | | | | | | | in SVG filter effects, which specifies the required size for intermediate processing buffers. In order to make this work, we need to render the primitive at the given resolution (doable at the callsite in Blink), and then to resize the result to the actual on-screen size. The latter is where this filter comes in. It simply applies a scaling factor (and the current CTM) to its input, and draws its input bitmap at that size. R=reed@google.com Review URL: https://codereview.chromium.org/136863006 git-svn-id: http://skia.googlecode.com/svn/trunk@13077 2bbb7eff-a529-9590-31e7-b0007b416f81
* Revert "Make leak counters thread-safe and turn them on by default for Debug"Gravatar djsollen@google.com2014-01-14
| | | | | | | | | | iThis CL is breaking the Android debug test bots by firing an assert. BUG=skia:1219 Review URL: https://codereview.chromium.org/138683006 git-svn-id: http://skia.googlecode.com/svn/trunk@13076 2bbb7eff-a529-9590-31e7-b0007b416f81
* Add BUG_PREFIX to codereview.settingsGravatar commit-bot@chromium.org2014-01-14
| | | | | | | | | | | | | | | | NOTRY=True NOTREECHECKS=True (SkipBuildbotRuns) BUG=skia:1983 R=borenet@google.com Author: rmistry@google.com Review URL: https://codereview.chromium.org/138863002 git-svn-id: http://skia.googlecode.com/svn/trunk@13075 2bbb7eff-a529-9590-31e7-b0007b416f81
* Move macros from TestClassDef.h to Test.hGravatar commit-bot@chromium.org2014-01-14
| | | | | | | | | | | | | | Motivation: those macros don't make any sense without the definitions in Test.h. BUG= R=mtklein@google.com Author: halcanary@google.com Review URL: https://codereview.chromium.org/138563004 git-svn-id: http://skia.googlecode.com/svn/trunk@13074 2bbb7eff-a529-9590-31e7-b0007b416f81
* Convert SkWriter32 to use an SkTDArray for its internal storage.Gravatar commit-bot@chromium.org2014-01-14
| | | | | | | | | | | | | | | | | | | | | | | | This reduces the allocation overhead of a null picture (create, beginRecording(), endRecording) from about 18K to about 1.9K. (There's still lots more to prune.) SkPictureFlat can exploit the fact that Writer32 is contiguous simplify its memory management. The Writer32 itself becomes the scratch buffer. Remove lots and lots of arbitrary magic numbers that were size guesses and minimum allocation sizes. Keep your eyes open for the big obvious DUH why we save 16K per picture! (Spoiler alert. It's because that first save we issue in beginRecording() forces the old SkWriter32 to allocate 16K.) Tests passing, DM passing. bench --match writer: ~20% faster null bench_record: ~30% faster bench_record on buildbot .skps: ~3-6% slower, ranging 25% faster to 20% slower bench_pictures on buildbot .skps: ~1-2% faster, ranging 13% faster to 28% slower BUG=skia:1850 R=reed@google.com Author: mtklein@google.com Review URL: https://codereview.chromium.org/137433003 git-svn-id: http://skia.googlecode.com/svn/trunk@13073 2bbb7eff-a529-9590-31e7-b0007b416f81
* Default Mac to 64-bit.Gravatar commit-bot@chromium.org2014-01-14
| | | | | | | | | | | | | DM keeps exhausting 4G address space when it's really rolling. BUG= R=reed@google.com, borenet@google.com Author: mtklein@google.com Review URL: https://codereview.chromium.org/135733004 git-svn-id: http://skia.googlecode.com/svn/trunk@13072 2bbb7eff-a529-9590-31e7-b0007b416f81
* submit_try: Obtain the list of trybots from the checked-in slaves.cfgGravatar commit-bot@chromium.org2014-01-14
| | | | | | | | | | | | | This should drastically speed up the script. BUG= R=epoger@google.com, rmistry@google.com Author: borenet@google.com Review URL: https://codereview.chromium.org/136683006 git-svn-id: http://skia.googlecode.com/svn/trunk@13071 2bbb7eff-a529-9590-31e7-b0007b416f81
* Add default_msaa16 and nvpr configs to bench_pictures.cfgGravatar commit-bot@chromium.org2014-01-14
| | | | | | | | | | | BUG=skia:2032 R=robertphillips@google.com, bsalomon@google.com Author: borenet@google.com Review URL: https://codereview.chromium.org/137313005 git-svn-id: http://skia.googlecode.com/svn/trunk@13070 2bbb7eff-a529-9590-31e7-b0007b416f81