This was nearly fixed in https://bugs.webkit.org/show_bug.cgi?id=83954 / http://trac.webkit.org/changeset/115846 but per jchaffraix this baseline still doesn't look quite right.
Created attachment 141809 [details] Patch
Rebaselined in r117677.