Patch to follow.
Created attachment 131339 [details] Patch
Created attachment 131343 [details] Patch
Committed r110441: <http://trac.webkit.org/changeset/110441>