servo: Merge #14712 - Implement CSSKeyframeRule.style (from KiChjang:css-keyframe-rule-style); r=Manishearth

Fixes #14636.

r? @Manishearth

Source-Repo: https://github.com/servo/servo
Source-Revision: cdf14730ff4c17afdfdcc0cefbd0683a4324ba8e

servo/components/script/dom/csskeyframerule.rs

@@ -2,11 +2,12 @@
  * 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/. */
 
-use dom::bindings::codegen::Bindings::CSSKeyframeRuleBinding;
-use dom::bindings::js::Root;
-use dom::bindings::reflector::reflect_dom_object;
+use dom::bindings::codegen::Bindings::CSSKeyframeRuleBinding::{self, CSSKeyframeRuleMethods};
+use dom::bindings::js::{JS, MutNullableJS, Root};
+use dom::bindings::reflector::{DomObject, reflect_dom_object};
 use dom::bindings::str::DOMString;
 use dom::cssrule::{CSSRule, SpecificCSSRule};
+use dom::cssstyledeclaration::{CSSModificationAccess, CSSStyleDeclaration, CSSStyleOwner};
 use dom::cssstylesheet::CSSStyleSheet;
 use dom::window::Window;
 use parking_lot::RwLock;
@@ -19,6 +20,7 @@ pub struct CSSKeyframeRule {
     cssrule: CSSRule,
     #[ignore_heap_size_of = "Arc"]
     keyframerule: Arc<RwLock<Keyframe>>,
+    style_decl: MutNullableJS<CSSStyleDeclaration>,
 }
 
 impl CSSKeyframeRule {
@@ -27,6 +29,7 @@ impl CSSKeyframeRule {
         CSSKeyframeRule {
             cssrule: CSSRule::new_inherited(parent_stylesheet),
             keyframerule: keyframerule,
+            style_decl: Default::default(),
         }
     }
 
@@ -39,6 +42,19 @@ impl CSSKeyframeRule {
     }
 }
 
+impl CSSKeyframeRuleMethods for CSSKeyframeRule {
+    // https://drafts.csswg.org/css-animations/#dom-csskeyframerule-style
+    fn Style(&self) -> Root<CSSStyleDeclaration> {
+        self.style_decl.or_init(|| {
+            CSSStyleDeclaration::new(self.global().as_window(),
+                                     CSSStyleOwner::CSSRule(JS::from_ref(self.global().as_window()),
+                                                                 self.keyframerule.read().block.clone()),
+                                     None,
+                                     CSSModificationAccess::ReadWrite)
+        })
+    }
+}
+
 impl SpecificCSSRule for CSSKeyframeRule {
     fn ty(&self) -> u16 {
         use dom::bindings::codegen::Bindings::CSSRuleBinding::CSSRuleConstants;

servo/components/script/dom/cssstyledeclaration.rs

@@ -34,9 +34,9 @@ pub struct CSSStyleDeclaration {
 #[must_root]
 pub enum CSSStyleOwner {
     Element(JS<Element>),
-    CSSStyleRule(JS<Window>,
-                 #[ignore_heap_size_of = "Arc"]
-                 Arc<RwLock<PropertyDeclarationBlock>>),
+    CSSRule(JS<Window>,
+            #[ignore_heap_size_of = "Arc"]
+            Arc<RwLock<PropertyDeclarationBlock>>),
 }
 
 impl CSSStyleOwner {
@@ -49,7 +49,7 @@ impl CSSStyleOwner {
                     None
                 }
             }
-            CSSStyleOwner::CSSStyleRule(_, ref pdb) => {
+            CSSStyleOwner::CSSRule(_, ref pdb) => {
                 Some(pdb.clone())
             }
         }
@@ -58,7 +58,7 @@ impl CSSStyleOwner {
     fn window(&self) -> Root<Window> {
         match *self {
             CSSStyleOwner::Element(ref el) => window_from_node(&**el),
-            CSSStyleOwner::CSSStyleRule(ref window, _) => Root::from_ref(&**window),
+            CSSStyleOwner::CSSRule(ref window, _) => Root::from_ref(&**window),
         }
     }
 
@@ -72,7 +72,7 @@ impl CSSStyleOwner {
         match *self {
             CSSStyleOwner::Element(ref el) =>
                 el.upcast::<Node>().dirty(NodeDamage::NodeStyleDamaged),
-            CSSStyleOwner::CSSStyleRule(ref window, _) =>
+            CSSStyleOwner::CSSRule(ref window, _) =>
                 window.Document().invalidate_stylesheets(),
         }
     }
@@ -126,8 +126,8 @@ impl CSSStyleDeclaration {
 
     fn get_computed_style(&self, property: PropertyId) -> DOMString {
         match self.owner {
-            CSSStyleOwner::CSSStyleRule(..) =>
-                panic!("get_computed_style called on CSSStyleDeclaration with a CSSStyleRule owner"),
+            CSSStyleOwner::CSSRule(..) =>
+                panic!("get_computed_style called on CSSStyleDeclaration with a CSSRule owner"),
             CSSStyleOwner::Element(ref el) => {
                 let node = el.upcast::<Node>();
                 if !node.is_in_doc() {

servo/components/script/dom/cssstylerule.rs

@@ -58,7 +58,7 @@ impl CSSStyleRuleMethods for CSSStyleRule {
     fn Style(&self) -> Root<CSSStyleDeclaration> {
         self.style_decl.or_init(|| {
             CSSStyleDeclaration::new(self.global().as_window(),
-                                     CSSStyleOwner::CSSStyleRule(JS::from_ref(self.global().as_window()),
+                                     CSSStyleOwner::CSSRule(JS::from_ref(self.global().as_window()),
                                                                  self.stylerule.read().block.clone()),
                                      None,
                                      CSSModificationAccess::ReadWrite)

servo/components/script/dom/webidls/CSSKeyframeRule.webidl

@@ -6,5 +6,5 @@
 [Exposed=Window]
 interface CSSKeyframeRule : CSSRule {
   //          attribute DOMString           keyText;
-  // readonly attribute CSSStyleDeclaration style;
+  readonly attribute CSSStyleDeclaration style;
 };