update wrench to use new line style

wrench/reftests/text/decorations-suite.yaml

@@ -30,6 +30,7 @@ root:
       start: 10
       end: 210
       width: 3
+      thickness: 1
       orientation: horizontal
       color: red
       style: wavy
@@ -62,7 +63,8 @@ root:
       baseline: 95
       start: 10
       end: 210
-      width: 8
+      width: 6
+      thickness: 2
       orientation: horizontal
       color: red
       style: wavy
@@ -101,7 +103,8 @@ root:
       baseline: 190
       start: 10
       end: 210
-      width: 8
+      width: 12
+      thickness: 3
       orientation: horizontal
       color: black
       style: wavy
@@ -142,7 +145,8 @@ root:
       baseline: 290
       start: 10
       end: 210
-      width: 8
+      width: 16
+      thickness: 4
       orientation: horizontal
       color: black
       style: wavy
@@ -177,6 +181,7 @@ root:
       baseline: 250
       start: 10
       end: 210
+      thickness: 1
       width: 3
       orientation: vertical
       color: red
@@ -210,7 +215,8 @@ root:
       baseline: 330
       start: 10
       end: 210
-      width: 8
+      thickness: 2
+      width: 6
       orientation: vertical
       color: red
       style: wavy
@@ -249,7 +255,8 @@ root:
       baseline: 440
       start: 10
       end: 210
-      width: 8
+      thickness: 4
+      width: 16
       orientation: vertical
       color: red
       style: wavy

wrench/src/rawtest.rs

@@ -213,9 +213,9 @@ impl<'a> RawtestHarness<'a> {
                         blur_radius: 1.0,
                         color: ColorF::new(0.0, 0.0, 0.0, 1.0),
                     });
-                builder.push_line(&PrimitiveInfo::new(rect(100., 100., 100., 100.)),
-                                  110., 110., 160., LineOrientation::Horizontal, 2.0,
-                                  ColorF::new(0.0, 0.0, 0.0, 1.0), LineStyle::Solid);
+                builder.push_line(&PrimitiveInfo::new(rect(110., 110., 50., 2.)),
+                                  0.0, LineOrientation::Horizontal,
+                                  &ColorF::new(0.0, 0.0, 0.0, 1.0), LineStyle::Solid);
                 builder.restore();
             }
 

wrench/src/yaml_frame_reader.rs

@@ -578,10 +578,6 @@ impl YamlFrameReader {
         info: &mut LayoutPrimitiveInfo,
     ) {
         let color = item["color"].as_colorf().unwrap_or(*BLACK_COLOR);
-        let baseline = item["baseline"].as_f32().expect("line must have baseline");
-        let start = item["start"].as_f32().expect("line must have start");
-        let end = item["end"].as_f32().expect("line must have end");
-        let width = item["width"].as_f32().expect("line must have width");
         let orientation = item["orientation"]
             .as_str()
             .and_then(LineOrientation::from_str)
@@ -590,14 +586,47 @@ impl YamlFrameReader {
             .as_str()
             .and_then(LineStyle::from_str)
             .expect("line must have style");
+
+        let wavy_line_thickness = if let LineStyle::Wavy = style {
+            item["thickness"].as_f32().expect("wavy lines must have a thickness")
+        } else {
+            0.0
+        };
+
+        if item["baseline"].is_badvalue() {
+            let bounds_key = if item["type"].is_badvalue() {
+                "rect"
+            } else {
+                "bounds"
+            };
+
+            info.rect = item[bounds_key]
+                .as_rect()
+                .expect("line type must have bounds");
+        } else {
+            // Legacy line representation
+            let baseline = item["baseline"].as_f32().expect("line must have baseline");
+            let start = item["start"].as_f32().expect("line must have start");
+            let end = item["end"].as_f32().expect("line must have end");
+            let width = item["width"].as_f32().expect("line must have width");
+
+            info.rect = match orientation {
+                LineOrientation::Horizontal => {
+                    LayoutRect::new(LayoutPoint::new(start, baseline),
+                                    LayoutSize::new(end - start, width))
+                }
+                LineOrientation::Vertical => {
+                    LayoutRect::new(LayoutPoint::new(baseline, start),
+                                    LayoutSize::new(width, end - start))
+                }
+            };
+        }
+
         dl.push_line(
             &info,
-            baseline,
-            start,
-            end,
+            wavy_line_thickness,
             orientation,
-            width,
-            color,
+            &color,
             style,
         );
     }

wrench/src/yaml_frame_writer.rs

@@ -649,11 +649,10 @@ impl YamlFrameWriter {
                 }
                 Line(item) => {
                     str_node(&mut v, "type", "line");
-                    f32_node(&mut v, "baseline", item.baseline);
-                    f32_node(&mut v, "start", item.start);
-                    f32_node(&mut v, "end", item.end);
+                    if let LineStyle::Wavy = item.style {
+                        f32_node(&mut v, "thickness", item.wavy_line_thickness);
+                    }
                     str_node(&mut v, "orientation", item.orientation.as_str());
-                    f32_node(&mut v, "width", item.width);
                     color_node(&mut v, "color", item.color);
                     str_node(&mut v, "style", item.style.as_str());
                 }