Remove unnecessary Flow::column_sizes methods

5 files changed, 3 insertions, 38 deletions

diff --git a/components/layout/flow.rs b/components/layout/flow.rs
index fae309d2ae2..2833fc0b076 100644
--- a/components/layout/flow.rs
+++ b/components/layout/flow.rs
@@ -56,7 +56,7 @@ use style::properties::ServoComputedValues;
 use style::selector_impl::RestyleDamage;
 use style::servo::restyle_damage::{RECONSTRUCT_FLOW, REFLOW, REFLOW_OUT_OF_FLOW, REPAINT, REPOSITION};
 use style::values::computed::LengthOrPercentageOrAuto;
-use table::{ColumnComputedInlineSize, ColumnIntrinsicInlineSize, TableFlow};
+use table::TableFlow;
 use table_caption::TableCaptionFlow;
 use table_cell::TableCellFlow;
 use table_colgroup::TableColGroupFlow;
@@ -180,18 +180,6 @@ pub trait Flow: fmt::Debug + Sync + Send + 'static {
         panic!("called as_table_cell() on a non-tablecell flow")
     }
 
-    /// If this is a table row, table rowgroup, or table flow, returns column intrinsic
-    /// inline-sizes. Fails otherwise.
-    fn column_intrinsic_inline_sizes(&mut self) -> &mut Vec<ColumnIntrinsicInlineSize> {
-        panic!("called column_intrinsic_inline_sizes() on non-table flow")
-    }
-
-    /// If this is a table row, table rowgroup, or table flow, returns column computed
-    /// inline-sizes. Fails otherwise.
-    fn column_computed_inline_sizes(&mut self) -> &mut Vec<ColumnComputedInlineSize> {
-        panic!("called column_intrinsic_inline_sizes() on non-table flow")
-    }
-
     // Main methods
 
     /// Pass 1 of reflow: computes minimum and preferred inline-sizes.
diff --git a/components/layout/table.rs b/components/layout/table.rs
index b1f3a01fc22..6d95ff0b1e0 100644
--- a/components/layout/table.rs
+++ b/components/layout/table.rs
@@ -217,14 +217,6 @@ impl Flow for TableFlow {
         self.block_flow.mark_as_root();
     }
 
-    fn column_intrinsic_inline_sizes(&mut self) -> &mut Vec<ColumnIntrinsicInlineSize> {
-        &mut self.column_intrinsic_inline_sizes
-    }
-
-    fn column_computed_inline_sizes(&mut self) -> &mut Vec<ColumnComputedInlineSize> {
-        &mut self.column_computed_inline_sizes
-    }
-
     /// The specified column inline-sizes are set from column group and the first row for the fixed
     /// table layout calculation.
     /// The maximum min/pref inline-sizes of each column are set from the rows for the automatic
diff --git a/components/layout/table_row.rs b/components/layout/table_row.rs
index 3a39b4c1ce1..272bf85337f 100644
--- a/components/layout/table_row.rs
+++ b/components/layout/table_row.rs
@@ -235,14 +235,6 @@ impl Flow for TableRowFlow {
         &self.block_flow
     }
 
-    fn column_intrinsic_inline_sizes(&mut self) -> &mut Vec<ColumnIntrinsicInlineSize> {
-        panic!("can't call column_intrinsic_inline_sizes() on table row")
-    }
-
-    fn column_computed_inline_sizes(&mut self) -> &mut Vec<ColumnComputedInlineSize> {
-        &mut self.column_computed_inline_sizes
-    }
-
     /// Recursively (bottom-up) determines the context's preferred and minimum inline-sizes. When
     /// called on this context, all child contexts have had their min/pref inline-sizes set. This
     /// function must decide min/pref inline-sizes based on child context inline-sizes and
diff --git a/components/layout/table_rowgroup.rs b/components/layout/table_rowgroup.rs
index f7e450b09f9..9c7ace68260 100644
--- a/components/layout/table_rowgroup.rs
+++ b/components/layout/table_rowgroup.rs
@@ -123,14 +123,6 @@ impl Flow for TableRowGroupFlow {
         &self.block_flow
     }
 
-    fn column_intrinsic_inline_sizes(&mut self) -> &mut Vec<ColumnIntrinsicInlineSize> {
-        &mut self.column_intrinsic_inline_sizes
-    }
-
-    fn column_computed_inline_sizes(&mut self) -> &mut Vec<ColumnComputedInlineSize> {
-        &mut self.column_computed_inline_sizes
-    }
-
     fn bubble_inline_sizes(&mut self) {
         let _scope = layout_debug_scope!("table_rowgroup::bubble_inline_sizes {:x}",
                                          self.block_flow.base.debug_id());
diff --git a/components/layout/table_wrapper.rs b/components/layout/table_wrapper.rs
index ede99df7bc1..372fdbd086f 100644
--- a/components/layout/table_wrapper.rs
+++ b/components/layout/table_wrapper.rs
@@ -328,7 +328,8 @@ impl Flow for TableWrapperFlow {
         for kid in self.block_flow.base.child_iter_mut() {
             debug_assert!(kid.is_table_caption() || kid.is_table());
             if kid.is_table() {
-                self.column_intrinsic_inline_sizes = kid.column_intrinsic_inline_sizes().clone()
+                let table = kid.as_table();
+                self.column_intrinsic_inline_sizes = table.column_intrinsic_inline_sizes.clone();
             }
         }