From 3465b2f14da768635578e178c1987a1991e39456 Mon Sep 17 00:00:00 2001
From: Keith Yeung <kungfukeith11@gmail.com>
Date: Fri, 8 Dec 2017 04:51:21 -0800
Subject: [PATCH] Remove border_collapse field in InternalTable

---
 components/layout/table.rs          | 22 ++++++++--------------
 components/layout/table_cell.rs     |  4 +---
 components/layout/table_row.rs      |  4 +---
 components/layout/table_rowgroup.rs |  4 +---
 4 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/components/layout/table.rs b/components/layout/table.rs
index f75053f9fff..37e92be32be 100644
--- a/components/layout/table.rs
+++ b/components/layout/table.rs
@@ -364,9 +364,7 @@ impl Flow for TableFlow {
             }
         }
 
-        let inline_size_computer = InternalTable {
-            border_collapse: self.block_flow.fragment.style.get_inheritedtable().border_collapse,
-        };
+        let inline_size_computer = InternalTable;
         inline_size_computer.compute_used_inline_size(&mut self.block_flow,
                                                       shared_context,
                                                       containing_block_inline_size);
@@ -541,22 +539,18 @@ impl fmt::Debug for TableFlow {
 
 /// Table, TableRowGroup, TableRow, TableCell types.
 /// Their inline-sizes are calculated in the same way and do not have margins.
-pub struct InternalTable {
-    pub border_collapse: border_collapse::T,
-}
+pub struct InternalTable;
 
 impl ISizeAndMarginsComputer for InternalTable {
-    fn compute_border_and_padding(&self, block: &mut BlockFlow, containing_block_inline_size: Au) {
-        block.fragment.compute_border_and_padding(containing_block_inline_size)
-    }
-
     /// Compute the used value of inline-size, taking care of min-inline-size and max-inline-size.
     ///
     /// CSS Section 10.4: Minimum and Maximum inline-sizes
-    fn compute_used_inline_size(&self,
-                                block: &mut BlockFlow,
-                                shared_context: &SharedStyleContext,
-                                parent_flow_inline_size: Au) {
+    fn compute_used_inline_size(
+        &self,
+        block: &mut BlockFlow,
+        shared_context: &SharedStyleContext,
+        parent_flow_inline_size: Au
+    ) {
         let mut input = self.compute_inline_size_constraint_inputs(block,
                                                                    parent_flow_inline_size,
                                                                    shared_context);
diff --git a/components/layout/table_cell.rs b/components/layout/table_cell.rs
index 42ba7624800..cbde1a2be83 100644
--- a/components/layout/table_cell.rs
+++ b/components/layout/table_cell.rs
@@ -208,9 +208,7 @@ impl Flow for TableCellFlow {
         // The position was set to the column inline-size by the parent flow, table row flow.
         let containing_block_inline_size = self.block_flow.base.block_container_inline_size;
 
-        let inline_size_computer = InternalTable {
-            border_collapse: self.block_flow.fragment.style.get_inheritedtable().border_collapse,
-        };
+        let inline_size_computer = InternalTable;
         inline_size_computer.compute_used_inline_size(&mut self.block_flow,
                                                       shared_context,
                                                       containing_block_inline_size);
diff --git a/components/layout/table_row.rs b/components/layout/table_row.rs
index ac921031d8a..8135e9b51a2 100644
--- a/components/layout/table_row.rs
+++ b/components/layout/table_row.rs
@@ -353,9 +353,7 @@ impl Flow for TableRowFlow {
         let inline_start_content_edge = Au(0);
         let inline_end_content_edge = Au(0);
 
-        let inline_size_computer = InternalTable {
-            border_collapse: self.block_flow.fragment.style.get_inheritedtable().border_collapse,
-        };
+        let inline_size_computer = InternalTable;
         inline_size_computer.compute_used_inline_size(&mut self.block_flow,
                                                       shared_context,
                                                       containing_block_inline_size);
diff --git a/components/layout/table_rowgroup.rs b/components/layout/table_rowgroup.rs
index e2be435f15d..e5fe72d25a6 100644
--- a/components/layout/table_rowgroup.rs
+++ b/components/layout/table_rowgroup.rs
@@ -131,9 +131,7 @@ impl Flow for TableRowGroupFlow {
         let content_inline_size = containing_block_inline_size;
 
         let border_collapse = self.block_flow.fragment.style.get_inheritedtable().border_collapse;
-        let inline_size_computer = InternalTable {
-            border_collapse: border_collapse,
-        };
+        let inline_size_computer = InternalTable;
         inline_size_computer.compute_used_inline_size(&mut self.block_flow,
                                                       shared_context,
                                                       containing_block_inline_size);