Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-19 06:38:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove unused and misnamed url field on HTMLIFrameElement.

Browse source
This commit is contained in:
Ms2ger 2014-05-11 20:37:55 +02:00
parent 9a71af38b9
commit 8e9e930e3d
2 changed files with 0 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/components/script/dom/htmliframeelement.rs
View file

@ -6,7 +6,6 @@ use dom::bindings::codegen::BindingDeclarations::HTMLIFrameElementBinding;
use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLIFrameElementDerived, HTMLElementCast}; use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLIFrameElementDerived, HTMLElementCast};
use dom::bindings::error::ErrorResult; use dom::bindings::error::ErrorResult;
use dom::bindings::js::{JSRef, Temporary}; use dom::bindings::js::{JSRef, Temporary};
use dom::bindings::trace::Untraceable;
use dom::document::Document; use dom::document::Document;
use dom::element::{HTMLIFrameElementTypeId, Element}; use dom::element::{HTMLIFrameElementTypeId, Element};
use dom::element::AttributeHandlers; use dom::element::AttributeHandlers;
@ -19,7 +18,6 @@ use servo_util::str::DOMString;
use servo_msg::constellation_msg::{PipelineId, SubpageId}; use servo_msg::constellation_msg::{PipelineId, SubpageId};
use std::ascii::StrAsciiExt; use std::ascii::StrAsciiExt;
use url::Url;
enum SandboxAllowance { enum SandboxAllowance {
AllowNothing = 0x00, AllowNothing = 0x00,
@ -34,7 +32,6 @@ enum SandboxAllowance {
#[deriving(Encodable)] #[deriving(Encodable)]
pub struct HTMLIFrameElement { pub struct HTMLIFrameElement {
pub htmlelement: HTMLElement, pub htmlelement: HTMLElement,
frame: Untraceable<Option<Url>>,
pub size: Option<IFrameSize>, pub size: Option<IFrameSize>,
pub sandbox: Option<u8> pub sandbox: Option<u8>
} }
@ -53,24 +50,18 @@ pub struct IFrameSize {
pub trait HTMLIFrameElementHelpers { pub trait HTMLIFrameElementHelpers {
fn is_sandboxed(&self) -> bool; fn is_sandboxed(&self) -> bool;
fn set_frame(&mut self, frame: Url);
} }
impl<'a> HTMLIFrameElementHelpers for JSRef<'a, HTMLIFrameElement> { impl<'a> HTMLIFrameElementHelpers for JSRef<'a, HTMLIFrameElement> {
fn is_sandboxed(&self) -> bool { fn is_sandboxed(&self) -> bool {
self.sandbox.is_some() self.sandbox.is_some()
} }
fn set_frame(&mut self, frame: Url) {
*self.frame = Some(frame);
}
} }
impl HTMLIFrameElement { impl HTMLIFrameElement {
pub fn new_inherited(localName: DOMString, document: &JSRef<Document>) -> HTMLIFrameElement { pub fn new_inherited(localName: DOMString, document: &JSRef<Document>) -> HTMLIFrameElement {
HTMLIFrameElement { HTMLIFrameElement {
htmlelement: HTMLElement::new_inherited(HTMLIFrameElementTypeId, localName, document), htmlelement: HTMLElement::new_inherited(HTMLIFrameElementTypeId, localName, document),
frame: Untraceable::new(None),
size: None, size: None,
sandbox: None, sandbox: None,
} }

1
src/components/script/html/hubbub_html_parser.rs
View file

@ -385,7 +385,6 @@ pub fn parse_html(page: &Page,
let sandboxed = iframe_element.is_sandboxed(); let sandboxed = iframe_element.is_sandboxed();
for src in src_opt.iter() { for src in src_opt.iter() {
let iframe_url = parse_url(*src, Some(url2.clone())); let iframe_url = parse_url(*src, Some(url2.clone()));
iframe_element.set_frame(iframe_url.clone());
// Subpage Id // Subpage Id
let subpage_id = *next_subpage_id.borrow(); let subpage_id = *next_subpage_id.borrow();