diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-05-16 23:10:45 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-16 23:10:45 -0500 |
commit | 837531992864f920342020462830b933d5ed0280 (patch) | |
tree | a79281756cb68f6e37c75901de88129c511c3473 /components/script/layout_wrapper.rs | |
parent | fada0eb6607fa746cd88426ebb7bb4052f709cda (diff) | |
parent | 607e011b050f22e10a69fc7d57d7e2dc473d979e (diff) | |
download | servo-837531992864f920342020462830b933d5ed0280.tar.gz servo-837531992864f920342020462830b933d5ed0280.zip |
Auto merge of #16876 - asajeffrey:constellation-rename-frames, r=cbrewster
Renamed constellation::Frame to constellation::BrowsingContext
<!-- Please describe your changes on the following line: -->
Now that script has `WindowProxy` rather than `BrowsingContext` objects, we can rename `Frame` in the constellation to `BrowsingContext`. In particular, this means that `FrameId`s are now `BrowsingContextid`s, which better captures their purpose (and they are used in a lot of places, not just the constellation).
---
<!-- 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 do not require tests because renaming
<!-- 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/16876)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/layout_wrapper.rs')
-rw-r--r-- | components/script/layout_wrapper.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script/layout_wrapper.rs b/components/script/layout_wrapper.rs index 5cea48786e3..7802d446114 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::{FrameId, PipelineId}; +use msg::constellation_msg::{BrowsingContextId, PipelineId}; use range::Range; use script_layout_interface::{HTMLCanvasData, LayoutNodeType, SVGSVGData, TrustedNodeAddress}; use script_layout_interface::{OpaqueStyleAndLayoutData, PartialPersistentLayoutData}; @@ -908,9 +908,9 @@ impl<'ln> ThreadSafeLayoutNode for ServoThreadSafeLayoutNode<'ln> { this.svg_data() } - fn iframe_frame_id(&self) -> FrameId { + fn iframe_browsing_context_id(&self) -> BrowsingContextId { let this = unsafe { self.get_jsmanaged() }; - this.iframe_frame_id() + this.iframe_browsing_context_id() } fn iframe_pipeline_id(&self) -> PipelineId { |