mirror of
https://github.com/servo/servo.git
synced 2025-07-22 23:03:42 +01:00
Auto merge of #18514 - asajeffrey:layout-dont-panic-if-no-iframe-bc, r=emilio
Remove sources of panic when laying out an iframe without a nested browsing context <!-- Please describe your changes on the following line: --> At the moment, layout panics if it discovers an iframe without a nested browsing context. Under normal circumstances, this is reasonable, but it requires very tight synchronization between script, layout, the constellation and the compositor. In particular, if a layout is in progress when an iframe's browsing context is discarded, this can trigger panic. This PR fixes this in two ways: 1. Making the pipeline and browsing context ids optional in layout's representation of an iframe. 2. Shutting down layout before discarding a browsing context, rather than after. This is belt and braces. --- <!-- 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 - [X] These changes fix #17482 and #18477 - [X] These changes do not require tests because the PR is fixing a panic caused by a race condition <!-- 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/18514) <!-- Reviewable:end -->
This commit is contained in:
commit
c48ef50b72
6 changed files with 58 additions and 30 deletions
|
@ -983,12 +983,14 @@ impl<'ln> ThreadSafeLayoutNode for ServoThreadSafeLayoutNode<'ln> {
|
|||
this.svg_data()
|
||||
}
|
||||
|
||||
fn iframe_browsing_context_id(&self) -> BrowsingContextId {
|
||||
// Can return None if the iframe has no nested browsing context
|
||||
fn iframe_browsing_context_id(&self) -> Option<BrowsingContextId> {
|
||||
let this = unsafe { self.get_jsmanaged() };
|
||||
this.iframe_browsing_context_id()
|
||||
}
|
||||
|
||||
fn iframe_pipeline_id(&self) -> PipelineId {
|
||||
// Can return None if the iframe has no nested browsing context
|
||||
fn iframe_pipeline_id(&self) -> Option<PipelineId> {
|
||||
let this = unsafe { self.get_jsmanaged() };
|
||||
this.iframe_pipeline_id()
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue