Merge with TextRenderBox refactor

servo · pcwalton · May 28, 2013 · May 27, 2013 · May 28, 2013 · May 28, 2013
commit 1fd9a8f162ec1066526fe461bd0cb30c47d713e0
diff --git a/src/components/servo/layout/inline.rs b/src/components/servo/layout/inline.rs
@@ -841,7 +841,7 @@ impl InlineFlowData {
                 let halfleading = match cur_box {
                     TextRenderBoxClass(text_box) => {
                         //ad is the AD height as defined by CSS 2.1 § 10.8.1
-                        let ad = text_box.text_data.run.font.metrics.ascent + text_box.text_data.run.font.metrics.descent;
+                        let ad = text_box.run.font.metrics.ascent + text_box.run.font.metrics.descent;
                         (line_height - ad).scale_by(0.5)
                     },
                     _ => Au(0),
@@ -852,7 +852,7 @@ impl InlineFlowData {
                 let halfleading = Au::max(halfleading, Au(0));
 
                 let height = match cur_box {
-                    TextRenderBoxClass(text_box) => text_box.text_data.run.font.metrics.ascent,
+                    TextRenderBoxClass(text_box) => text_box.run.font.metrics.ascent,
                     _ => cur_box.position().size.height
                 };