Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 14:35:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #7925 - Ms2ger:iframe-pipeline-layout, r=glennw

Browse source 
Implement HTMLIFrameElement::pipeline_id on LayoutJS<HTMLIFrameElement>.



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7925)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-10-09 09:49:08 -06:00
commit 12139f73ef
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/layout/wrapper.rs
View file

@ -1014,10 +1014,11 @@ impl<'ln> ThreadSafeLayoutNode<'ln> {
/// If this node is an iframe element, returns its pipeline ID. If this node is /// If this node is an iframe element, returns its pipeline ID. If this node is
/// not an iframe element, fails. /// not an iframe element, fails.
pub fn iframe_pipeline_id(&self) -> PipelineId { pub fn iframe_pipeline_id(&self) -> PipelineId {
use script::dom::htmliframeelement::HTMLIFrameElementLayoutMethods;
unsafe { unsafe {
let iframe_element = HTMLIFrameElementCast::to_layout_js(self.get_jsmanaged()) let iframe_element = HTMLIFrameElementCast::to_layout_js(self.get_jsmanaged())
.expect("not an iframe element!"); .expect("not an iframe element!");
(*iframe_element.unsafe_get()).pipeline_id().unwrap() iframe_element.pipeline_id().unwrap()
} }
} }
} }

15
components/script/dom/htmliframeelement.rs
View file

@ -12,7 +12,7 @@ use dom::bindings::codegen::InheritTypes::{EventTargetCast, HTMLElementCast};
use dom::bindings::conversions::ToJSValConvertible; use dom::bindings::conversions::ToJSValConvertible;
use dom::bindings::error::{Error, ErrorResult, Fallible}; use dom::bindings::error::{Error, ErrorResult, Fallible};
use dom::bindings::global::GlobalRef; use dom::bindings::global::GlobalRef;
use dom::bindings::js::{Root}; use dom::bindings::js::{Root, LayoutJS};
use dom::bindings::utils::Reflectable; use dom::bindings::utils::Reflectable;
use dom::customevent::CustomEvent; use dom::customevent::CustomEvent;
use dom::document::Document; use dom::document::Document;
@ -222,10 +222,19 @@ impl HTMLIFrameElement {
pub fn subpage_id(&self) -> Option<SubpageId> { pub fn subpage_id(&self) -> Option<SubpageId> {
self.subpage_id.get() self.subpage_id.get()
} }
}
pub trait HTMLIFrameElementLayoutMethods {
fn pipeline_id(self) -> Option<PipelineId>;
}
impl HTMLIFrameElementLayoutMethods for LayoutJS<HTMLIFrameElement> {
#[inline] #[inline]
pub fn pipeline_id(&self) -> Option<PipelineId> { #[allow(unsafe_code)]
self.pipeline_id.get() fn pipeline_id(self) -> Option<PipelineId> {
unsafe {
(*self.unsafe_get()).pipeline_id.get()
}
} }
} }