This change requires modifying several files, so I'm extracting it from bug 173833.
Created attachment 333178 [details] Patch
Committed r228264: <https://trac.webkit.org/changeset/228264>
<rdar://problem/37346050>