diff options
author | Josh Matthews <josh@joshmatthews.net> | 2014-12-18 11:56:42 -0500 |
---|---|---|
committer | Josh Matthews <josh@joshmatthews.net> | 2014-12-18 12:54:03 -0500 |
commit | c8557c44a9c9f85c6a9a1936147853cd48709260 (patch) | |
tree | 90683dca9a385acdcf8605314fc9ad2a8484e9e2 /components/script/dom/htmlelement.rs | |
parent | b4cade0612eadd4f62a7442222b459b02f47acbe (diff) | |
download | servo-c8557c44a9c9f85c6a9a1936147853cd48709260.tar.gz servo-c8557c44a9c9f85c6a9a1936147853cd48709260.zip |
Merge CSS2Properties and CSSStyleDeclaration.
Diffstat (limited to 'components/script/dom/htmlelement.rs')
-rw-r--r-- | components/script/dom/htmlelement.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/components/script/dom/htmlelement.rs b/components/script/dom/htmlelement.rs index 48acd297574..8fb0f2c4be5 100644 --- a/components/script/dom/htmlelement.rs +++ b/components/script/dom/htmlelement.rs @@ -10,12 +10,11 @@ use dom::bindings::codegen::Bindings::HTMLElementBinding::HTMLElementMethods; use dom::bindings::codegen::Bindings::HTMLInputElementBinding::HTMLInputElementMethods; use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods; use dom::bindings::codegen::InheritTypes::{ElementCast, HTMLFrameSetElementDerived}; -use dom::bindings::codegen::InheritTypes::{EventTargetCast, HTMLInputElementCast, CSSStyleDeclarationCast}; +use dom::bindings::codegen::InheritTypes::{EventTargetCast, HTMLInputElementCast}; use dom::bindings::codegen::InheritTypes::{HTMLElementDerived, HTMLBodyElementDerived}; use dom::bindings::js::{JSRef, Temporary, MutNullableJS}; use dom::bindings::utils::{Reflectable, Reflector}; use dom::cssstyledeclaration::CSSStyleDeclaration; -use dom::css2properties::CSS2Properties; use dom::document::Document; use dom::element::{Element, ElementTypeId, ActivationElementHelpers}; use dom::eventtarget::{EventTarget, EventTargetHelpers, EventTargetTypeId}; @@ -74,8 +73,7 @@ impl<'a> HTMLElementMethods for JSRef<'a, HTMLElement> { fn Style(self) -> Temporary<CSSStyleDeclaration> { self.style_decl.or_init(|| { let global = window_from_node(self).root(); - let style_props = CSS2Properties::new(*global, self); - CSSStyleDeclarationCast::from_temporary(style_props) + CSSStyleDeclaration::new(*global, self) }) } |