diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-10-07 18:36:35 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-10-07 18:36:35 -0600 |
| commit | 1d617f332edd0036ca4cbc3890f1f44f57597906 (patch) | |
| tree | 6f7fc7caba7cd3b2b318b664284eb044b04139bc /components/script/dom/htmliframeelement.rs | |
| parent | e7f73fdfd822fc2f0d3c239a428c739232bdfd12 (diff) | |
| parent | da881947e5370b95778e45c6b1f618690437f007 (diff) | |
| download | servo-1d617f332edd0036ca4cbc3890f1f44f57597906.tar.gz servo-1d617f332edd0036ca4cbc3890f1f44f57597906.zip | |
Auto merge of #7899 - glennw:subpage-fixes-1, r=pcwalton
Remove constellation round trip for subpage mapping in compositor.
This makes use of the new functionality that allows iframes to generate their own pipeline IDs in order to remove any knowledge of subpage ids from the compositor.
(This is the first of several commits removing subpage from parts of servo).
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7899)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/htmliframeelement.rs')
| -rw-r--r-- | components/script/dom/htmliframeelement.rs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs index 115dd139854..b8df7d9fd78 100644 --- a/components/script/dom/htmliframeelement.rs +++ b/components/script/dom/htmliframeelement.rs @@ -222,6 +222,11 @@ impl HTMLIFrameElement { pub fn subpage_id(&self) -> Option<SubpageId> { self.subpage_id.get() } + + #[inline] + pub fn pipeline_id(&self) -> Option<PipelineId> { + self.pipeline_id.get() + } } pub fn Navigate(iframe: &HTMLIFrameElement, direction: NavigationDirection) -> Fallible<()> { |