aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-08-03 07:51:22 -0500
committerGitHub <noreply@github.com>2017-08-03 07:51:22 -0500
commit46f6e68bad7aafc380976bfddd9e76bfaa86229e (patch)
tree15d46d3af9b298e33d000cdf8dd974e3ac001710
parentc18cac1f342ecf7f5986ea3fec857fdaca649d9f (diff)
parent815ed0c29c2a840977382e2ea2b3e54ec12f6409 (diff)
downloadservo-46f6e68bad7aafc380976bfddd9e76bfaa86229e.tar.gz
servo-46f6e68bad7aafc380976bfddd9e76bfaa86229e.zip
Auto merge of #17960 - mrobinson:fix-warning-for-table-colgroup, r=emilio
Fix warning in scroll root id assignment to TableColGroupFlow The traversal currently expects every flow to have a scroll root id assigned, even if it doesn't produce any display items. This change fixes the error that arises from this situation. <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [x] These changes do not require tests because they do not change behavior, just fix a runtime warning. <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- 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/17960) <!-- Reviewable:end -->
-rw-r--r--components/layout/table_colgroup.rs6
1 files changed, 5 insertions, 1 deletions
diff --git a/components/layout/table_colgroup.rs b/components/layout/table_colgroup.rs
index 44519a3bbab..97d0ef89022 100644
--- a/components/layout/table_colgroup.rs
+++ b/components/layout/table_colgroup.rs
@@ -92,7 +92,11 @@ impl Flow for TableColGroupFlow {
// Table columns are invisible.
fn build_display_list(&mut self, _: &mut DisplayListBuildState) { }
- fn collect_stacking_contexts(&mut self, _: &mut DisplayListBuildState) {}
+ fn collect_stacking_contexts(&mut self, state: &mut DisplayListBuildState) {
+ self.base.stacking_context_id = state.current_stacking_context_id;
+ self.base.scroll_root_id = Some(state.current_scroll_root_id);
+ }
+
fn repair_style(&mut self, _: &::ServoArc<ComputedValues>) {}