Merge "Ignore HasAlphaLayer flag to fix b/30929229" into nyc-mr1-dev

This commit is contained in:
Yuqian Li
2016-09-15 13:46:58 +00:00
committed by Android (Google) Code Review

View File

@@ -329,9 +329,10 @@ void SkiaCanvas::restoreToCount(int restoreCount) {
static inline SkCanvas::SaveLayerFlags layerFlags(SaveFlags::Flags flags) {
SkCanvas::SaveLayerFlags layerFlags = 0;
if (!(flags & SaveFlags::HasAlphaLayer)) {
layerFlags |= SkCanvas::kIsOpaque_SaveLayerFlag;
}
// We intentionally ignore the SaveFlags::HasAlphaLayer and
// SkCanvas::kIsOpaque_SaveLayerFlag flags because HWUI ignores it
// and our Android client may use it incorrectly.
// In Skia, this flag is purely for performance optimization.
if (!(flags & SaveFlags::ClipToLayer)) {
layerFlags |= SkCanvas::kDontClipToLayer_Legacy_SaveLayerFlag;