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/layout/fragment.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/layout/fragment.rs')
-rw-r--r-- | components/layout/fragment.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs index c4dfefcc696..7bbe57953fc 100644 --- a/components/layout/fragment.rs +++ b/components/layout/fragment.rs @@ -26,7 +26,7 @@ use ipc_channel::ipc::IpcSender; use layout_debug; use model::{self, IntrinsicISizes, IntrinsicISizesContribution, MaybeAuto, SizeConstraint}; use model::{style_length, ToGfxMatrix}; -use msg::constellation_msg::{FrameId, PipelineId}; +use msg::constellation_msg::{BrowsingContextId, PipelineId}; use net_traits::image::base::{Image, ImageMetadata}; use net_traits::image_cache::{ImageOrMetadataAvailable, UsePlaceholder}; use range::*; @@ -472,7 +472,7 @@ impl ImageFragmentInfo { #[derive(Clone)] pub struct IframeFragmentInfo { /// The frame ID of this iframe. - pub frame_id: FrameId, + pub browsing_context_id: BrowsingContextId, /// The pipelineID of this iframe. pub pipeline_id: PipelineId, } @@ -480,10 +480,10 @@ pub struct IframeFragmentInfo { impl IframeFragmentInfo { /// Creates the information specific to an iframe fragment. pub fn new<N: ThreadSafeLayoutNode>(node: &N) -> IframeFragmentInfo { - let frame_id = node.iframe_frame_id(); + let browsing_context_id = node.iframe_browsing_context_id(); let pipeline_id = node.iframe_pipeline_id(); IframeFragmentInfo { - frame_id: frame_id, + browsing_context_id: browsing_context_id, pipeline_id: pipeline_id, } } |