servo: Merge #3878 - Remove InputFragment (from zwarich:remove-input-fragment); r=jdm

Fixes #3724.

Source-Repo: https://github.com/servo/servo
Source-Revision: 39960f32e49c69977b185f91e587c9947b0b9a25

servo/components/layout/construct.rs

@@ -24,7 +24,7 @@ use flow_ref::FlowRef;
 use fragment::{Fragment, GenericFragment, IframeFragment, IframeFragmentInfo, ImageFragment};
 use fragment::{ImageFragmentInfo, InlineAbsoluteHypotheticalFragment};
 use fragment::{InlineAbsoluteHypotheticalFragmentInfo, InlineBlockFragment};
-use fragment::{InlineBlockFragmentInfo, InputFragment, SpecificFragmentInfo, TableCellFragment};
+use fragment::{InlineBlockFragmentInfo, SpecificFragmentInfo, TableCellFragment};
 use fragment::{TableColumnFragment, TableColumnFragmentInfo, TableFragment, TableRowFragment};
 use fragment::{TableWrapperFragment, UnscannedTextFragment, UnscannedTextFragmentInfo};
 use incremental::{ReconstructFlow, RestyleDamage};
@@ -263,9 +263,6 @@ impl<'a> FlowConstructor<'a> {
             Some(ElementNodeTypeId(HTMLImageElementTypeId)) => {
                 self.build_fragment_info_for_image(node, node.image_url())
             }
-            Some(ElementNodeTypeId(HTMLInputElementTypeId)) => {
-                InputFragment
-            }
             Some(ElementNodeTypeId(HTMLObjectElementTypeId)) => {
                 let data = node.get_object_data();
                 self.build_fragment_info_for_image(node, data)
@@ -274,6 +271,7 @@ impl<'a> FlowConstructor<'a> {
             Some(ElementNodeTypeId(HTMLTableColElementTypeId)) => {
                 TableColumnFragment(TableColumnFragmentInfo::new(node))
             }
+            Some(ElementNodeTypeId(HTMLInputElementTypeId)) |
             Some(ElementNodeTypeId(HTMLTableDataCellElementTypeId)) |
             Some(ElementNodeTypeId(HTMLTableHeaderCellElementTypeId)) => TableCellFragment,
             Some(ElementNodeTypeId(HTMLTableRowElementTypeId)) |

servo/components/layout/display_list_builder.rs

@@ -15,7 +15,7 @@ use context::LayoutContext;
 use flow::{mod, Flow};
 use fragment::{Fragment, GenericFragment, IframeFragment, IframeFragmentInfo, ImageFragment};
 use fragment::{ImageFragmentInfo, InlineAbsoluteHypotheticalFragment, InlineBlockFragment};
-use fragment::{InputFragment, ScannedTextFragment, ScannedTextFragmentInfo, TableFragment};
+use fragment::{ScannedTextFragment, ScannedTextFragmentInfo, TableFragment};
 use fragment::{TableCellFragment, TableColumnFragment, TableRowFragment, TableWrapperFragment};
 use fragment::{UnscannedTextFragment};
 use model;
@@ -500,7 +500,7 @@ impl FragmentDisplayListBuilding for Fragment {
                 }
             }
             GenericFragment | IframeFragment(..) | TableFragment | TableCellFragment |
-            TableRowFragment | TableWrapperFragment | InlineBlockFragment(_) | InputFragment |
+            TableRowFragment | TableWrapperFragment | InlineBlockFragment(_) |
             InlineAbsoluteHypotheticalFragment(_) => {
                 if opts::get().show_debug_fragment_borders {
                     self.build_debug_borders_around_fragment(display_list,

servo/components/layout/fragment.rs

@@ -133,7 +133,6 @@ pub enum SpecificFragmentInfo {
     InlineAbsoluteHypotheticalFragment(InlineAbsoluteHypotheticalFragmentInfo),
 
     InlineBlockFragment(InlineBlockFragmentInfo),
-    InputFragment,
     ScannedTextFragment(Box<ScannedTextFragmentInfo>),
     TableFragment,
     TableCellFragment,
@@ -149,7 +148,6 @@ impl SpecificFragmentInfo {
             match *self {
                 IframeFragment(_)
                 | ImageFragment(_)
-                | InputFragment
                 | ScannedTextFragment(_)
                 | TableFragment
                 | TableCellFragment
@@ -172,7 +170,6 @@ impl SpecificFragmentInfo {
             ImageFragment(_) => "ImageFragment",
             InlineAbsoluteHypotheticalFragment(_) => "InlineAbsoluteHypotheticalFragment",
             InlineBlockFragment(_) => "InlineBlockFragment",
-            InputFragment => "InputFragment",
             ScannedTextFragment(_) => "ScannedTextFragment",
             TableFragment => "TableFragment",
             TableCellFragment => "TableCellFragment",
@@ -638,8 +635,9 @@ impl Fragment {
     fn quantities_included_in_intrinsic_inline_size(&self)
                                                     -> QuantitiesIncludedInIntrinsicInlineSizes {
         match self.specific {
-            GenericFragment | IframeFragment(_) | ImageFragment(_) | InlineBlockFragment(_) |
-            InputFragment => QuantitiesIncludedInIntrinsicInlineSizes::all(),
+            GenericFragment | IframeFragment(_) | ImageFragment(_) | InlineBlockFragment(_) => {
+                QuantitiesIncludedInIntrinsicInlineSizes::all()
+            }
             TableFragment | TableCellFragment => {
                 IntrinsicInlineSizeIncludesPadding |
                     IntrinsicInlineSizeIncludesBorder |
@@ -957,7 +955,7 @@ impl Fragment {
         match self.specific {
             GenericFragment | IframeFragment(_) | TableFragment | TableCellFragment |
             TableColumnFragment(_) | TableRowFragment | TableWrapperFragment |
-            InlineAbsoluteHypotheticalFragment(_) | InputFragment => {}
+            InlineAbsoluteHypotheticalFragment(_) => {}
             InlineBlockFragment(ref mut info) => {
                 let block_flow = info.flow_ref.as_block();
                 result.union_block(&block_flow.base.intrinsic_inline_sizes)
@@ -1014,7 +1012,7 @@ impl Fragment {
         match self.specific {
             GenericFragment | IframeFragment(_) | TableFragment | TableCellFragment |
             TableRowFragment | TableWrapperFragment | InlineBlockFragment(_) |
-            InputFragment | InlineAbsoluteHypotheticalFragment(_) => Au(0),
+            InlineAbsoluteHypotheticalFragment(_) => Au(0),
             ImageFragment(ref image_fragment_info) => {
                 image_fragment_info.computed_inline_size()
             }
@@ -1033,7 +1031,7 @@ impl Fragment {
         match self.specific {
             GenericFragment | IframeFragment(_) | TableFragment | TableCellFragment |
             TableRowFragment | TableWrapperFragment | InlineBlockFragment(_) |
-            InputFragment | InlineAbsoluteHypotheticalFragment(_) => Au(0),
+            InlineAbsoluteHypotheticalFragment(_) => Au(0),
             ImageFragment(ref image_fragment_info) => {
                 image_fragment_info.computed_block_size()
             }
@@ -1067,7 +1065,7 @@ impl Fragment {
             -> Option<(SplitInfo, Option<SplitInfo>, Arc<Box<TextRun>> /* TODO(bjz): remove */)> {
         match self.specific {
             GenericFragment | IframeFragment(_) | ImageFragment(_) | TableFragment | TableCellFragment |
-            TableRowFragment | TableWrapperFragment | InputFragment => None,
+            TableRowFragment | TableWrapperFragment => None,
             TableColumnFragment(_) => fail!("Table column fragments do not need to split"),
             UnscannedTextFragment(_) => fail!("Unscanned text fragments should have been scanned by now!"),
             InlineBlockFragment(_) | InlineAbsoluteHypotheticalFragment(_) => {
@@ -1116,7 +1114,7 @@ impl Fragment {
         match self.specific {
             GenericFragment | IframeFragment(_) | ImageFragment(_) | TableFragment |
             TableCellFragment | TableRowFragment | TableWrapperFragment | InlineBlockFragment(_) |
-            InputFragment | InlineAbsoluteHypotheticalFragment(_) => None,
+            InlineAbsoluteHypotheticalFragment(_) => None,
             TableColumnFragment(_) => fail!("Table column fragments do not have inline_size"),
             UnscannedTextFragment(_) => {
                 fail!("Unscanned text fragments should have been scanned by now!")
@@ -1219,7 +1217,7 @@ impl Fragment {
     pub fn assign_replaced_inline_size_if_necessary(&mut self, container_inline_size: Au) {
         match self.specific {
             GenericFragment | IframeFragment(_) | TableFragment | TableCellFragment |
-            TableRowFragment | TableWrapperFragment | InputFragment => return,
+            TableRowFragment | TableWrapperFragment => return,
             TableColumnFragment(_) => fail!("Table column fragments do not have inline_size"),
             UnscannedTextFragment(_) => {
                 fail!("Unscanned text fragments should have been scanned by now!")
@@ -1312,7 +1310,7 @@ impl Fragment {
     pub fn assign_replaced_block_size_if_necessary(&mut self, containing_block_block_size: Au) {
         match self.specific {
             GenericFragment | IframeFragment(_) | TableFragment | TableCellFragment |
-            TableRowFragment | TableWrapperFragment | InputFragment => return,
+            TableRowFragment | TableWrapperFragment => return,
             TableColumnFragment(_) => fail!("Table column fragments do not have block_size"),
             UnscannedTextFragment(_) => {
                 fail!("Unscanned text fragments should have been scanned by now!")
@@ -1455,7 +1453,7 @@ impl Fragment {
             TableWrapperFragment => false,
             GenericFragment | IframeFragment(_) | ImageFragment(_) | ScannedTextFragment(_) |
             TableFragment | TableCellFragment | TableColumnFragment(_) | TableRowFragment |
-            UnscannedTextFragment(_) | InputFragment => true,
+            UnscannedTextFragment(_) => true,
         }
     }