The plan going forward with WR integration is to expand the types/numbers of layers we generate on the content side until they sort of correspond to WR display items. At that point we can make the switch to just sending WR display items directly. We should figure out a plan for doing this. Perhaps a good first step would be integrating Matt/Bas' work on text layers to the current WR branch and seeing how it fits in.
Actually this is the same as bug 1313703.