Bug 756606. Fix an assert in the d3d11 compositor. r=bas
Bug 874721. Unify mask type enums; r=bas