mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
script: Implement the width
and height
attributes for iframes per
HTML5 § 4.8.6. Improves Amazon and Ars Technica.
This commit is contained in:
parent
e52197d126
commit
1a3395e077
13 changed files with 154 additions and 290 deletions
|
@ -49,17 +49,17 @@ use script::dom::element::ElementTypeId;
|
||||||
use script::dom::htmlelement::HTMLElementTypeId;
|
use script::dom::htmlelement::HTMLElementTypeId;
|
||||||
use script::dom::htmlobjectelement::is_image_data;
|
use script::dom::htmlobjectelement::is_image_data;
|
||||||
use script::dom::node::NodeTypeId;
|
use script::dom::node::NodeTypeId;
|
||||||
use util::opts;
|
|
||||||
use std::borrow::ToOwned;
|
use std::borrow::ToOwned;
|
||||||
use std::collections::LinkedList;
|
use std::collections::LinkedList;
|
||||||
use std::mem;
|
use std::mem;
|
||||||
|
use std::sync::Arc;
|
||||||
use std::sync::atomic::Ordering;
|
use std::sync::atomic::Ordering;
|
||||||
use style::computed_values::content::ContentItem;
|
use style::computed_values::content::ContentItem;
|
||||||
use style::computed_values::{caption_side, display, empty_cells, float, list_style_position};
|
use style::computed_values::{caption_side, display, empty_cells, float, list_style_position};
|
||||||
use style::computed_values::{position};
|
use style::computed_values::{position};
|
||||||
use style::properties::{self, ComputedValues};
|
use style::properties::{self, ComputedValues};
|
||||||
use std::sync::Arc;
|
|
||||||
use url::Url;
|
use url::Url;
|
||||||
|
use util::opts;
|
||||||
|
|
||||||
/// The results of flow construction for a DOM node.
|
/// The results of flow construction for a DOM node.
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
|
|
|
@ -566,7 +566,8 @@ impl IframeFragmentInfo {
|
||||||
}
|
}
|
||||||
|
|
||||||
#[inline]
|
#[inline]
|
||||||
pub fn calculate_replaced_inline_size(style: &ComputedValues, containing_size: Au) -> Au {
|
pub fn calculate_replaced_inline_size(&self, style: &ComputedValues, containing_size: Au)
|
||||||
|
-> Au {
|
||||||
// Calculate the replaced inline size (or default) as per CSS 2.1 § 10.3.2
|
// Calculate the replaced inline size (or default) as per CSS 2.1 § 10.3.2
|
||||||
IframeFragmentInfo::calculate_replaced_size(style.content_inline_size(),
|
IframeFragmentInfo::calculate_replaced_size(style.content_inline_size(),
|
||||||
style.min_inline_size(),
|
style.min_inline_size(),
|
||||||
|
@ -576,7 +577,8 @@ impl IframeFragmentInfo {
|
||||||
}
|
}
|
||||||
|
|
||||||
#[inline]
|
#[inline]
|
||||||
pub fn calculate_replaced_block_size(style: &ComputedValues, containing_size: Au) -> Au {
|
pub fn calculate_replaced_block_size(&self, style: &ComputedValues, containing_size: Au)
|
||||||
|
-> Au {
|
||||||
// Calculate the replaced block size (or default) as per CSS 2.1 § 10.3.2
|
// Calculate the replaced block size (or default) as per CSS 2.1 § 10.3.2
|
||||||
IframeFragmentInfo::calculate_replaced_size(style.content_block_size(),
|
IframeFragmentInfo::calculate_replaced_size(style.content_block_size(),
|
||||||
style.min_block_size(),
|
style.min_block_size(),
|
||||||
|
@ -589,7 +591,8 @@ impl IframeFragmentInfo {
|
||||||
fn calculate_replaced_size(content_size: LengthOrPercentageOrAuto,
|
fn calculate_replaced_size(content_size: LengthOrPercentageOrAuto,
|
||||||
style_min_size: LengthOrPercentage,
|
style_min_size: LengthOrPercentage,
|
||||||
style_max_size: LengthOrPercentageOrNone,
|
style_max_size: LengthOrPercentageOrNone,
|
||||||
containing_size: Au, default_size: Au) -> Au {
|
containing_size: Au,
|
||||||
|
default_size: Au) -> Au {
|
||||||
let computed_size = match MaybeAuto::from_style(content_size, containing_size) {
|
let computed_size = match MaybeAuto::from_style(content_size, containing_size) {
|
||||||
MaybeAuto::Specified(length) => length,
|
MaybeAuto::Specified(length) => length,
|
||||||
MaybeAuto::Auto => default_size,
|
MaybeAuto::Auto => default_size,
|
||||||
|
@ -1702,9 +1705,10 @@ impl Fragment {
|
||||||
fragment_inline_size,
|
fragment_inline_size,
|
||||||
fragment_block_size);
|
fragment_block_size);
|
||||||
}
|
}
|
||||||
SpecificFragmentInfo::Iframe(_) => {
|
SpecificFragmentInfo::Iframe(ref iframe_fragment_info) => {
|
||||||
self.border_box.size.inline = IframeFragmentInfo::calculate_replaced_inline_size(
|
self.border_box.size.inline =
|
||||||
style, container_inline_size) +
|
iframe_fragment_info.calculate_replaced_inline_size(style,
|
||||||
|
container_inline_size) +
|
||||||
noncontent_inline_size;
|
noncontent_inline_size;
|
||||||
}
|
}
|
||||||
_ => panic!("this case should have been handled above"),
|
_ => panic!("this case should have been handled above"),
|
||||||
|
@ -1786,10 +1790,10 @@ impl Fragment {
|
||||||
self.border_box.size.block = block_flow.base.position.size.block +
|
self.border_box.size.block = block_flow.base.position.size.block +
|
||||||
block_flow.fragment.margin.block_start_end()
|
block_flow.fragment.margin.block_start_end()
|
||||||
}
|
}
|
||||||
SpecificFragmentInfo::Iframe(_) => {
|
SpecificFragmentInfo::Iframe(ref info) => {
|
||||||
self.border_box.size.block = IframeFragmentInfo::calculate_replaced_block_size(
|
self.border_box.size.block =
|
||||||
style, containing_block_block_size) +
|
info.calculate_replaced_block_size(style, containing_block_block_size) +
|
||||||
noncontent_block_size;
|
noncontent_block_size;
|
||||||
}
|
}
|
||||||
_ => panic!("should have been handled above"),
|
_ => panic!("should have been handled above"),
|
||||||
}
|
}
|
||||||
|
|
|
@ -311,6 +311,7 @@ pub trait AttrHelpersForLayout {
|
||||||
unsafe fn value_atom_forever(&self) -> Option<Atom>;
|
unsafe fn value_atom_forever(&self) -> Option<Atom>;
|
||||||
unsafe fn value_tokens_forever(&self) -> Option<&'static [Atom]>;
|
unsafe fn value_tokens_forever(&self) -> Option<&'static [Atom]>;
|
||||||
unsafe fn local_name_atom_forever(&self) -> Atom;
|
unsafe fn local_name_atom_forever(&self) -> Atom;
|
||||||
|
unsafe fn value(&self) -> &AttrValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
#[allow(unsafe_code)]
|
#[allow(unsafe_code)]
|
||||||
|
@ -351,4 +352,9 @@ impl AttrHelpersForLayout for Attr {
|
||||||
unsafe fn local_name_atom_forever(&self) -> Atom {
|
unsafe fn local_name_atom_forever(&self) -> Atom {
|
||||||
self.local_name.clone()
|
self.local_name.clone()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[inline]
|
||||||
|
unsafe fn value(&self) -> &AttrValue {
|
||||||
|
self.value.borrow_for_layout()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,7 +18,7 @@ use dom::bindings::codegen::Bindings::NamedNodeMapBinding::NamedNodeMapMethods;
|
||||||
use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods;
|
use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods;
|
||||||
use dom::bindings::codegen::InheritTypes::{ElementCast, ElementDerived, EventTargetCast};
|
use dom::bindings::codegen::InheritTypes::{ElementCast, ElementDerived, EventTargetCast};
|
||||||
use dom::bindings::codegen::InheritTypes::{HTMLBodyElementDerived, HTMLFontElementDerived};
|
use dom::bindings::codegen::InheritTypes::{HTMLBodyElementDerived, HTMLFontElementDerived};
|
||||||
use dom::bindings::codegen::InheritTypes::{HTMLInputElementCast};
|
use dom::bindings::codegen::InheritTypes::{HTMLIFrameElementDerived, HTMLInputElementCast};
|
||||||
use dom::bindings::codegen::InheritTypes::{HTMLInputElementDerived, HTMLTableElementCast};
|
use dom::bindings::codegen::InheritTypes::{HTMLInputElementDerived, HTMLTableElementCast};
|
||||||
use dom::bindings::codegen::InheritTypes::{HTMLTableElementDerived, HTMLTableCellElementDerived};
|
use dom::bindings::codegen::InheritTypes::{HTMLTableElementDerived, HTMLTableCellElementDerived};
|
||||||
use dom::bindings::codegen::InheritTypes::{HTMLTableRowElementDerived, HTMLTextAreaElementDerived};
|
use dom::bindings::codegen::InheritTypes::{HTMLTableRowElementDerived, HTMLTextAreaElementDerived};
|
||||||
|
@ -47,6 +47,7 @@ use dom::htmlbodyelement::{HTMLBodyElement, HTMLBodyElementHelpers};
|
||||||
use dom::htmlcollection::HTMLCollection;
|
use dom::htmlcollection::HTMLCollection;
|
||||||
use dom::htmlelement::HTMLElementTypeId;
|
use dom::htmlelement::HTMLElementTypeId;
|
||||||
use dom::htmlfontelement::{HTMLFontElement, HTMLFontElementHelpers};
|
use dom::htmlfontelement::{HTMLFontElement, HTMLFontElementHelpers};
|
||||||
|
use dom::htmliframeelement::{HTMLIFrameElement, RawHTMLIFrameElementHelpers};
|
||||||
use dom::htmlinputelement::{HTMLInputElement, RawLayoutHTMLInputElementHelpers, HTMLInputElementHelpers};
|
use dom::htmlinputelement::{HTMLInputElement, RawLayoutHTMLInputElementHelpers, HTMLInputElementHelpers};
|
||||||
use dom::htmltableelement::{HTMLTableElement, HTMLTableElementHelpers};
|
use dom::htmltableelement::{HTMLTableElement, HTMLTableElementHelpers};
|
||||||
use dom::htmltablecellelement::{HTMLTableCellElement, HTMLTableCellElementHelpers};
|
use dom::htmltablecellelement::{HTMLTableCellElement, HTMLTableCellElementHelpers};
|
||||||
|
@ -64,7 +65,7 @@ use style;
|
||||||
use style::legacy::{UnsignedIntegerAttribute, from_declaration};
|
use style::legacy::{UnsignedIntegerAttribute, from_declaration};
|
||||||
use style::properties::{PropertyDeclarationBlock, PropertyDeclaration, parse_style_attribute};
|
use style::properties::{PropertyDeclarationBlock, PropertyDeclaration, parse_style_attribute};
|
||||||
use style::properties::DeclaredValue::SpecifiedValue;
|
use style::properties::DeclaredValue::SpecifiedValue;
|
||||||
use style::properties::longhands::{self, border_spacing};
|
use style::properties::longhands::{self, border_spacing, height};
|
||||||
use style::values::CSSFloat;
|
use style::values::CSSFloat;
|
||||||
use style::values::specified::{self, CSSColor, CSSRGBA};
|
use style::values::specified::{self, CSSColor, CSSRGBA};
|
||||||
use util::geometry::Au;
|
use util::geometry::Au;
|
||||||
|
@ -181,7 +182,8 @@ pub trait RawLayoutElementHelpers {
|
||||||
|
|
||||||
#[inline]
|
#[inline]
|
||||||
#[allow(unsafe_code)]
|
#[allow(unsafe_code)]
|
||||||
unsafe fn get_attr_for_layout(elem: &Element, namespace: &Namespace, name: &Atom) -> Option<LayoutJS<Attr>> {
|
pub unsafe fn get_attr_for_layout<'a>(elem: &'a Element, namespace: &Namespace, name: &Atom)
|
||||||
|
-> Option<LayoutJS<Attr>> {
|
||||||
// cast to point to T in RefCell<T> directly
|
// cast to point to T in RefCell<T> directly
|
||||||
let attrs = elem.attrs.borrow_for_layout();
|
let attrs = elem.attrs.borrow_for_layout();
|
||||||
attrs.iter().find(|attr: & &JS<Attr>| {
|
attrs.iter().find(|attr: & &JS<Attr>| {
|
||||||
|
@ -331,7 +333,10 @@ impl RawLayoutElementHelpers for Element {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
let width = if self.is_htmltableelement() {
|
let width = if self.is_htmliframeelement() {
|
||||||
|
let this: &HTMLIFrameElement = mem::transmute(self);
|
||||||
|
this.get_width()
|
||||||
|
} else if self.is_htmltableelement() {
|
||||||
let this: &HTMLTableElement = mem::transmute(self);
|
let this: &HTMLTableElement = mem::transmute(self);
|
||||||
this.get_width()
|
this.get_width()
|
||||||
} else if self.is_htmltabledatacellelement() {
|
} else if self.is_htmltabledatacellelement() {
|
||||||
|
@ -349,13 +354,37 @@ impl RawLayoutElementHelpers for Element {
|
||||||
PropertyDeclaration::Width(SpecifiedValue(width_value))));
|
PropertyDeclaration::Width(SpecifiedValue(width_value))));
|
||||||
}
|
}
|
||||||
LengthOrPercentageOrAuto::Length(length) => {
|
LengthOrPercentageOrAuto::Length(length) => {
|
||||||
let width_value = specified::LengthOrPercentageOrAuto::Length(specified::Length::Absolute(length));
|
let width_value = specified::LengthOrPercentageOrAuto::Length(
|
||||||
|
specified::Length::Absolute(length));
|
||||||
hints.push(from_declaration(
|
hints.push(from_declaration(
|
||||||
PropertyDeclaration::Width(SpecifiedValue(width_value))));
|
PropertyDeclaration::Width(SpecifiedValue(width_value))));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
let height = if self.is_htmliframeelement() {
|
||||||
|
let this: &HTMLIFrameElement = mem::transmute(self);
|
||||||
|
this.get_height()
|
||||||
|
} else {
|
||||||
|
LengthOrPercentageOrAuto::Auto
|
||||||
|
};
|
||||||
|
|
||||||
|
match height {
|
||||||
|
LengthOrPercentageOrAuto::Auto => {}
|
||||||
|
LengthOrPercentageOrAuto::Percentage(percentage) => {
|
||||||
|
let width_value = specified::LengthOrPercentageOrAuto::Percentage(percentage);
|
||||||
|
hints.push(from_declaration(PropertyDeclaration::Height(SpecifiedValue(
|
||||||
|
height::SpecifiedValue(width_value)))));
|
||||||
|
}
|
||||||
|
LengthOrPercentageOrAuto::Length(length) => {
|
||||||
|
let width_value = specified::LengthOrPercentageOrAuto::Length(
|
||||||
|
specified::Length::Absolute(length));
|
||||||
|
hints.push(from_declaration(PropertyDeclaration::Height(SpecifiedValue(
|
||||||
|
height::SpecifiedValue(width_value)))));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
let cols = if self.is_htmltextareaelement() {
|
let cols = if self.is_htmltextareaelement() {
|
||||||
let this: &HTMLTextAreaElement = mem::transmute(self);
|
let this: &HTMLTextAreaElement = mem::transmute(self);
|
||||||
match this.get_cols_for_layout() {
|
match this.get_cols_for_layout() {
|
||||||
|
|
|
@ -2,9 +2,7 @@
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||||
|
|
||||||
use dom::attr::Attr;
|
use dom::attr::{Attr, AttrHelpers, AttrHelpersForLayout, AttrValue};
|
||||||
use dom::attr::AttrValue;
|
|
||||||
use dom::attr::AttrHelpers;
|
|
||||||
use dom::bindings::codegen::Bindings::HTMLIFrameElementBinding;
|
use dom::bindings::codegen::Bindings::HTMLIFrameElementBinding;
|
||||||
use dom::bindings::codegen::Bindings::HTMLIFrameElementBinding::HTMLIFrameElementMethods;
|
use dom::bindings::codegen::Bindings::HTMLIFrameElementBinding::HTMLIFrameElementMethods;
|
||||||
use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods;
|
use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods;
|
||||||
|
@ -17,8 +15,7 @@ use dom::bindings::global::GlobalRef;
|
||||||
use dom::bindings::js::{JSRef, OptionalRootable, Rootable, Temporary};
|
use dom::bindings::js::{JSRef, OptionalRootable, Rootable, Temporary};
|
||||||
use dom::customevent::CustomEvent;
|
use dom::customevent::CustomEvent;
|
||||||
use dom::document::Document;
|
use dom::document::Document;
|
||||||
use dom::element::Element;
|
use dom::element::{self, AttributeHandlers, Element};
|
||||||
use dom::element::AttributeHandlers;
|
|
||||||
use dom::event::{Event, EventHelpers};
|
use dom::event::{Event, EventHelpers};
|
||||||
use dom::eventtarget::{EventTarget, EventTargetTypeId};
|
use dom::eventtarget::{EventTarget, EventTargetTypeId};
|
||||||
use dom::element::ElementTypeId;
|
use dom::element::ElementTypeId;
|
||||||
|
@ -40,6 +37,7 @@ use std::ascii::AsciiExt;
|
||||||
use std::borrow::ToOwned;
|
use std::borrow::ToOwned;
|
||||||
use std::cell::Cell;
|
use std::cell::Cell;
|
||||||
use url::{Url, UrlParser};
|
use url::{Url, UrlParser};
|
||||||
|
use util::str::{self, LengthOrPercentageOrAuto};
|
||||||
|
|
||||||
enum SandboxAllowance {
|
enum SandboxAllowance {
|
||||||
AllowNothing = 0x00,
|
AllowNothing = 0x00,
|
||||||
|
@ -76,6 +74,11 @@ pub trait HTMLIFrameElementHelpers {
|
||||||
fn update_subpage_id(self, new_subpage_id: SubpageId);
|
fn update_subpage_id(self, new_subpage_id: SubpageId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub trait RawHTMLIFrameElementHelpers {
|
||||||
|
fn get_width(&self) -> LengthOrPercentageOrAuto;
|
||||||
|
fn get_height(&self) -> LengthOrPercentageOrAuto;
|
||||||
|
}
|
||||||
|
|
||||||
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.get().is_some()
|
self.sandbox.get().is_some()
|
||||||
|
@ -163,6 +166,30 @@ impl<'a> HTMLIFrameElementHelpers for JSRef<'a, HTMLIFrameElement> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl RawHTMLIFrameElementHelpers for HTMLIFrameElement {
|
||||||
|
#[allow(unsafe_code)]
|
||||||
|
fn get_width(&self) -> LengthOrPercentageOrAuto {
|
||||||
|
unsafe {
|
||||||
|
element::get_attr_for_layout(ElementCast::from_actual(&*self),
|
||||||
|
&ns!(""),
|
||||||
|
&atom!("width")).map(|attribute| {
|
||||||
|
str::parse_length(&**(*attribute.unsafe_get()).value())
|
||||||
|
}).unwrap_or(LengthOrPercentageOrAuto::Auto)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[allow(unsafe_code)]
|
||||||
|
fn get_height(&self) -> LengthOrPercentageOrAuto {
|
||||||
|
unsafe {
|
||||||
|
element::get_attr_for_layout(ElementCast::from_actual(&*self),
|
||||||
|
&ns!(""),
|
||||||
|
&atom!("height")).map(|attribute| {
|
||||||
|
str::parse_length(&**(*attribute.unsafe_get()).value())
|
||||||
|
}).unwrap_or(LengthOrPercentageOrAuto::Auto)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl HTMLIFrameElement {
|
impl HTMLIFrameElement {
|
||||||
fn new_inherited(localName: DOMString, prefix: Option<DOMString>, document: JSRef<Document>) -> HTMLIFrameElement {
|
fn new_inherited(localName: DOMString, prefix: Option<DOMString>, document: JSRef<Document>) -> HTMLIFrameElement {
|
||||||
HTMLIFrameElement {
|
HTMLIFrameElement {
|
||||||
|
@ -317,6 +344,14 @@ impl<'a> HTMLIFrameElementMethods for JSRef<'a, HTMLIFrameElement> {
|
||||||
fn Stop(self) -> Fallible<()> {
|
fn Stop(self) -> Fallible<()> {
|
||||||
Err(NotSupported)
|
Err(NotSupported)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
make_getter!(Width);
|
||||||
|
|
||||||
|
make_setter!(SetWidth, "width");
|
||||||
|
|
||||||
|
make_getter!(Height);
|
||||||
|
|
||||||
|
make_setter!(SetHeight, "height");
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a> VirtualMethods for JSRef<'a, HTMLIFrameElement> {
|
impl<'a> VirtualMethods for JSRef<'a, HTMLIFrameElement> {
|
||||||
|
@ -347,7 +382,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLIFrameElement> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
self.sandbox.set(Some(modes));
|
self.sandbox.set(Some(modes));
|
||||||
},
|
}
|
||||||
&atom!("src") => {
|
&atom!("src") => {
|
||||||
let node: JSRef<Node> = NodeCast::from_ref(*self);
|
let node: JSRef<Node> = NodeCast::from_ref(*self);
|
||||||
if node.is_in_doc() {
|
if node.is_in_doc() {
|
||||||
|
|
|
@ -12,8 +12,8 @@ interface HTMLIFrameElement : HTMLElement {
|
||||||
attribute DOMString sandbox;
|
attribute DOMString sandbox;
|
||||||
// attribute boolean seamless;
|
// attribute boolean seamless;
|
||||||
// attribute boolean allowFullscreen;
|
// attribute boolean allowFullscreen;
|
||||||
// attribute DOMString width;
|
attribute DOMString width;
|
||||||
// attribute DOMString height;
|
attribute DOMString height;
|
||||||
readonly attribute Document? contentDocument;
|
readonly attribute Document? contentDocument;
|
||||||
//readonly attribute WindowProxy? contentWindow;
|
//readonly attribute WindowProxy? contentWindow;
|
||||||
readonly attribute Window? contentWindow;
|
readonly attribute Window? contentWindow;
|
||||||
|
|
|
@ -127,7 +127,7 @@ pub fn parse_unsigned_integer<T: Iterator<Item=char>>(input: T) -> Option<u32> {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Copy, Clone)]
|
#[derive(Copy, Clone, Debug)]
|
||||||
pub enum LengthOrPercentageOrAuto {
|
pub enum LengthOrPercentageOrAuto {
|
||||||
Auto,
|
Auto,
|
||||||
Percentage(f32),
|
Percentage(f32),
|
||||||
|
|
|
@ -125,6 +125,8 @@ flaky_cpu == append_style_a.html append_style_b.html
|
||||||
== iframe/simple_inline_width.html iframe/simple_inline_width_ref.html
|
== iframe/simple_inline_width.html iframe/simple_inline_width_ref.html
|
||||||
== iframe/simple_inline_width_height.html iframe/simple_inline_width_height_ref.html
|
== iframe/simple_inline_width_height.html iframe/simple_inline_width_height_ref.html
|
||||||
== iframe/simple_inline_width_percentage.html iframe/simple_inline_width_percentage_ref.html
|
== iframe/simple_inline_width_percentage.html iframe/simple_inline_width_percentage_ref.html
|
||||||
|
== iframe/size_attributes.html iframe/size_attributes_ref.html
|
||||||
|
experimental == iframe/size_attributes_vertical_writing_mode.html iframe/size_attributes_ref.html
|
||||||
|
|
||||||
!= image_rendering_auto_a.html image_rendering_pixelated_a.html
|
!= image_rendering_auto_a.html image_rendering_pixelated_a.html
|
||||||
== image_rendering_pixelated_a.html image_rendering_pixelated_ref.html
|
== image_rendering_pixelated_a.html image_rendering_pixelated_ref.html
|
||||||
|
|
14
tests/ref/iframe/size_attributes.html
Normal file
14
tests/ref/iframe/size_attributes.html
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<style>
|
||||||
|
body {
|
||||||
|
background: purple;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<iframe src="about:blank" width=200 height=100></iframe>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
|
18
tests/ref/iframe/size_attributes_ref.html
Normal file
18
tests/ref/iframe/size_attributes_ref.html
Normal file
|
@ -0,0 +1,18 @@
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<style>
|
||||||
|
body {
|
||||||
|
background: purple;
|
||||||
|
}
|
||||||
|
iframe {
|
||||||
|
width: 200px;
|
||||||
|
height: 100px;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<iframe src="about:blank"></iframe>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
|
20
tests/ref/iframe/size_attributes_vertical_writing_mode.html
Normal file
20
tests/ref/iframe/size_attributes_vertical_writing_mode.html
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<style>
|
||||||
|
body {
|
||||||
|
background: purple;
|
||||||
|
}
|
||||||
|
|
||||||
|
iframe {
|
||||||
|
writing-mode: vertical-lr;
|
||||||
|
position: relative;
|
||||||
|
top: 104px;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<iframe src="about:blank" width=200 height=100></iframe>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
|
|
@ -2922,12 +2922,6 @@
|
||||||
[HTMLIFrameElement interface: attribute allowFullscreen]
|
[HTMLIFrameElement interface: attribute allowFullscreen]
|
||||||
expected: FAIL
|
expected: FAIL
|
||||||
|
|
||||||
[HTMLIFrameElement interface: attribute width]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[HTMLIFrameElement interface: attribute height]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[HTMLIFrameElement interface: attribute align]
|
[HTMLIFrameElement interface: attribute align]
|
||||||
expected: FAIL
|
expected: FAIL
|
||||||
|
|
||||||
|
|
|
@ -2547,264 +2547,6 @@
|
||||||
[iframe.allowFullscreen: IDL set to object "test-valueOf" followed by IDL get]
|
[iframe.allowFullscreen: IDL set to object "test-valueOf" followed by IDL get]
|
||||||
expected: FAIL
|
expected: FAIL
|
||||||
|
|
||||||
[iframe.width: typeof IDL attribute]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: IDL get with DOM attribute unset]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: setAttribute() to "" followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: setAttribute() to " \\0\\x01\\x02\\x03\\x04\\x05\\x06\\x07 \\b\\t\\n\\v\\f\\r\\x0e\\x0f \\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17 \\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f foo " followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: setAttribute() to undefined followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: setAttribute() to 7 followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: setAttribute() to 1.5 followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: setAttribute() to true followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: setAttribute() to false followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: setAttribute() to object "[object Object\]" followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: setAttribute() to NaN followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: setAttribute() to Infinity followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: setAttribute() to -Infinity followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: setAttribute() to "\\0" followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: setAttribute() to null followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: setAttribute() to object "test-toString" followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: setAttribute() to object "test-valueOf" followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: IDL set to "" followed by getAttribute()]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: IDL set to " \\0\\x01\\x02\\x03\\x04\\x05\\x06\\x07 \\b\\t\\n\\v\\f\\r\\x0e\\x0f \\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17 \\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f foo " followed by getAttribute()]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: IDL set to undefined followed by getAttribute()]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: IDL set to undefined followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: IDL set to 7 followed by getAttribute()]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: IDL set to 7 followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: IDL set to 1.5 followed by getAttribute()]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: IDL set to 1.5 followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: IDL set to true followed by getAttribute()]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: IDL set to true followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: IDL set to false followed by getAttribute()]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: IDL set to false followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: IDL set to object "[object Object\]" followed by getAttribute()]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: IDL set to object "[object Object\]" followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: IDL set to NaN followed by getAttribute()]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: IDL set to NaN followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: IDL set to Infinity followed by getAttribute()]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: IDL set to Infinity followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: IDL set to -Infinity followed by getAttribute()]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: IDL set to -Infinity followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: IDL set to "\\0" followed by getAttribute()]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: IDL set to null followed by getAttribute()]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: IDL set to null followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: IDL set to object "test-toString" followed by getAttribute()]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: IDL set to object "test-toString" followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.width: IDL set to object "test-valueOf" followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: typeof IDL attribute]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: IDL get with DOM attribute unset]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: setAttribute() to "" followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: setAttribute() to " \\0\\x01\\x02\\x03\\x04\\x05\\x06\\x07 \\b\\t\\n\\v\\f\\r\\x0e\\x0f \\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17 \\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f foo " followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: setAttribute() to undefined followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: setAttribute() to 7 followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: setAttribute() to 1.5 followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: setAttribute() to true followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: setAttribute() to false followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: setAttribute() to object "[object Object\]" followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: setAttribute() to NaN followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: setAttribute() to Infinity followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: setAttribute() to -Infinity followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: setAttribute() to "\\0" followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: setAttribute() to null followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: setAttribute() to object "test-toString" followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: setAttribute() to object "test-valueOf" followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: IDL set to "" followed by getAttribute()]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: IDL set to " \\0\\x01\\x02\\x03\\x04\\x05\\x06\\x07 \\b\\t\\n\\v\\f\\r\\x0e\\x0f \\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17 \\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f foo " followed by getAttribute()]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: IDL set to undefined followed by getAttribute()]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: IDL set to undefined followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: IDL set to 7 followed by getAttribute()]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: IDL set to 7 followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: IDL set to 1.5 followed by getAttribute()]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: IDL set to 1.5 followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: IDL set to true followed by getAttribute()]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: IDL set to true followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: IDL set to false followed by getAttribute()]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: IDL set to false followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: IDL set to object "[object Object\]" followed by getAttribute()]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: IDL set to object "[object Object\]" followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: IDL set to NaN followed by getAttribute()]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: IDL set to NaN followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: IDL set to Infinity followed by getAttribute()]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: IDL set to Infinity followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: IDL set to -Infinity followed by getAttribute()]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: IDL set to -Infinity followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: IDL set to "\\0" followed by getAttribute()]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: IDL set to null followed by getAttribute()]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: IDL set to null followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: IDL set to object "test-toString" followed by getAttribute()]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: IDL set to object "test-toString" followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.height: IDL set to object "test-valueOf" followed by IDL get]
|
|
||||||
expected: FAIL
|
|
||||||
|
|
||||||
[iframe.align: typeof IDL attribute]
|
[iframe.align: typeof IDL attribute]
|
||||||
expected: FAIL
|
expected: FAIL
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue