Margin collapsing is part of geometry after all.
Created attachment 348890 [details] Patch
Created attachment 348891 [details] Patch
Committed r235668: <https://trac.webkit.org/changeset/235668>
<rdar://problem/44138532>