Change calculate_line_height to use font-size from style.
Merge pull request #2890 from glennw/font-size

Change calculate_line_height to use font-size from style.