diff options
| author | Deokjin Kim <deokjin81.kim@samsung.com> | 2015-01-20 11:02:41 +0900 |
|---|---|---|
| committer | Deokjin Kim <deokjin81.kim@samsung.com> | 2015-01-20 11:02:41 +0900 |
| commit | ee0ce0d8f4eecede189ee85cf51a64519ffa5c80 (patch) | |
| tree | d563b117f264b305d5288caa00f4010f127e7c58 /components/layout/fragment.rs | |
| parent | 80a6f0ae0880914f972b24a11216eed25d873576 (diff) | |
| parent | ccf5f96fa91540ca73cfb24dd130d5124975fc6e (diff) | |
| download | servo-ee0ce0d8f4eecede189ee85cf51a64519ffa5c80.tar.gz servo-ee0ce0d8f4eecede189ee85cf51a64519ffa5c80.zip | |
Merge branch 'master' of https://github.com/servo/servo into font_style
Diffstat (limited to 'components/layout/fragment.rs')
| -rw-r--r-- | components/layout/fragment.rs | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs index 521b000dfcf..8bad0a288b6 100644 --- a/components/layout/fragment.rs +++ b/components/layout/fragment.rs @@ -1256,11 +1256,24 @@ impl Fragment { pub fn find_split_info_by_new_line(&self) -> Option<(SplitInfo, Option<SplitInfo>, Arc<Box<TextRun>> /* TODO(bjz): remove */)> { match self.specific { - SpecificFragmentInfo::Canvas(_) | SpecificFragmentInfo::Generic | SpecificFragmentInfo::Iframe(_) | SpecificFragmentInfo::Image(_) | SpecificFragmentInfo::Table | SpecificFragmentInfo::TableCell | - SpecificFragmentInfo::TableRow | SpecificFragmentInfo::TableWrapper => None, - SpecificFragmentInfo::TableColumn(_) => panic!("Table column fragments do not need to split"), - SpecificFragmentInfo::UnscannedText(_) => panic!("Unscanned text fragments should have been scanned by now!"), - SpecificFragmentInfo::InlineBlock(_) | SpecificFragmentInfo::InlineAbsoluteHypothetical(_) => { + SpecificFragmentInfo::Canvas(_) | + SpecificFragmentInfo::Generic | + SpecificFragmentInfo::Iframe(_) | + SpecificFragmentInfo::Image(_) | + SpecificFragmentInfo::Table | + SpecificFragmentInfo::TableCell | + SpecificFragmentInfo::TableRow | + SpecificFragmentInfo::TableWrapper => { + None + } + SpecificFragmentInfo::TableColumn(_) => { + panic!("Table column fragments do not need to split") + } + SpecificFragmentInfo::UnscannedText(_) => { + panic!("Unscanned text fragments should have been scanned by now!") + } + SpecificFragmentInfo::InlineBlock(_) | + SpecificFragmentInfo::InlineAbsoluteHypothetical(_) => { panic!("Inline blocks or inline absolute hypothetical fragments do not get split") } SpecificFragmentInfo::ScannedText(ref text_fragment_info) => { |