This merge requires a re-implementation. Patch coming. <rdar://problem/15109341>.
Created attachment 215317 [details] the patch.
Comment on attachment 215317 [details] the patch. r=me
Thanks for the review. Landed in r158117: <http://trac.webkit.org/r158117>.
Missed a file from the merge. Now landed in r158132: <http://trac.webkit.org/r158132>.