Patch forthcoming.
Created attachment 271524 [details] the patch
Created attachment 271525 [details] the patch
Created attachment 271526 [details] another try
Landed in http://trac.webkit.org/changeset/196686