...
Created attachment 229520 [details] mostly done
Created attachment 229521 [details] the patch
landed in http://trac.webkit.org/changeset/167416
Build fix in r167418.