868a8e7fc83e9ac6ee1418e75b84a0595605626c - fp2-dev/platform/external/chromium_org/third_party/skia

commit	868a8e7fc83e9ac6ee1418e75b84a0595605626c	[log] [tgz]
author	bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>	Thu Aug 30 19:11:34 2012 +0000
committer	bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>	Thu Aug 30 19:11:34 2012 +0000
tree	6099dee09e40beed726e2f6d300485935b73cbb2
parent	7426743837051f43dbc1209775b391b917c69c54 [diff]

Recommit r5350 with fix for image failures (which affected GLs that don't support ARB_texture_swizzle).



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

src/effects/SkBlendImageFilter.cpp[diff]
src/effects/SkLightingImageFilter.cpp[diff]
src/effects/SkMagnifierImageFilter.cpp[diff]
src/effects/SkMorphologyImageFilter.cpp[diff]
src/effects/gradients/SkGradientShader.cpp[diff]
src/effects/gradients/SkGradientShaderPriv.h[diff]
src/effects/gradients/SkLinearGradient.cpp[diff]
src/effects/gradients/SkRadialGradient.cpp[diff]
src/effects/gradients/SkSweepGradient.cpp[diff]
src/effects/gradients/SkTwoPointConicalGradient.cpp[diff]
src/effects/gradients/SkTwoPointRadialGradient.cpp[diff]
src/gpu/effects/GrConfigConversionEffect.cpp[diff]
src/gpu/effects/GrConvolutionEffect.cpp[diff]
src/gpu/effects/GrSingleTextureEffect.cpp[diff]
src/gpu/effects/GrTextureDomainEffect.cpp[diff]
src/gpu/gl/GrGLProgram.cpp[diff]
src/gpu/gl/GrGLSL.cpp[diff]
src/gpu/gl/GrGLSL.h[diff]
src/gpu/gl/GrGLShaderBuilder.cpp[diff]
src/gpu/gl/GrGLShaderBuilder.h[diff]

20 files changed

tree: 6099dee09e40beed726e2f6d300485935b73cbb2