See summary.
Created attachment 29245 [details] Proposed fix.
Comment on attachment 29245 [details] Proposed fix. r=me and Geoffrey Garen.
http://trac.webkit.org/changeset/42282