This is a follow-up to r142485 and r142486.
Created attachment 187829 [details] Patch
Committed r142603: <http://trac.webkit.org/changeset/142603>