(...it looks like a couple of changes got dropped when resolving merge conflicts)
Created attachment 413600 [details] Patch
Committed r269591: <https://trac.webkit.org/changeset/269591> All reviewed patches have been landed. Closing bug and clearing flags on attachment 413600 [details].