Switch some uses of Arc<AtomicRefCell<T>> over to ArcRefCell<T>

servo · Mar 17, 2020 · 1d9f669 · 1d9f669
1 parent 5b3f277
commit 1d9f669
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/components/layout_2020/dom_traversal.rs b/components/layout_2020/dom_traversal.rs
@@ -2,13 +2,14 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+use crate::cell::ArcRefCell;
 use crate::context::LayoutContext;
 use crate::element_data::{LayoutBox, LayoutDataForElement};
 use crate::geom::PhysicalSize;
 use crate::replaced::{CanvasInfo, CanvasSource, ReplacedContent};
 use crate::style_ext::{Display, DisplayGeneratingBox, DisplayInside, DisplayOutside};
 use crate::wrapper::GetRawData;
-use atomic_refcell::{AtomicRefCell, AtomicRefMut};
+use atomic_refcell::AtomicRefMut;
 use html5ever::LocalName;
 use net_traits::image::base::Image as NetImage;
 use script_layout_interface::wrapper_traits::{
@@ -317,12 +318,12 @@ where
 }
 
 pub struct BoxSlot<'dom> {
-    slot: Option<ServoArc<AtomicRefCell<Option<LayoutBox>>>>,
+    slot: Option<ArcRefCell<Option<LayoutBox>>>,
     marker: marker<&'dom ()>,
 }
 
 impl BoxSlot<'_> {
-    pub(crate) fn new(slot: ServoArc<AtomicRefCell<Option<LayoutBox>>>) -> Self {
+    pub(crate) fn new(slot: ArcRefCell<Option<LayoutBox>>) -> Self {
         *slot.borrow_mut() = None;
         let slot = Some(slot);
         Self { slot, marker }

diff --git a/components/layout_2020/element_data.rs b/components/layout_2020/element_data.rs
@@ -5,19 +5,17 @@
 use crate::cell::ArcRefCell;
 use crate::flow::inline::InlineLevelBox;
 use crate::flow::BlockLevelBox;
-use atomic_refcell::AtomicRefCell;
-use servo_arc::Arc;
 
 #[derive(Default)]
 pub struct LayoutDataForElement {
-    pub(super) self_box: Arc<AtomicRefCell<Option<LayoutBox>>>,
+    pub(super) self_box: ArcRefCell<Option<LayoutBox>>,
     pub(super) pseudo_elements: Option<Box<PseudoElementBoxes>>,
 }
 
 #[derive(Default)]
 pub(super) struct PseudoElementBoxes {
-    pub before: Arc<AtomicRefCell<Option<LayoutBox>>>,
-    pub after: Arc<AtomicRefCell<Option<LayoutBox>>>,
+    pub before: ArcRefCell<Option<LayoutBox>>,
+    pub after: ArcRefCell<Option<LayoutBox>>,
 }
 
 pub(super) enum LayoutBox {