+1 −1 layers.rs

+3 −3 platform/android/surface.rs

+20 −18 platform/macos/surface.rs

+2 −4 util.rs