Bug 1018996 - Fix BasicCompositor on Mac after bug 1012407 and bug 1017571. r=Bas