michael@0: From: George Wright <george@mozilla.com>
michael@0: Date: Mon, 14 Jan 2013 17:59:09 -0500
michael@0: Subject: Bug 848491 - Re-apply Bug 795549 - Move TileProc functions into their own file to ensure they only exist once in a library
michael@0: 
michael@0: 
michael@0: diff --git a/gfx/skia/src/effects/gradients/SkGradientShaderPriv.h b/gfx/skia/src/effects/gradients/SkGradientShaderPriv.h
michael@0: index b9dbf1b..729ce4e 100644
michael@0: --- a/gfx/skia/src/effects/gradients/SkGradientShaderPriv.h
michael@0: +++ b/gfx/skia/src/effects/gradients/SkGradientShaderPriv.h
michael@0: @@ -37,34 +37,9 @@ static inline void sk_memset32_dither(uint32_t dst[], uint32_t v0, uint32_t v1,
michael@0:      }
michael@0:  }
michael@0:  
michael@0: -//  Clamp
michael@0: -
michael@0: -static inline SkFixed clamp_tileproc(SkFixed x) {
michael@0: -    return SkClampMax(x, 0xFFFF);
michael@0: -}
michael@0: -
michael@0: -// Repeat
michael@0: -
michael@0: -static inline SkFixed repeat_tileproc(SkFixed x) {
michael@0: -    return x & 0xFFFF;
michael@0: -}
michael@0: -
michael@0: -// Mirror
michael@0: -
michael@0: -// Visual Studio 2010 (MSC_VER=1600) optimizes bit-shift code incorrectly.
michael@0: -// See http://code.google.com/p/skia/issues/detail?id=472
michael@0: -#if defined(_MSC_VER) && (_MSC_VER >= 1600)
michael@0: -#pragma optimize("", off)
michael@0: -#endif
michael@0: -
michael@0: -static inline SkFixed mirror_tileproc(SkFixed x) {
michael@0: -    int s = x << 15 >> 31;
michael@0: -    return (x ^ s) & 0xFFFF;
michael@0: -}
michael@0: -
michael@0: -#if defined(_MSC_VER) && (_MSC_VER >= 1600)
michael@0: -#pragma optimize("", on)
michael@0: -#endif
michael@0: +SkFixed clamp_tileproc(SkFixed x);
michael@0: +SkFixed repeat_tileproc(SkFixed x);
michael@0: +SkFixed mirror_tileproc(SkFixed x);
michael@0:  
michael@0:  ///////////////////////////////////////////////////////////////////////////////
michael@0:  
michael@0: -- 
michael@0: 1.7.11.7
michael@0: