Patch to follow.
Created attachment 168008 [details] Patch
Created attachment 168009 [details] Patch
Committed r130914: <http://trac.webkit.org/changeset/130914>