am fdf13c90: Merge "Convert alpha from [0..1] to [0.255] range Bug #8808886" into jb-mr2-dev

* commit 'fdf13c90cb6b412dd93ae6a8990bf962e0d71407':
  Convert alpha from [0..1] to [0.255] range Bug #8808886
This commit is contained in:
Romain Guy
2013-05-06 11:11:12 -07:00
committed by Android Git Automerger

View File

@@ -3535,7 +3535,7 @@ void OpenGLRenderer::getAlphaAndMode(SkPaint* paint, int* alpha, SkXfermode::Mod
getAlphaAndModeDirect(paint, alpha, mode);
if (mDrawModifiers.mOverrideLayerAlpha < 1.0f) {
// if drawing a layer, ignore the paint's alpha
*alpha = mDrawModifiers.mOverrideLayerAlpha;
*alpha = mDrawModifiers.mOverrideLayerAlpha * 255;
}
*alpha *= mSnapshot->alpha;
}