render: Restoring line rendering fixes that were previously put on hold.

(Backed out hg changeset 4ba421b1e88f)

--HG--
extra : rebase_source : 7d3265858a6eca7a1439959aacaf5eb928e36d60
3 files changed