Bug 1356141 - Use mutate_data() instead of get_data().map() with borrow_mut(). r?heycam draft
authorHiroyuki Ikezoe <hikezoe@mozilla.com>
Mon, 19 Jun 2017 13:39:24 +0900
changeset 596331 04ff8901163b58ffcb498c2e2714c54c466c8287
parent 596330 db39e769326ceb042f31ad3a8e13bcc7f40e8b0d
child 596332 6ef2e46d5eeed0e3c2c1f98565ea2cc76d951345
push id64580
push userhikezoe@mozilla.com
push dateMon, 19 Jun 2017 04:40:50 +0000
reviewersheycam
bugs1356141
milestone56.0a1
Bug 1356141 - Use mutate_data() instead of get_data().map() with borrow_mut(). r?heycam MozReview-Commit-ID: 8DvXFKu6HFX
servo/components/style/invalidation/element/invalidator.rs
--- a/servo/components/style/invalidation/element/invalidator.rs
+++ b/servo/components/style/invalidation/element/invalidator.rs
@@ -234,17 +234,17 @@ impl<'a, 'b: 'a, E> TreeStyleInvalidator
         if sibling_invalidations.is_empty() {
             return false;
         }
 
         let mut current = self.element.next_sibling_element();
         let mut any_invalidated = false;
 
         while let Some(sibling) = current {
-            let mut sibling_data = sibling.get_data().map(|d| d.borrow_mut());
+            let mut sibling_data = sibling.mutate_data();
             let sibling_data = sibling_data.as_mut().map(|d| &mut **d);
 
             let mut sibling_invalidator = TreeStyleInvalidator::new(
                 sibling,
                 sibling_data,
                 self.shared_context
             );
 
@@ -297,17 +297,17 @@ impl<'a, 'b: 'a, E> TreeStyleInvalidator
 
         let mut any_children = false;
         for child in self.element.as_node().traversal_children() {
             let child = match child.as_element() {
                 Some(e) => e,
                 None => continue,
             };
 
-            let mut child_data = child.get_data().map(|d| d.borrow_mut());
+            let mut child_data = child.mutate_data();
             let child_data = child_data.as_mut().map(|d| &mut **d);
 
             let mut child_invalidator = TreeStyleInvalidator::new(
                 child,
                 child_data,
                 self.shared_context
             );