Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-22 01:35:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

servo: Merge #7925 - Implement HTMLIFrameElement::pipeline_id on LayoutJS<HTMLIFrameElement> (from Ms2ger:iframe-pipeline-layout); r=glennw

Browse Source 
Source-Repo: https://github.com/servo/servo
Source-Revision: 12139f73ef0be864bac00dc106832a9f45634cb2
This commit is contained in:
Ms2ger 2015-10-09 09:49:08 -06:00
parent f76cf699aa
commit 1c3725c38e
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
servo/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
/// not an iframe element, fails.
pub fn iframe_pipeline_id(&self) -> PipelineId {
use script::dom::htmliframeelement::HTMLIFrameElementLayoutMethods;
unsafe {
let iframe_element = HTMLIFrameElementCast::to_layout_js(self.get_jsmanaged())
.expect("not an iframe element!");
(*iframe_element.unsafe_get()).pipeline_id().unwrap()
iframe_element.pipeline_id().unwrap()
}
}
}

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