diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-12-26 01:53:20 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-26 01:53:20 -0500 |
commit | 66223ee1054a36a093cf5ded065f6fc6d3fecd8b (patch) | |
tree | 71b445b09cad26eef9a815807d85975ed69efd7f /components/script/dom/htmliframeelement.rs | |
parent | 69e90a83bc480c13c4aa4165b9d2c432b54a4069 (diff) | |
parent | cca354b217f4f8c7d92229ec88adde83b8300daa (diff) | |
download | servo-66223ee1054a36a093cf5ded065f6fc6d3fecd8b.tar.gz servo-66223ee1054a36a093cf5ded065f6fc6d3fecd8b.zip |
Auto merge of #22121 - gterzian:remove_constellation_block_in_navigation, r=paulrouget
Remove sync constellation -> embedder communication
<!-- 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: -->
- [ ] `./mach build -d` does not report any errors
- [ ] `./mach test-tidy` does not report any errors
- [ ] These changes fix #22042 (github issue number if applicable).
<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____
<!-- 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/22121)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/htmliframeelement.rs')
-rw-r--r-- | components/script/dom/htmliframeelement.rs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs index 0e23a04fc39..2bde8893a29 100644 --- a/components/script/dom/htmliframeelement.rs +++ b/components/script/dom/htmliframeelement.rs @@ -274,8 +274,13 @@ impl HTMLIFrameElement { ); let pipeline_id = self.pipeline_id(); - // If the initial `about:blank` page is the current page, load with replacement enabled. - let replace = pipeline_id.is_some() && pipeline_id == self.about_blank_pipeline_id.get(); + // If the initial `about:blank` page is the current page, load with replacement enabled, + // see https://html.spec.whatwg.org/multipage/#the-iframe-element:about:blank-3 + let is_about_blank = + pipeline_id.is_some() && pipeline_id == self.about_blank_pipeline_id.get(); + // Replacement enabled also takes into account whether the document is "completely loaded", + // see https://html.spec.whatwg.org/multipage/#the-iframe-element:completely-loaded + let replace = is_about_blank || !document.is_completely_loaded(); self.navigate_or_reload_child_browsing_context( Some(load_data), NavigationType::Regular, |