Add new layout QueryMsg::CanvasFontQuery

components/layout_thread/lib.rs

@@ -1255,6 +1255,9 @@ impl LayoutThread {
                         &QueryMsg::InnerWindowDimensionsQuery(_) => {
                             rw_data.inner_window_dimensions_response = None;
                         },
+                        &QueryMsg::CanvasFontQuery(..) => {
+                            unimplemented!();
+                        },
                     },
                     ReflowGoal::Full | ReflowGoal::TickAnimations => {},
                 }
@@ -1597,6 +1600,9 @@ impl LayoutThread {
                         .get(&browsing_context_id)
                         .cloned();
                 },
+                &QueryMsg::CanvasFontQuery(_node, ref _font) => {
+                    unimplemented!();
+                },
             },
             ReflowGoal::Full | ReflowGoal::TickAnimations => {},
         }

components/script/dom/window.rs

@@ -2460,6 +2460,7 @@ fn debug_reflow_events(id: PipelineId, reflow_goal: &ReflowGoal, reason: &Reflow
             &QueryMsg::TextIndexQuery(..) => "\tTextIndexQuery",
             &QueryMsg::ElementInnerTextQuery(_) => "\tElementInnerTextQuery",
             &QueryMsg::InnerWindowDimensionsQuery(_) => "\tInnerWindowDimensionsQuery",
+            &QueryMsg::CanvasFontQuery(..) => "\tCanvasFontQuery",
         },
     };
 

components/script_layout_interface/message.rs

@@ -107,6 +107,7 @@ pub enum QueryMsg {
     OffsetParentQuery(OpaqueNode),
     TextIndexQuery(OpaqueNode, Point2D<f32>),
     NodesFromPointQuery(Point2D<f32>, NodesFromPointQueryType),
+    CanvasFontQuery(OpaqueNode, String),
 
     // FIXME(nox): The following queries use the TrustedNodeAddress to
     // access actual DOM nodes, but those values can be constructed from
@@ -144,6 +145,7 @@ impl ReflowGoal {
                 QueryMsg::NodeScrollIdQuery(_) |
                 QueryMsg::ResolvedStyleQuery(..) |
                 QueryMsg::OffsetParentQuery(_) |
+                QueryMsg::CanvasFontQuery(..) |
                 QueryMsg::StyleQuery => false,
             },
         }
@@ -166,6 +168,7 @@ impl ReflowGoal {
                 QueryMsg::ResolvedStyleQuery(..) |
                 QueryMsg::OffsetParentQuery(_) |
                 QueryMsg::InnerWindowDimensionsQuery(_) |
+                QueryMsg::CanvasFontQuery(..) |
                 QueryMsg::StyleQuery => false,
             },
         }