Reland r5963 with two fixes:
authorbsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Tue, 16 Oct 2012 15:19:45 +0000 (15:19 +0000)
committerbsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Tue, 16 Oct 2012 15:19:45 +0000 (15:19 +0000)
commitdfdb7e5240276493077b7c6e1f3cc8b8a0e195ba
tree8052c43cb50ba6f2c5c2f8fb9a3c518e17b43d2c
parentf6eac8af585e44d56e6b18d269e6c34f9917ea88
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
22 files changed:
gm/texdata.cpp
include/core/SkShader.h
include/gpu/GrSamplerState.h
src/core/SkShader.cpp
src/effects/SkBlendImageFilter.cpp
src/effects/SkMorphologyImageFilter.cpp
src/effects/gradients/SkLinearGradient.cpp
src/effects/gradients/SkLinearGradient.h
src/effects/gradients/SkRadialGradient.cpp
src/effects/gradients/SkRadialGradient.h
src/effects/gradients/SkSweepGradient.cpp
src/effects/gradients/SkSweepGradient.h
src/effects/gradients/SkTwoPointConicalGradient.cpp
src/effects/gradients/SkTwoPointConicalGradient.h
src/effects/gradients/SkTwoPointRadialGradient.cpp
src/effects/gradients/SkTwoPointRadialGradient.h
src/gpu/GrClipMaskManager.cpp
src/gpu/GrContext.cpp
src/gpu/GrDrawState.cpp
src/gpu/GrDrawState.h
src/gpu/GrTextContext.cpp
src/gpu/SkGpuDevice.cpp