-
-
Notifications
You must be signed in to change notification settings - Fork 2.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of #25957 - pcwalton:layout-2020-atomic-refcell, r=<try>
Start using `AtomicRefCell` in layout 2020 as preparation for incremental layout This makes `BlockLevelBox` and `InlineLevelBox` use `AtomicRefCell` for incremental layout, per @nox's suggestion in #25168. As part of this, it reworks inline layout to use recursion, per #25950. LLVM should be able to optimize this into a loop (though I have not verified this). r? @nox
- Loading branch information
Showing
12 changed files
with
316 additions
and
176 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
/* This Source Code Form is subject to the terms of the Mozilla Public | ||
* 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 atomic_refcell::AtomicRefCell; | ||
use serde::{Serialize, Serializer}; | ||
use servo_arc::Arc; | ||
use std::fmt; | ||
use std::ops::Deref; | ||
|
||
pub(crate) struct ArcRefCell<T> { | ||
value: Arc<AtomicRefCell<T>>, | ||
} | ||
|
||
impl<T> ArcRefCell<T> { | ||
pub fn new(value: T) -> Self { | ||
Self { | ||
value: Arc::new(AtomicRefCell::new(value)), | ||
} | ||
} | ||
} | ||
|
||
impl<T> Clone for ArcRefCell<T> { | ||
fn clone(&self) -> Self { | ||
Self { | ||
value: self.value.clone(), | ||
} | ||
} | ||
} | ||
|
||
impl<T> Default for ArcRefCell<T> | ||
where | ||
T: Default, | ||
{ | ||
fn default() -> Self { | ||
Self { | ||
value: Arc::new(AtomicRefCell::new(Default::default())), | ||
} | ||
} | ||
} | ||
|
||
impl<T> Deref for ArcRefCell<T> { | ||
type Target = AtomicRefCell<T>; | ||
|
||
fn deref(&self) -> &Self::Target { | ||
&self.value | ||
} | ||
} | ||
|
||
impl<T> fmt::Debug for ArcRefCell<T> | ||
where | ||
T: fmt::Debug, | ||
{ | ||
fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result { | ||
self.value.fmt(formatter) | ||
} | ||
} | ||
|
||
impl<T> Serialize for ArcRefCell<T> | ||
where | ||
T: Serialize, | ||
{ | ||
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> | ||
where | ||
S: Serializer, | ||
{ | ||
self.borrow().serialize(serializer) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.