diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-12-26 10:09:09 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-26 10:09:09 -0800 |
| commit | 9d320d5a34fe9911266940eb1ce96204d345b678 (patch) | |
| tree | 479398cf64639acf645f0cfc08bb0b8fcd21ca03 /components/script/layout_wrapper.rs | |
| parent | 37a5e29147f0dc489888377d6f7bb53282dc04f9 (diff) | |
| parent | ef7bdaa3e37cb00091a19c30a405327d3091c6ff (diff) | |
| download | servo-9d320d5a34fe9911266940eb1ce96204d345b678.tar.gz servo-9d320d5a34fe9911266940eb1ce96204d345b678.zip | |
Auto merge of #14518 - mbrubeck:rowspan2, r=notriddle
Fix inline layout of table cells impacted by rowspan
This is part of the fix for #11297. This PR fixes the inline layout of table cells impacted by row-spanning cells from previous rows. A separate PR to follow will fix the table block size calculations to account for rowspan.
This PR doesn't yet include any test changes. If it doesn't cause any existing tests to pass, I will add a new test to it.
r? @pcwalton
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14518)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/layout_wrapper.rs')
| -rw-r--r-- | components/script/layout_wrapper.rs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/components/script/layout_wrapper.rs b/components/script/layout_wrapper.rs index dca0750e0ee..e6c38aa1fb3 100644 --- a/components/script/layout_wrapper.rs +++ b/components/script/layout_wrapper.rs @@ -864,6 +864,12 @@ impl<'ln> ThreadSafeLayoutNode for ServoThreadSafeLayoutNode<'ln> { self.get_jsmanaged().downcast::<Element>().unwrap().get_colspan() } } + + fn get_rowspan(&self) -> u32 { + unsafe { + self.get_jsmanaged().downcast::<Element>().unwrap().get_rowspan() + } + } } pub struct ThreadSafeLayoutNodeChildrenIterator<ConcreteNode: ThreadSafeLayoutNode> { |