mirror of
https://github.com/servo/servo.git
synced 2025-08-03 12:40:06 +01:00
Fix #7268 - getComputedStyle should take Element
, not HTMLElement
This commit is contained in:
parent
70b9922eb0
commit
b7d25159d3
7 changed files with 40 additions and 13 deletions
|
@ -9,8 +9,7 @@ use dom::bindings::global::GlobalRef;
|
|||
use dom::bindings::js::{JS, Root};
|
||||
use dom::bindings::utils::{Reflector, reflect_dom_object};
|
||||
use dom::document::DocumentHelpers;
|
||||
use dom::element::{ElementHelpers, StylePriority};
|
||||
use dom::htmlelement::HTMLElement;
|
||||
use dom::element::{ElementHelpers, StylePriority, Element};
|
||||
use dom::node::{window_from_node, document_from_node, NodeDamage, NodeHelpers};
|
||||
use dom::window::{Window, WindowHelpers};
|
||||
use util::str::DOMString;
|
||||
|
@ -28,7 +27,7 @@ use std::cell::Ref;
|
|||
#[derive(HeapSizeOf)]
|
||||
pub struct CSSStyleDeclaration {
|
||||
reflector_: Reflector,
|
||||
owner: JS<HTMLElement>,
|
||||
owner: JS<Element>,
|
||||
readonly: bool,
|
||||
pseudo: Option<PseudoElement>,
|
||||
}
|
||||
|
@ -59,7 +58,7 @@ fn serialize_list(list: &[Ref<PropertyDeclaration>]) -> DOMString {
|
|||
}
|
||||
|
||||
impl CSSStyleDeclaration {
|
||||
pub fn new_inherited(owner: &HTMLElement,
|
||||
pub fn new_inherited(owner: &Element,
|
||||
pseudo: Option<PseudoElement>,
|
||||
modification_access: CSSModificationAccess) -> CSSStyleDeclaration {
|
||||
CSSStyleDeclaration {
|
||||
|
@ -70,7 +69,7 @@ impl CSSStyleDeclaration {
|
|||
}
|
||||
}
|
||||
|
||||
pub fn new(global: &Window, owner: &HTMLElement,
|
||||
pub fn new(global: &Window, owner: &Element,
|
||||
pseudo: Option<PseudoElement>,
|
||||
modification_access: CSSModificationAccess) -> Root<CSSStyleDeclaration> {
|
||||
reflect_dom_object(box CSSStyleDeclaration::new_inherited(owner, pseudo, modification_access),
|
||||
|
@ -84,7 +83,7 @@ trait PrivateCSSStyleDeclarationHelpers {
|
|||
fn get_important_declaration(&self, property: &Atom) -> Option<Ref<PropertyDeclaration>>;
|
||||
}
|
||||
|
||||
impl PrivateCSSStyleDeclarationHelpers for HTMLElement {
|
||||
impl PrivateCSSStyleDeclarationHelpers for Element {
|
||||
fn get_declaration(&self, property: &Atom) -> Option<Ref<PropertyDeclaration>> {
|
||||
let element = ElementCast::from_ref(self);
|
||||
element.get_inline_style_declaration(property)
|
||||
|
|
|
@ -136,7 +136,7 @@ impl<'a> HTMLElementMethods for &'a HTMLElement {
|
|||
fn Style(self) -> Root<CSSStyleDeclaration> {
|
||||
self.style_decl.or_init(|| {
|
||||
let global = window_from_node(self);
|
||||
CSSStyleDeclaration::new(global.r(), self, None, CSSModificationAccess::ReadWrite)
|
||||
CSSStyleDeclaration::new(global.r(), ElementCast::from_ref(self), None, CSSModificationAccess::ReadWrite)
|
||||
})
|
||||
}
|
||||
|
||||
|
@ -458,4 +458,3 @@ impl PartialEq for HTMLElementTypeId {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -95,9 +95,8 @@ partial interface Window {
|
|||
|
||||
// https://drafts.csswg.org/cssom/#extensions-to-the-window-interface
|
||||
partial interface Window {
|
||||
//CSSStyleDeclaration getComputedStyle(Element elt, optional DOMString? pseudoElt);
|
||||
[NewObject]
|
||||
CSSStyleDeclaration getComputedStyle(HTMLElement elt, optional DOMString pseudoElt);
|
||||
CSSStyleDeclaration getComputedStyle(Element elt, optional DOMString pseudoElt);
|
||||
};
|
||||
|
||||
// http://dev.w3.org/csswg/cssom-view/#extensions-to-the-window-interface
|
||||
|
|
|
@ -24,7 +24,6 @@ use dom::cssstyledeclaration::{CSSModificationAccess, CSSStyleDeclaration};
|
|||
use dom::document::{Document, DocumentHelpers};
|
||||
use dom::element::Element;
|
||||
use dom::eventtarget::{EventTarget, EventTargetHelpers, EventTargetTypeId};
|
||||
use dom::htmlelement::HTMLElement;
|
||||
use dom::location::Location;
|
||||
use dom::navigator::Navigator;
|
||||
use dom::node::{window_from_node, TrustedNodeAddress, NodeHelpers, from_untrusted_node_address};
|
||||
|
@ -576,7 +575,7 @@ impl<'a> WindowMethods for &'a Window {
|
|||
|
||||
// https://drafts.csswg.org/cssom/#dom-window-getcomputedstyle
|
||||
fn GetComputedStyle(self,
|
||||
element: &HTMLElement,
|
||||
element: &Element,
|
||||
pseudo: Option<DOMString>) -> Root<CSSStyleDeclaration> {
|
||||
// Steps 1-4.
|
||||
let pseudo = match pseudo.map(|s| s.to_ascii_lowercase()) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue