Patch forthcoming.
I think that this is the last part of https://bugs.webkit.org/show_bug.cgi?id=171689
Created attachment 310338 [details] the patch
Landed in http://trac.webkit.org/changeset/216965/webkit