Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #9048 - frewsxcv:precompute-iframe, r=Ms2ger

Browse source 
Precompute width & height attribute values on <iframe>

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9048)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-12-22 21:58:38 +05:30
commit 9306be60c2
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -35,8 +35,7 @@ use std::cell::Cell;
use string_cache::Atom; use string_cache::Atom;
use url::Url; use url::Url;
use util::prefs; use util::prefs;
use util::str::DOMString; use util::str::{DOMString, LengthOrPercentageOrAuto};
use util::str::{self, LengthOrPercentageOrAuto};
pub fn mozbrowser_enabled() -> bool { pub fn mozbrowser_enabled() -> bool {
prefs::get_pref("dom.mozbrowser.enabled").as_boolean().unwrap_or(false) prefs::get_pref("dom.mozbrowser.enabled").as_boolean().unwrap_or(false)
@ -239,7 +238,8 @@ impl HTMLIFrameElementLayoutMethods for LayoutJS<HTMLIFrameElement> {
unsafe { unsafe {
(*self.upcast::<Element>().unsafe_get()) (*self.upcast::<Element>().unsafe_get())
.get_attr_for_layout(&ns!(), &atom!("width")) .get_attr_for_layout(&ns!(), &atom!("width"))
.map(|attribute| str::parse_length(&attribute)) .map(AttrValue::as_dimension)
.cloned()
.unwrap_or(LengthOrPercentageOrAuto::Auto) .unwrap_or(LengthOrPercentageOrAuto::Auto)
} }
} }
@ -249,7 +249,8 @@ impl HTMLIFrameElementLayoutMethods for LayoutJS<HTMLIFrameElement> {
unsafe { unsafe {
(*self.upcast::<Element>().unsafe_get()) (*self.upcast::<Element>().unsafe_get())
.get_attr_for_layout(&ns!(), &atom!("height")) .get_attr_for_layout(&ns!(), &atom!("height"))
.map(|attribute| str::parse_length(&attribute)) .map(AttrValue::as_dimension)
.cloned()
.unwrap_or(LengthOrPercentageOrAuto::Auto) .unwrap_or(LengthOrPercentageOrAuto::Auto)
} }
} }
@ -423,12 +424,12 @@ impl HTMLIFrameElementMethods for HTMLIFrameElement {
// https://html.spec.whatwg.org/multipage/#dom-dim-width // https://html.spec.whatwg.org/multipage/#dom-dim-width
make_getter!(Width, "width"); make_getter!(Width, "width");
// https://html.spec.whatwg.org/multipage/#dom-dim-width // https://html.spec.whatwg.org/multipage/#dom-dim-width
make_setter!(SetWidth, "width"); make_dimension_setter!(SetWidth, "width");
// https://html.spec.whatwg.org/multipage/#dom-dim-height // https://html.spec.whatwg.org/multipage/#dom-dim-height
make_getter!(Height, "height"); make_getter!(Height, "height");
// https://html.spec.whatwg.org/multipage/#dom-dim-height // https://html.spec.whatwg.org/multipage/#dom-dim-height
make_setter!(SetHeight, "height"); make_dimension_setter!(SetHeight, "height");
} }
impl VirtualMethods for HTMLIFrameElement { impl VirtualMethods for HTMLIFrameElement {
@ -470,6 +471,8 @@ impl VirtualMethods for HTMLIFrameElement {
fn parse_plain_attribute(&self, name: &Atom, value: DOMString) -> AttrValue { fn parse_plain_attribute(&self, name: &Atom, value: DOMString) -> AttrValue {
match name { match name {
&atom!("sandbox") => AttrValue::from_serialized_tokenlist(value), &atom!("sandbox") => AttrValue::from_serialized_tokenlist(value),
&atom!("width") => AttrValue::from_dimension(value),
&atom!("height") => AttrValue::from_dimension(value),
_ => self.super_type().unwrap().parse_plain_attribute(name, value), _ => self.super_type().unwrap().parse_plain_attribute(name, value),
} }
} }