diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-05-12 15:08:45 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-12 15:08:45 -0500 |
commit | dc8cf694eddca6529bf4b3ac1066764473775192 (patch) | |
tree | 0eb9fd8d4c7dc1c001ea1c2c39653d74304052d1 /components/script/layout_wrapper.rs | |
parent | 875b07b4ec64d9ef01bafb81ecf01496c0b9fa4b (diff) | |
parent | 727e5b41f5cdb9fb9e7613d2a523aaec0e5692c5 (diff) | |
download | servo-dc8cf694eddca6529bf4b3ac1066764473775192.tar.gz servo-dc8cf694eddca6529bf4b3ac1066764473775192.zip |
Auto merge of #16506 - cbrewster:about_chaos, r=asajeffrey
Make non-initial about:blank loads async
<!-- 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
- [X] These changes fix #14856 (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/16506)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/layout_wrapper.rs')
-rw-r--r-- | components/script/layout_wrapper.rs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/components/script/layout_wrapper.rs b/components/script/layout_wrapper.rs index dec2123149b..3d4b90eaeab 100644 --- a/components/script/layout_wrapper.rs +++ b/components/script/layout_wrapper.rs @@ -44,7 +44,7 @@ use dom::node::{LayoutNodeHelpers, Node}; use dom::text::Text; use gfx_traits::ByteIndex; use html5ever::{LocalName, Namespace}; -use msg::constellation_msg::PipelineId; +use msg::constellation_msg::{FrameId, PipelineId}; use range::Range; use script_layout_interface::{HTMLCanvasData, LayoutNodeType, SVGSVGData, TrustedNodeAddress}; use script_layout_interface::{OpaqueStyleAndLayoutData, PartialPersistentLayoutData}; @@ -908,6 +908,11 @@ impl<'ln> ThreadSafeLayoutNode for ServoThreadSafeLayoutNode<'ln> { this.svg_data() } + fn iframe_frame_id(&self) -> FrameId { + let this = unsafe { self.get_jsmanaged() }; + this.iframe_frame_id() + } + fn iframe_pipeline_id(&self) -> PipelineId { let this = unsafe { self.get_jsmanaged() }; this.iframe_pipeline_id() |