dfdb7e5240276493077b7c6e1f3cc8b8a0e195ba - fp2-dev/platform/external/chromium_org/third_party/skia

commit	dfdb7e5240276493077b7c6e1f3cc8b8a0e195ba	[log] [tgz]
author	bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>	Tue Oct 16 15:19:45 2012 +0000
committer	bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>	Tue Oct 16 15:19:45 2012 +0000
tree	8052c43cb50ba6f2c5c2f8fb9a3c518e17b43d2c
parent	f6eac8af585e44d56e6b18d269e6c34f9917ea88 [diff]

Reland r5963 with two fixes:

Missing ref in GrSweepGradient::TestCreate.
Must reset() the sampler in setup_drawstate_aaclip() to avoid hitting a (dubious) assert.



git-svn-id: http://skia.googlecode.com/svn/trunk@5964 2bbb7eff-a529-9590-31e7-b0007b416f81

gm/texdata.cpp[diff]
include/core/SkShader.h[diff]
include/gpu/GrSamplerState.h[diff]
src/core/SkShader.cpp[diff]
src/effects/SkBlendImageFilter.cpp[diff]
src/effects/SkMorphologyImageFilter.cpp[diff]
src/effects/gradients/SkLinearGradient.cpp[diff]
src/effects/gradients/SkLinearGradient.h[diff]
src/effects/gradients/SkRadialGradient.cpp[diff]
src/effects/gradients/SkRadialGradient.h[diff]
src/effects/gradients/SkSweepGradient.cpp[diff]
src/effects/gradients/SkSweepGradient.h[diff]
src/effects/gradients/SkTwoPointConicalGradient.cpp[diff]
src/effects/gradients/SkTwoPointConicalGradient.h[diff]
src/effects/gradients/SkTwoPointRadialGradient.cpp[diff]
src/effects/gradients/SkTwoPointRadialGradient.h[diff]
src/gpu/GrClipMaskManager.cpp[diff]
src/gpu/GrContext.cpp[diff]
src/gpu/GrDrawState.cpp[diff]
src/gpu/GrDrawState.h[diff]
src/gpu/GrTextContext.cpp[diff]
src/gpu/SkGpuDevice.cpp[diff]

22 files changed

tree: 8052c43cb50ba6f2c5c2f8fb9a3c518e17b43d2c