wrench: Make yaml reader and writer agree on how the id of a referenc…

…e frame is spelled.

This was needed to create some test-cases without a gazillion panics.

wrench/reftests/clip/fixed-position-clipping.yaml

@@ -35,7 +35,7 @@ root:
         bounds: [110, 10, 100, 100]
         clip-rect: [110, 10, 100, 100]
         clip-and-scroll: root-reference-frame
-        reference-frame-id: 4
+        id: 4
         type: stacking-context
         transform: [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]
         items:

wrench/reftests/scrolling/fixed-position.yaml

@@ -17,7 +17,7 @@ root:
     - type: stacking-context
       bounds: [0, 0, 50, 50]
       transform: translate(60, 100)
-      reference-frame-id: 100
+      id: 100
       items:
         - type: stacking-context
           bounds: [0, 0, 50, 50]
@@ -31,7 +31,7 @@ root:
     - type: stacking-context
       bounds: [120, 0, 50, 200]
       transform: translate(0, 0)
-      reference-frame-id: 101
+      id: 101
       items:
         - type: stacking-context
           bounds: [0, 0, 50, 200]
@@ -44,7 +44,7 @@ root:
     - type: stacking-context
       bounds: [180, 0, 50, 200]
       perspective: 1
-      reference-frame-id: 102
+      id: 102
       items:
         - type: stacking-context
           bounds: [0, 0, 50, 200]

wrench/src/yaml_frame_reader.rs

@@ -1545,7 +1545,7 @@ impl YamlFrameReader {
 
         let reference_frame_id = dl.push_reference_frame(info, transform.into(), perspective);
 
-        let numeric_id = yaml["reference-frame-id"].as_i64();
+        let numeric_id = yaml["id"].as_i64();
         if let Some(numeric_id) = numeric_id {
             self.add_clip_id_mapping(numeric_id as u64, reference_frame_id);
         }