This is a similar change as http://trac.webkit.org/changeset/53498 for Mac.
Created attachment 47313 [details] Proposed Patch
Comment on attachment 47313 [details] Proposed Patch Looks sane to me.
Comment on attachment 47313 [details] Proposed Patch I'll commit manually because CQ is busy.
Committed r53889: <http://trac.webkit.org/changeset/53889>