Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-10 07:55:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use std::cell::OnceCell and remove mitochondria dependency (#30207)

Browse source 
`OnceCell` is now part of the standard library and we'll be able to use
it once we upgrade rust. For now we can use the version that's shipped
behind a feature flag in rust. This removes a dependency on one crate.
This commit is contained in:
Martin Robinson 2023-08-25 16:09:55 +02:00 • committed by GitHub
parent 9c310b6d4e
commit 585a25a212
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 11 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/layout_2020/display_list/mod.rs
View file

@ -13,10 +13,10 @@ use embedder_traits::Cursor;
use euclid::{Point2D, SideOffsets2D, Size2D};
use fnv::FnvHashMap;
use gfx::text::glyph::GlyphStore;
use mitochondria::OnceCell;
use msg::constellation_msg::BrowsingContextId;
use net_traits::image_cache::UsePlaceholder;
use script_traits::compositor::{CompositorDisplayListInfo, ScrollTreeNodeId};
use std::cell::OnceCell;
use std::sync::Arc;
use style::computed_values::text_decoration_style::T as ComputedTextDecorationStyle;
use style::dom::OpaqueNode;
@ -440,7 +440,7 @@ impl<'a> BuilderForBoxFragment<'a> {
}
fn content_rect(&self) -> &units::LayoutRect {
self.content_rect.init_once(|| {
self.content_rect.get_or_init(|| {
self.fragment
.content_rect
.to_physical(self.fragment.style.writing_mode, self.containing_block)
@ -450,7 +450,7 @@ impl<'a> BuilderForBoxFragment<'a> {
}
fn padding_rect(&self) -> &units::LayoutRect {
self.padding_rect.init_once(|| {
self.padding_rect.get_or_init(|| {
self.fragment
.padding_rect()
.to_physical(self.fragment.style.writing_mode, self.containing_block)
@ -462,11 +462,11 @@ impl<'a> BuilderForBoxFragment<'a> {
fn border_edge_clip(&self, builder: &mut DisplayListBuilder) -> Option<wr::ClipId> {
*self
.border_edge_clip_id
.init_once(|| clip_for_radii(self.border_radius, self.border_rect, builder))
.get_or_init(|| clip_for_radii(self.border_radius, self.border_rect, builder))
}
fn padding_edge_clip(&self, builder: &mut DisplayListBuilder) -> Option<wr::ClipId> {
*self.padding_edge_clip_id.init_once(|| {
*self.padding_edge_clip_id.get_or_init(|| {
clip_for_radii(
inner_radii(
self.border_radius,
@ -482,7 +482,7 @@ impl<'a> BuilderForBoxFragment<'a> {
}
fn content_edge_clip(&self, builder: &mut DisplayListBuilder) -> Option<wr::ClipId> {
*self.content_edge_clip_id.init_once(|| {
*self.content_edge_clip_id.get_or_init(|| {
clip_for_radii(
inner_radii(
self.border_radius,