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

style: Remove servo/components/{hashglobe,fallible} in favor of try_reserve

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D134194
This commit is contained in:
Emilio Cobos Álvarez 2023-06-06 18:07:21 +02:00 • committed by Oriol Brufau
parent 07d1bd560b
commit 2b6fce1e57
33 changed files with 157 additions and 7113 deletions
Download patch file Download diff file Expand all files Collapse all files

26
components/fallible/Cargo.toml
View file

@ -1,26 +0,0 @@
[package]
name = "fallible"
version = "0.0.1"
authors = ["The Servo Project Developers"]
license = "MPL-2.0"
edition = "2018"
publish = false
[lib]
name = "fallible"
path = "lib.rs"
[dependencies]
hashglobe = { path = "../hashglobe" }
smallvec = { workspace = true }
# This crate effectively does nothing except if the `known_system_malloc`
# feature is specified.
#
# In that case, we actually call the system malloc functions to reserve space,
# otherwise we just let Rust do its thing (aborting on OOM).
#
# This is effectively a stop-gap measure until we can do this properly in
# stable Rust.
[features]
known_system_malloc = []

160
components/fallible/lib.rs
View file

@ -1,160 +0,0 @@
/* 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/. */
#[cfg(feature = "known_system_malloc")]
use hashglobe::alloc;
use hashglobe::FailedAllocationError;
use smallvec::Array;
use smallvec::SmallVec;
use std::vec::Vec;
pub trait FallibleVec<T> {
/// Append |val| to the end of |vec|. Returns Ok(()) on success,
/// Err(reason) if it fails, with |reason| describing the failure.
fn try_push(&mut self, value: T) -> Result<(), FailedAllocationError>;
}
/////////////////////////////////////////////////////////////////
// Vec
impl<T> FallibleVec<T> for Vec<T> {
#[inline(always)]
fn try_push(&mut self, val: T) -> Result<(), FailedAllocationError> {
#[cfg(feature = "known_system_malloc")]
{
if self.capacity() == self.len() {
try_double_vec(self)?;
debug_assert!(self.capacity() > self.len());
}
}
self.push(val);
Ok(())
}
}
// Double the capacity of |vec|, or fail to do so due to lack of memory.
// Returns Ok(()) on success, Err(..) on failure.
#[cfg(feature = "known_system_malloc")]
#[inline(never)]
#[cold]
fn try_double_vec<T>(vec: &mut Vec<T>) -> Result<(), FailedAllocationError> {
use std::mem;
let old_ptr = vec.as_mut_ptr();
let old_len = vec.len();
let old_cap: usize = vec.capacity();
let new_cap: usize = if old_cap == 0 {
4
} else {
old_cap
.checked_mul(2)
.ok_or(FailedAllocationError::new("capacity overflow for Vec"))?
};
let new_size_bytes = new_cap
.checked_mul(mem::size_of::<T>())
.ok_or(FailedAllocationError::new("capacity overflow for Vec"))?;
let new_ptr = unsafe {
if old_cap == 0 {
alloc::alloc(new_size_bytes, 0)
} else {
alloc::realloc(old_ptr as *mut u8, new_size_bytes)
}
};
if new_ptr.is_null() {
return Err(FailedAllocationError::new(
"out of memory when allocating Vec",
));
}
let new_vec = unsafe { Vec::from_raw_parts(new_ptr as *mut T, old_len, new_cap) };
mem::forget(mem::replace(vec, new_vec));
Ok(())
}
/////////////////////////////////////////////////////////////////
// SmallVec
impl<T: Array> FallibleVec<T::Item> for SmallVec<T> {
#[inline(always)]
fn try_push(&mut self, val: T::Item) -> Result<(), FailedAllocationError> {
#[cfg(feature = "known_system_malloc")]
{
if self.capacity() == self.len() {
try_double_small_vec(self)?;
debug_assert!(self.capacity() > self.len());
}
}
self.push(val);
Ok(())
}
}
// Double the capacity of |svec|, or fail to do so due to lack of memory.
// Returns Ok(()) on success, Err(..) on failure.
#[cfg(feature = "known_system_malloc")]
#[inline(never)]
#[cold]
fn try_double_small_vec<T>(svec: &mut SmallVec<T>) -> Result<(), FailedAllocationError>
where
T: Array,
{
use std::mem;
use std::ptr::copy_nonoverlapping;
let old_ptr = svec.as_mut_ptr();
let old_len = svec.len();
let old_cap: usize = svec.capacity();
let new_cap: usize = if old_cap == 0 {
4
} else {
old_cap
.checked_mul(2)
.ok_or(FailedAllocationError::new("capacity overflow for SmallVec"))?
};
// This surely shouldn't fail, if |old_cap| was previously accepted as a
// valid value. But err on the side of caution.
let old_size_bytes = old_cap
.checked_mul(mem::size_of::<T>())
.ok_or(FailedAllocationError::new("capacity overflow for SmallVec"))?;
let new_size_bytes = new_cap
.checked_mul(mem::size_of::<T>())
.ok_or(FailedAllocationError::new("capacity overflow for SmallVec"))?;
let new_ptr;
if svec.spilled() {
// There's an old block to free, and, presumably, old contents to
// copy. realloc takes care of both aspects.
unsafe {
new_ptr = alloc::realloc(old_ptr as *mut u8, new_size_bytes);
}
} else {
// There's no old block to free. There may be old contents to copy.
unsafe {
new_ptr = alloc::alloc(new_size_bytes, 0);
if !new_ptr.is_null() && old_size_bytes > 0 {
copy_nonoverlapping(old_ptr as *const u8, new_ptr as *mut u8, old_size_bytes);
}
}
}
if new_ptr.is_null() {
return Err(FailedAllocationError::new(
"out of memory when allocating SmallVec",
));
}
let new_vec = unsafe { Vec::from_raw_parts(new_ptr as *mut T::Item, old_len, new_cap) };
let new_svec = SmallVec::from_vec(new_vec);
mem::forget(mem::replace(svec, new_svec));
Ok(())
}

16
components/hashglobe/Cargo.toml
View file

@ -1,16 +0,0 @@
[package]
name = "hashglobe"
version = "0.1.0"
authors = ["The Rust Project Developers", "Manish Goregaokar <manishsmail@gmail.com>"]
license = "MIT OR Apache-2.0"
description = "Fork of std::HashMap with stable fallible allocation."
documentation = "https://docs.rs/hashglobe"
repository = "https://github.com/Manishearth/hashglobe"
readme = "README.md"
edition = "2018"
[dependencies]
libc = { workspace = true }
[dev-dependencies]
rand = { workspace = true }

201
components/hashglobe/LICENSE-APACHE
View file

@ -1,201 +0,0 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

23
components/hashglobe/LICENSE-MIT
View file

@ -1,23 +0,0 @@
Permission is hereby granted, free of charge, to any
person obtaining a copy of this software and associated
documentation files (the "Software"), to deal in the
Software without restriction, including without
limitation the rights to use, copy, modify, merge,
publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software
is furnished to do so, subject to the following
conditions:
The above copyright notice and this permission notice
shall be included in all copies or substantial portions
of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.

17
components/hashglobe/README.md
View file

@ -1,17 +0,0 @@
hashglobe
========
This is a fork of Rust's `std::HashMap`. It works on stable out of the stdlib and has fallible APIs.
We intend to diverge as little as possible from the original hashmap.
Dual licensed Apache/MIT, the same as the stdlib.
## Should I use this?
No.
Wait for https://github.com/rust-lang/rfcs/pull/2116 instead.

160
components/hashglobe/src/alloc.rs
View file

@ -1,160 +0,0 @@
// FORK NOTE: Copied from liballoc_system, removed unnecessary APIs,
// APIs take size/align directly instead of Layout
// The minimum alignment guaranteed by the architecture. This value is used to
// add fast paths for low alignment values. In practice, the alignment is a
// constant at the call site and the branch will be optimized out.
#[cfg(all(any(
target_arch = "x86",
target_arch = "arm",
target_arch = "mips",
target_arch = "powerpc",
target_arch = "powerpc64",
target_arch = "asmjs",
target_arch = "wasm32"
)))]
const MIN_ALIGN: usize = 8;
#[cfg(all(any(
target_arch = "x86_64",
target_arch = "aarch64",
target_arch = "mips64",
target_arch = "s390x",
target_arch = "sparc64"
)))]
const MIN_ALIGN: usize = 16;
pub use self::platform::{alloc, dealloc, realloc};
#[cfg(any(unix, target_os = "redox"))]
mod platform {
use libc;
#[cfg(not(any(target_os = "android")))]
use std::ptr;
use super::MIN_ALIGN;
#[inline]
pub unsafe fn alloc(size: usize, align: usize) -> *mut u8 {
if align <= MIN_ALIGN {
libc::malloc(size) as *mut u8
} else {
aligned_malloc(size, align)
}
}
#[inline]
pub unsafe fn dealloc(ptr: *mut u8, _align: usize) {
libc::free(ptr as *mut libc::c_void)
}
#[inline]
pub unsafe fn realloc(ptr: *mut u8, new_size: usize) -> *mut u8 {
libc::realloc(ptr as *mut libc::c_void, new_size) as *mut u8
}
#[cfg(any(target_os = "android", target_os = "redox"))]
#[inline]
unsafe fn aligned_malloc(size: usize, align: usize) -> *mut u8 {
// On android we currently target API level 9 which unfortunately
// doesn't have the `posix_memalign` API used below. Instead we use
// `memalign`, but this unfortunately has the property on some systems
// where the memory returned cannot be deallocated by `free`!
//
// Upon closer inspection, however, this appears to work just fine with
// Android, so for this platform we should be fine to call `memalign`
// (which is present in API level 9). Some helpful references could
// possibly be chromium using memalign [1], attempts at documenting that
// memalign + free is ok [2] [3], or the current source of chromium
// which still uses memalign on android [4].
//
// [1]: https://codereview.chromium.org/10796020/
// [2]: https://code.google.com/p/android/issues/detail?id=35391
// [3]: https://bugs.chromium.org/p/chromium/issues/detail?id=138579
// [4]: https://chromium.googlesource.com/chromium/src/base/+/master/
// /memory/aligned_memory.cc
libc::memalign(align, size) as *mut u8
}
#[cfg(not(any(target_os = "android", target_os = "redox")))]
#[inline]
unsafe fn aligned_malloc(size: usize, align: usize) -> *mut u8 {
let mut out = ptr::null_mut();
let ret = libc::posix_memalign(&mut out, align, size);
if ret != 0 {
ptr::null_mut()
} else {
out as *mut u8
}
}
}
#[cfg(windows)]
#[allow(bad_style)]
mod platform {
use super::MIN_ALIGN;
type LPVOID = *mut u8;
type HANDLE = LPVOID;
type SIZE_T = usize;
type DWORD = u32;
type BOOL = i32;
extern "system" {
fn GetProcessHeap() -> HANDLE;
fn HeapAlloc(hHeap: HANDLE, dwFlags: DWORD, dwBytes: SIZE_T) -> LPVOID;
fn HeapReAlloc(hHeap: HANDLE, dwFlags: DWORD, lpMem: LPVOID, dwBytes: SIZE_T) -> LPVOID;
fn HeapFree(hHeap: HANDLE, dwFlags: DWORD, lpMem: LPVOID) -> BOOL;
fn GetLastError() -> DWORD;
}
#[repr(C)]
struct Header(*mut u8);
unsafe fn get_header<'a>(ptr: *mut u8) -> &'a mut Header {
&mut *(ptr as *mut Header).offset(-1)
}
unsafe fn align_ptr(ptr: *mut u8, align: usize) -> *mut u8 {
let aligned = ptr.offset((align - (ptr as usize & (align - 1))) as isize);
*get_header(aligned) = Header(ptr);
aligned
}
#[inline]
unsafe fn allocate_with_flags(size: usize, align: usize, flags: DWORD) -> *mut u8 {
if align <= MIN_ALIGN {
HeapAlloc(GetProcessHeap(), flags, size)
} else {
let size = size + align;
let ptr = HeapAlloc(GetProcessHeap(), flags, size);
if ptr.is_null() {
ptr
} else {
align_ptr(ptr, align)
}
}
}
#[inline]
pub unsafe fn alloc(size: usize, align: usize) -> *mut u8 {
allocate_with_flags(size, align, 0)
}
#[inline]
pub unsafe fn dealloc(ptr: *mut u8, align: usize) {
if align <= MIN_ALIGN {
let err = HeapFree(GetProcessHeap(), 0, ptr as LPVOID);
debug_assert!(err != 0, "Failed to free heap memory: {}", GetLastError());
} else {
let header = get_header(ptr);
let err = HeapFree(GetProcessHeap(), 0, header.0 as LPVOID);
debug_assert!(err != 0, "Failed to free heap memory: {}", GetLastError());
}
}
#[inline]
pub unsafe fn realloc(ptr: *mut u8, new_size: usize) -> *mut u8 {
HeapReAlloc(GetProcessHeap(), 0, ptr as LPVOID, new_size) as *mut u8
}
}

269
components/hashglobe/src/fake.rs
View file

@ -1,269 +0,0 @@
// Copyright 2014-2015 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
//! This module contains shims around the stdlib HashMap
//! that add fallible methods
//!
//! These methods are a lie. They are not actually fallible. This is just to make
//! it smooth to switch between hashmap impls in a codebase.
use std::collections::HashMap as StdMap;
use std::collections::HashSet as StdSet;
use std::fmt;
use std::hash::{BuildHasher, Hash};
use std::ops::{Deref, DerefMut};
pub use std::collections::hash_map::{Entry, Iter as MapIter, IterMut as MapIterMut, RandomState};
pub use std::collections::hash_set::{IntoIter as SetIntoIter, Iter as SetIter};
#[derive(Clone)]
pub struct HashMap<K, V, S = RandomState>(StdMap<K, V, S>);
use crate::FailedAllocationError;
impl<K, V, S> Deref for HashMap<K, V, S> {
type Target = StdMap<K, V, S>;
fn deref(&self) -> &Self::Target {
&self.0
}
}
impl<K, V, S> DerefMut for HashMap<K, V, S> {
fn deref_mut(&mut self) -> &mut Self::Target {
&mut self.0
}
}
impl<K, V, S> HashMap<K, V, S>
where
K: Eq + Hash,
S: BuildHasher,
{
#[inline]
pub fn try_with_hasher(hash_builder: S) -> Result<HashMap<K, V, S>, FailedAllocationError> {
Ok(HashMap(StdMap::with_hasher(hash_builder)))
}
#[inline]
pub fn try_with_capacity_and_hasher(
capacity: usize,
hash_builder: S,
) -> Result<HashMap<K, V, S>, FailedAllocationError> {
Ok(HashMap(StdMap::with_capacity_and_hasher(
capacity,
hash_builder,
)))
}
pub fn with_capacity_and_hasher(capacity: usize, hash_builder: S) -> HashMap<K, V, S> {
HashMap(StdMap::with_capacity_and_hasher(capacity, hash_builder))
}
#[inline]
pub fn try_reserve(&mut self, additional: usize) -> Result<(), FailedAllocationError> {
Ok(self.reserve(additional))
}
pub fn try_shrink_to_fit(&mut self) -> Result<(), FailedAllocationError> {
Ok(self.shrink_to_fit())
}
pub fn try_entry(&mut self, key: K) -> Result<Entry<'_, K, V>, FailedAllocationError> {
Ok(self.entry(key))
}
#[inline]
pub fn try_insert(&mut self, k: K, v: V) -> Result<Option<V>, FailedAllocationError> {
Ok(self.insert(k, v))
}
}
#[derive(Clone)]
pub struct HashSet<T, S = RandomState>(StdSet<T, S>);
impl<T, S> Deref for HashSet<T, S> {
type Target = StdSet<T, S>;
fn deref(&self) -> &Self::Target {
&self.0
}
}
impl<T, S> DerefMut for HashSet<T, S> {
fn deref_mut(&mut self) -> &mut Self::Target {
&mut self.0
}
}
impl<T: Hash + Eq> HashSet<T, RandomState> {
#[inline]
pub fn new() -> HashSet<T, RandomState> {
HashSet(StdSet::new())
}
#[inline]
pub fn with_capacity(capacity: usize) -> HashSet<T, RandomState> {
HashSet(StdSet::with_capacity(capacity))
}
}
impl<T, S> HashSet<T, S>
where
T: Eq + Hash,
S: BuildHasher,
{
#[inline]
pub fn with_hasher(hasher: S) -> HashSet<T, S> {
HashSet(StdSet::with_hasher(hasher))
}
#[inline]
pub fn with_capacity_and_hasher(capacity: usize, hasher: S) -> HashSet<T, S> {
HashSet(StdSet::with_capacity_and_hasher(capacity, hasher))
}
#[inline]
pub fn try_reserve(&mut self, additional: usize) -> Result<(), FailedAllocationError> {
Ok(self.reserve(additional))
}
#[inline]
pub fn try_shrink_to_fit(&mut self) -> Result<(), FailedAllocationError> {
Ok(self.shrink_to_fit())
}
#[inline]
pub fn try_insert(&mut self, value: T) -> Result<bool, FailedAllocationError> {
Ok(self.insert(value))
}
}
// Pass through trait impls
// We can't derive these since the bounds are not obvious to the derive macro
impl<K: Hash + Eq, V, S: BuildHasher + Default> Default for HashMap<K, V, S> {
fn default() -> Self {
HashMap(Default::default())
}
}
impl<K, V, S> fmt::Debug for HashMap<K, V, S>
where
K: Eq + Hash + fmt::Debug,
V: fmt::Debug,
S: BuildHasher,
{
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
self.0.fmt(f)
}
}
impl<K, V, S> PartialEq for HashMap<K, V, S>
where
K: Eq + Hash,
V: PartialEq,
S: BuildHasher,
{
fn eq(&self, other: &HashMap<K, V, S>) -> bool {
self.0.eq(&other.0)
}
}
impl<K, V, S> Eq for HashMap<K, V, S>
where
K: Eq + Hash,
V: Eq,
S: BuildHasher,
{
}
impl<'a, K, V, S> IntoIterator for &'a HashMap<K, V, S>
where
K: Eq + Hash,
S: BuildHasher,
{
type Item = (&'a K, &'a V);
type IntoIter = MapIter<'a, K, V>;
fn into_iter(self) -> MapIter<'a, K, V> {
self.0.iter()
}
}
impl<'a, K, V, S> IntoIterator for &'a mut HashMap<K, V, S>
where
K: Eq + Hash,
S: BuildHasher,
{
type Item = (&'a K, &'a mut V);
type IntoIter = MapIterMut<'a, K, V>;
fn into_iter(self) -> MapIterMut<'a, K, V> {
self.0.iter_mut()
}
}
impl<T: Eq + Hash, S: BuildHasher + Default> Default for HashSet<T, S> {
fn default() -> Self {
HashSet(Default::default())
}
}
impl<T, S> fmt::Debug for HashSet<T, S>
where
T: Eq + Hash + fmt::Debug,
S: BuildHasher,
{
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
self.0.fmt(f)
}
}
impl<T, S> PartialEq for HashSet<T, S>
where
T: Eq + Hash,
S: BuildHasher,
{
fn eq(&self, other: &HashSet<T, S>) -> bool {
self.0.eq(&other.0)
}
}
impl<T, S> Eq for HashSet<T, S>
where
T: Eq + Hash,
S: BuildHasher,
{
}
impl<'a, T, S> IntoIterator for &'a HashSet<T, S>
where
T: Eq + Hash,
S: BuildHasher,
{
type Item = &'a T;
type IntoIter = SetIter<'a, T>;
fn into_iter(self) -> SetIter<'a, T> {
self.0.iter()
}
}
impl<T, S> IntoIterator for HashSet<T, S>
where
T: Eq + Hash,
S: BuildHasher,
{
type Item = T;
type IntoIter = SetIntoIter<T>;
fn into_iter(self) -> SetIntoIter<T> {
self.0.into_iter()
}
}

3087
components/hashglobe/src/hash_map.rs
View file

File diff suppressed because it is too large Load diff

1648
components/hashglobe/src/hash_set.rs
View file

File diff suppressed because it is too large Load diff

71
components/hashglobe/src/lib.rs
View file

@ -1,71 +0,0 @@
// Copyright 2014-2015 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
pub mod alloc;
pub mod hash_map;
pub mod hash_set;
mod shim;
mod table;
pub mod fake;
use std::{error, fmt};
trait Recover<Q: ?Sized> {
type Key;
fn get(&self, key: &Q) -> Option<&Self::Key>;
fn take(&mut self, key: &Q) -> Option<Self::Key>;
fn replace(&mut self, key: Self::Key) -> Option<Self::Key>;
}
#[derive(Debug)]
pub struct AllocationInfo {
/// The size we are requesting.
size: usize,
/// The alignment we are requesting.
alignment: usize,
}
#[derive(Debug)]
pub struct FailedAllocationError {
reason: &'static str,
/// The allocation info we are requesting, if needed.
allocation_info: Option<AllocationInfo>,
}
impl FailedAllocationError {
#[inline]
pub fn new(reason: &'static str) -> Self {
Self {
reason,
allocation_info: None,
}
}
}
impl error::Error for FailedAllocationError {
fn description(&self) -> &str {
self.reason
}
}
impl fmt::Display for FailedAllocationError {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self.allocation_info {
Some(ref info) => write!(
f,
"{}, allocation: (size: {}, alignment: {})",
self.reason, info.size, info.alignment
),
None => self.reason.fmt(f),
}
}
}

62
components/hashglobe/src/shim.rs
View file

@ -1,62 +0,0 @@
use std::marker::PhantomData;
// FIXME: remove this and use std::ptr::NonNull when Firefox requires Rust 1.25+
pub struct NonZeroPtr<T: 'static>(&'static T);
impl<T: 'static> NonZeroPtr<T> {
pub unsafe fn new_unchecked(ptr: *mut T) -> Self {
NonZeroPtr(&*ptr)
}
pub fn as_ptr(&self) -> *mut T {
self.0 as *const T as *mut T
}
}
pub struct Unique<T: 'static> {
ptr: NonZeroPtr<T>,
_marker: PhantomData<T>,
}
impl<T: 'static> Unique<T> {
pub unsafe fn new_unchecked(ptr: *mut T) -> Self {
Unique {
ptr: NonZeroPtr::new_unchecked(ptr),
_marker: PhantomData,
}
}
pub fn as_ptr(&self) -> *mut T {
self.ptr.as_ptr()
}
}
unsafe impl<T: Send + 'static> Send for Unique<T> {}
unsafe impl<T: Sync + 'static> Sync for Unique<T> {}
pub struct Shared<T: 'static> {
ptr: NonZeroPtr<T>,
_marker: PhantomData<T>,
// force it to be !Send/!Sync
_marker2: PhantomData<*const u8>,
}
impl<T: 'static> Shared<T> {
pub unsafe fn new_unchecked(ptr: *mut T) -> Self {
Shared {
ptr: NonZeroPtr::new_unchecked(ptr),
_marker: PhantomData,
_marker2: PhantomData,
}
}
#[allow(clippy::mut_from_ref)]
pub unsafe fn as_mut(&self) -> &mut T {
&mut *self.ptr.as_ptr()
}
}
impl<'a, T> From<&'a mut T> for Shared<T> {
fn from(reference: &'a mut T) -> Self {
unsafe { Shared::new_unchecked(reference) }
}
}

1231
components/hashglobe/src/table.rs
View file

File diff suppressed because it is too large Load diff

1
components/malloc_size_of/Cargo.toml
View file

@ -34,7 +34,6 @@ content-security-policy = { workspace = true, optional = true }
crossbeam-channel = { workspace = true, optional = true } crossbeam-channel = { workspace = true, optional = true }
cssparser = { workspace = true } cssparser = { workspace = true }
euclid = { workspace = true } euclid = { workspace = true }
hashglobe = { path = "../hashglobe" }
http = { workspace = true, optional = true } http = { workspace = true, optional = true }
hyper_serde = { workspace = true, optional = true } hyper_serde = { workspace = true, optional = true }
keyboard-types = { workspace = true, optional = true } keyboard-types = { workspace = true, optional = true }

4
components/malloc_size_of/lib.rs
View file

@ -448,8 +448,6 @@ macro_rules! malloc_size_of_hash_set {
} }
malloc_size_of_hash_set!(std::collections::HashSet<T, S>); malloc_size_of_hash_set!(std::collections::HashSet<T, S>);
malloc_size_of_hash_set!(hashglobe::hash_set::HashSet<T, S>);
malloc_size_of_hash_set!(hashglobe::fake::HashSet<T, S>);
macro_rules! malloc_size_of_hash_map { macro_rules! malloc_size_of_hash_map {
($ty:ty) => { ($ty:ty) => {
@ -489,8 +487,6 @@ macro_rules! malloc_size_of_hash_map {
} }
malloc_size_of_hash_map!(std::collections::HashMap<K, V, S>); malloc_size_of_hash_map!(std::collections::HashMap<K, V, S>);
malloc_size_of_hash_map!(hashglobe::hash_map::HashMap<K, V, S>);
malloc_size_of_hash_map!(hashglobe::fake::HashMap<K, V, S>);
impl<K, V> MallocShallowSizeOf for std::collections::BTreeMap<K, V> impl<K, V> MallocShallowSizeOf for std::collections::BTreeMap<K, V>
where where

4
components/style/Cargo.toml
View file

@ -17,7 +17,7 @@ path = "lib.rs"
doctest = false doctest = false
[features] [features]
gecko = ["style_traits/gecko", "fallible/known_system_malloc", "bindgen", "regex", "toml", gecko = ["style_traits/gecko", "bindgen", "regex", "toml",
"num_cpus", "thin-slice"] "num_cpus", "thin-slice"]
servo = ["serde", "style_traits/servo", "servo_atoms", "servo_config", "html5ever", servo = ["serde", "style_traits/servo", "servo_atoms", "servo_config", "html5ever",
"cssparser/serde", "encoding_rs", "malloc_size_of/servo", "servo_url", "cssparser/serde", "encoding_rs", "malloc_size_of/servo", "servo_url",
@ -38,9 +38,7 @@ cssparser = "0.29"
derive_more = "0.99" derive_more = "0.99"
encoding_rs = { version = "0.8", optional = true } encoding_rs = { version = "0.8", optional = true }
euclid = "0.22" euclid = "0.22"
fallible = { path = "../fallible" }
fxhash = "0.2" fxhash = "0.2"
hashglobe = { path = "../hashglobe" }
html5ever = { version = "0.26", optional = true } html5ever = { version = "0.26", optional = true }
indexmap = "1.0" indexmap = "1.0"
itertools = "0.8" itertools = "0.8"

2
components/style/custom_properties.rs
View file

@ -7,7 +7,6 @@
//! [custom]: https://drafts.csswg.org/css-variables/ //! [custom]: https://drafts.csswg.org/css-variables/
use crate::applicable_declarations::CascadePriority; use crate::applicable_declarations::CascadePriority;
use crate::hash::map::Entry;
use crate::media_queries::Device; use crate::media_queries::Device;
use crate::properties::{CSSWideKeyword, CustomDeclaration, CustomDeclarationValue}; use crate::properties::{CSSWideKeyword, CustomDeclaration, CustomDeclarationValue};
use crate::selector_map::{PrecomputedHashMap, PrecomputedHashSet, PrecomputedHasher}; use crate::selector_map::{PrecomputedHashMap, PrecomputedHashSet, PrecomputedHasher};
@ -21,6 +20,7 @@ use servo_arc::Arc;
use smallvec::SmallVec; use smallvec::SmallVec;
use std::borrow::Cow; use std::borrow::Cow;
use std::cmp; use std::cmp;
use std::collections::hash_map::Entry;
use std::fmt::{self, Write}; use std::fmt::{self, Write};
use std::hash::BuildHasherDefault; use std::hash::BuildHasherDefault;
use style_traits::{CssWriter, ParseError, StyleParseErrorKind, ToCss}; use style_traits::{CssWriter, ParseError, StyleParseErrorKind, ToCss};

2
components/style/gecko/wrapper.rs
View file

@ -54,7 +54,6 @@ use crate::gecko_bindings::structs::{nsAtom, nsIContent, nsINode_BooleanFlag};
use crate::gecko_bindings::structs::{nsINode as RawGeckoNode, Element as RawGeckoElement}; use crate::gecko_bindings::structs::{nsINode as RawGeckoNode, Element as RawGeckoElement};
use crate::gecko_bindings::sugar::ownership::{HasArcFFI, HasSimpleFFI}; use crate::gecko_bindings::sugar::ownership::{HasArcFFI, HasSimpleFFI};
use crate::global_style_data::GLOBAL_STYLE_DATA; use crate::global_style_data::GLOBAL_STYLE_DATA;
use crate::hash::FxHashMap;
use crate::invalidation::element::restyle_hints::RestyleHint; use crate::invalidation::element::restyle_hints::RestyleHint;
use crate::media_queries::Device; use crate::media_queries::Device;
use crate::properties::animated_properties::{AnimationValue, AnimationValueMap}; use crate::properties::animated_properties::{AnimationValue, AnimationValueMap};
@ -69,6 +68,7 @@ use crate::values::{AtomIdent, AtomString};
use crate::CaseSensitivityExt; use crate::CaseSensitivityExt;
use crate::LocalName; use crate::LocalName;
use atomic_refcell::{AtomicRef, AtomicRefCell, AtomicRefMut}; use atomic_refcell::{AtomicRef, AtomicRefCell, AtomicRefMut};
use fxhash::FxHashMap;
use selectors::attr::{AttrSelectorOperation, AttrSelectorOperator}; use selectors::attr::{AttrSelectorOperation, AttrSelectorOperator};
use selectors::attr::{CaseSensitivity, NamespaceConstraint}; use selectors::attr::{CaseSensitivity, NamespaceConstraint};
use selectors::matching::VisitedHandlingMode; use selectors::matching::VisitedHandlingMode;

31
components/style/hash.rs
View file

@ -1,31 +0,0 @@
/* 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/. */
//! Reexports of hashglobe types in Gecko mode, and stdlib hashmap shims in Servo mode
//!
//! Can go away when the stdlib gets fallible collections
//! https://github.com/rust-lang/rfcs/pull/2116
use fxhash;
#[cfg(feature = "gecko")]
pub use hashglobe::hash_map::HashMap;
#[cfg(feature = "gecko")]
pub use hashglobe::hash_set::HashSet;
#[cfg(feature = "servo")]
pub use hashglobe::fake::{HashMap, HashSet};
/// Appropriate reexports of hash_map types
pub mod map {
#[cfg(feature = "gecko")]
pub use hashglobe::hash_map::{Entry, Iter};
#[cfg(feature = "servo")]
pub use std::collections::hash_map::{Entry, Iter};
}
/// Hash map that uses the Fx hasher
pub type FxHashMap<K, V> = HashMap<K, V, fxhash::FxBuildHasher>;
/// Hash set that uses the Fx hasher
pub type FxHashSet<T> = HashSet<T, fxhash::FxBuildHasher>;

50
components/style/invalidation/element/invalidation_map.rs
View file

@ -10,9 +10,8 @@ use crate::selector_map::{
MaybeCaseInsensitiveHashMap, PrecomputedHashMap, SelectorMap, SelectorMapEntry, MaybeCaseInsensitiveHashMap, PrecomputedHashMap, SelectorMap, SelectorMapEntry,
}; };
use crate::selector_parser::SelectorImpl; use crate::selector_parser::SelectorImpl;
use crate::AllocErr;
use crate::{Atom, LocalName, Namespace}; use crate::{Atom, LocalName, Namespace};
use fallible::FallibleVec;
use hashglobe::FailedAllocationError;
use selectors::attr::NamespaceConstraint; use selectors::attr::NamespaceConstraint;
use selectors::parser::{Combinator, Component}; use selectors::parser::{Combinator, Component};
use selectors::parser::{Selector, SelectorIter}; use selectors::parser::{Selector, SelectorIter};
@ -244,7 +243,7 @@ impl InvalidationMap {
&mut self, &mut self,
selector: &Selector<SelectorImpl>, selector: &Selector<SelectorImpl>,
quirks_mode: QuirksMode, quirks_mode: QuirksMode,
) -> Result<(), FailedAllocationError> { ) -> Result<(), AllocErr> {
debug!("InvalidationMap::note_selector({:?})", selector); debug!("InvalidationMap::note_selector({:?})", selector);
let mut document_state = DocumentState::empty(); let mut document_state = DocumentState::empty();
@ -274,7 +273,8 @@ impl InvalidationMap {
state: document_state, state: document_state,
dependency: Dependency::for_full_selector_invalidation(selector.clone()), dependency: Dependency::for_full_selector_invalidation(selector.clone()),
}; };
self.document_state_selectors.try_push(dep)?; self.document_state_selectors.try_reserve(1)?;
self.document_state_selectors.push(dep);
} }
Ok(()) Ok(())
@ -325,7 +325,7 @@ struct SelectorDependencyCollector<'a> {
compound_state: PerCompoundState, compound_state: PerCompoundState,
/// The allocation error, if we OOM. /// The allocation error, if we OOM.
alloc_error: &'a mut Option<FailedAllocationError>, alloc_error: &'a mut Option<AllocErr>,
} }
impl<'a> SelectorDependencyCollector<'a> { impl<'a> SelectorDependencyCollector<'a> {
@ -361,7 +361,7 @@ impl<'a> SelectorDependencyCollector<'a> {
self.quirks_mode, self.quirks_mode,
); );
if let Err(alloc_error) = result { if let Err(alloc_error) = result {
*self.alloc_error = Some(alloc_error); *self.alloc_error = Some(alloc_error.into());
return false; return false;
} }
} }
@ -378,21 +378,17 @@ impl<'a> SelectorDependencyCollector<'a> {
let dependency = self.dependency(); let dependency = self.dependency();
let map = &mut self.map.other_attribute_affecting_selectors; let map = &mut self.map.other_attribute_affecting_selectors;
let entry = match map.try_entry(name) { if let Err(err) = map.try_reserve(1) {
Ok(entry) => entry, *self.alloc_error = Some(err.into());
Err(err) => { return false;
*self.alloc_error = Some(err);
return false;
},
};
match entry.or_insert_with(SmallVec::new).try_push(dependency) {
Ok(..) => true,
Err(err) => {
*self.alloc_error = Some(err);
return false;
},
} }
let vec = map.entry(name).or_default();
if let Err(err) = vec.try_reserve(1) {
*self.alloc_error = Some(err.into());
return false;
}
vec.push(dependency);
true
} }
fn dependency(&self) -> Dependency { fn dependency(&self) -> Dependency {
@ -481,17 +477,17 @@ impl<'a> SelectorVisitor for SelectorDependencyCollector<'a> {
let entry = match map.try_entry(atom.0.clone(), self.quirks_mode) { let entry = match map.try_entry(atom.0.clone(), self.quirks_mode) {
Ok(entry) => entry, Ok(entry) => entry,
Err(err) => { Err(err) => {
*self.alloc_error = Some(err); *self.alloc_error = Some(err.into());
return false; return false;
}, },
}; };
match entry.or_insert_with(SmallVec::new).try_push(dependency) { let vec = entry.or_insert_with(SmallVec::new);
Ok(..) => true, if let Err(err) = vec.try_reserve(1) {
Err(err) => { *self.alloc_error = Some(err.into());
*self.alloc_error = Some(err); return false;
return false;
},
} }
vec.push(dependency);
true
}, },
Component::NonTSPseudoClass(ref pc) => { Component::NonTSPseudoClass(ref pc) => {
self.compound_state.element_state |= pc.state_flag(); self.compound_state.element_state |= pc.state_flag();

16
components/style/invalidation/stylesheets.rs
View file

@ -484,16 +484,16 @@ impl StylesheetInvalidationSet {
}, },
Invalidation::LocalName { name, lower_name } => { Invalidation::LocalName { name, lower_name } => {
let insert_lower = name != lower_name; let insert_lower = name != lower_name;
let entry = match self.local_names.try_entry(name) { if self.local_names.try_reserve(1).is_err() {
Ok(e) => e, return false;
Err(..) => return false, }
}; let entry = self.local_names.entry(name);
*entry.or_insert(InvalidationKind::None) |= kind; *entry.or_insert(InvalidationKind::None) |= kind;
if insert_lower { if insert_lower {
let entry = match self.local_names.try_entry(lower_name) { if self.local_names.try_reserve(1).is_err() {
Ok(e) => e, return false;
Err(..) => return false, }
}; let entry = self.local_names.entry(lower_name);
*entry.or_insert(InvalidationKind::None) |= kind; *entry.or_insert(InvalidationKind::None) |= kind;
} }
}, },

25
components/style/lib.rs
View file

@ -97,7 +97,6 @@ pub mod font_metrics;
#[allow(unsafe_code)] #[allow(unsafe_code)]
pub mod gecko_bindings; pub mod gecko_bindings;
pub mod global_style_data; pub mod global_style_data;
pub mod hash;
pub mod invalidation; pub mod invalidation;
#[allow(missing_docs)] // TODO. #[allow(missing_docs)] // TODO.
pub mod logical_geometry; pub mod logical_geometry;
@ -263,3 +262,27 @@ where
*self == One::one() *self == One::one()
} }
} }
/// An allocation error.
///
/// TODO(emilio): Would be nice to have more information here, or for SmallVec
/// to return the standard error type (and then we can just return that).
///
/// But given we use these mostly to bail out and ignore them, it's not a big
/// deal.
#[derive(Debug)]
pub struct AllocErr;
impl From<smallvec::CollectionAllocErr> for AllocErr {
#[inline]
fn from(_: smallvec::CollectionAllocErr) -> Self {
Self
}
}
impl From<std::collections::TryReserveError> for AllocErr {
#[inline]
fn from(_: std::collections::TryReserveError) -> Self {
Self
}
}

2
components/style/properties/helpers/animated_properties.mako.rs
View file

@ -19,7 +19,7 @@ use servo_arc::Arc;
use smallvec::SmallVec; use smallvec::SmallVec;
use std::ptr; use std::ptr;
use std::mem; use std::mem;
use crate::hash::FxHashMap; use fxhash::FxHashMap;
use super::ComputedValues; use super::ComputedValues;
use crate::values::animated::{Animate, Procedure, ToAnimatedValue, ToAnimatedZero}; use crate::values::animated::{Animate, Procedure, ToAnimatedValue, ToAnimatedZero};
use crate::values::animated::effects::AnimatedFilter; use crate::values::animated::effects::AnimatedFilter;

2
components/style/properties/properties.mako.rs
View file

@ -29,7 +29,7 @@ use crate::context::QuirksMode;
use crate::logical_geometry::WritingMode; use crate::logical_geometry::WritingMode;
use malloc_size_of::{MallocSizeOf, MallocSizeOfOps}; use malloc_size_of::{MallocSizeOf, MallocSizeOfOps};
use crate::computed_value_flags::*; use crate::computed_value_flags::*;
use crate::hash::FxHashMap; use fxhash::FxHashMap;
use crate::media_queries::Device; use crate::media_queries::Device;
use crate::parser::ParserContext; use crate::parser::ParserContext;
use crate::selector_parser::PseudoElement; use crate::selector_parser::PseudoElement;

2
components/style/rule_tree/core.rs
View file

@ -128,7 +128,7 @@ impl RuleTree {
return; return;
} }
let mut children_count = crate::hash::FxHashMap::default(); let mut children_count = fxhash::FxHashMap::default();
let mut stack = SmallVec::<[_; 32]>::new(); let mut stack = SmallVec::<[_; 32]>::new();
stack.push(self.root.clone()); stack.push(self.root.clone());

47
components/style/selector_map.rs
View file

@ -8,18 +8,17 @@
use crate::applicable_declarations::ApplicableDeclarationList; use crate::applicable_declarations::ApplicableDeclarationList;
use crate::context::QuirksMode; use crate::context::QuirksMode;
use crate::dom::TElement; use crate::dom::TElement;
use crate::hash::map as hash_map;
use crate::hash::{HashMap, HashSet};
use crate::rule_tree::CascadeLevel; use crate::rule_tree::CascadeLevel;
use crate::selector_parser::SelectorImpl; use crate::selector_parser::SelectorImpl;
use crate::stylist::{CascadeData, Rule}; use crate::stylist::{CascadeData, Rule};
use crate::AllocErr;
use crate::{Atom, LocalName, Namespace, WeakAtom}; use crate::{Atom, LocalName, Namespace, WeakAtom};
use fallible::FallibleVec;
use hashglobe::FailedAllocationError;
use precomputed_hash::PrecomputedHash; use precomputed_hash::PrecomputedHash;
use selectors::matching::{matches_selector, ElementSelectorFlags, MatchingContext}; use selectors::matching::{matches_selector, ElementSelectorFlags, MatchingContext};
use selectors::parser::{Combinator, Component, SelectorIter}; use selectors::parser::{Combinator, Component, SelectorIter};
use smallvec::SmallVec; use smallvec::SmallVec;
use std::collections::hash_map;
use std::collections::{HashMap, HashSet};
use std::hash::{BuildHasherDefault, Hash, Hasher}; use std::hash::{BuildHasherDefault, Hash, Hasher};
/// A hasher implementation that doesn't hash anything, because it expects its /// A hasher implementation that doesn't hash anything, because it expects its
@ -322,11 +321,7 @@ impl SelectorMap<Rule> {
impl<T: SelectorMapEntry> SelectorMap<T> { impl<T: SelectorMapEntry> SelectorMap<T> {
/// Inserts an entry into the correct bucket(s). /// Inserts an entry into the correct bucket(s).
pub fn insert( pub fn insert(&mut self, entry: T, quirks_mode: QuirksMode) -> Result<(), AllocErr> {
&mut self,
entry: T,
quirks_mode: QuirksMode,
) -> Result<(), FailedAllocationError> {
self.count += 1; self.count += 1;
// NOTE(emilio): It'd be nice for this to be a separate function, but // NOTE(emilio): It'd be nice for this to be a separate function, but
@ -335,16 +330,16 @@ impl<T: SelectorMapEntry> SelectorMap<T> {
// common path. // common path.
macro_rules! insert_into_bucket { macro_rules! insert_into_bucket {
($entry:ident, $bucket:expr) => {{ ($entry:ident, $bucket:expr) => {{
match $bucket { let vec = match $bucket {
Bucket::Root => &mut self.root, Bucket::Root => &mut self.root,
Bucket::ID(id) => self Bucket::ID(id) => self
.id_hash .id_hash
.try_entry(id.clone(), quirks_mode)? .try_entry(id.clone(), quirks_mode)?
.or_insert_with(SmallVec::new), .or_default(),
Bucket::Class(class) => self Bucket::Class(class) => self
.class_hash .class_hash
.try_entry(class.clone(), quirks_mode)? .try_entry(class.clone(), quirks_mode)?
.or_insert_with(SmallVec::new), .or_default(),
Bucket::Attribute { name, lower_name } | Bucket::Attribute { name, lower_name } |
Bucket::LocalName { name, lower_name } => { Bucket::LocalName { name, lower_name } => {
// If the local name in the selector isn't lowercase, // If the local name in the selector isn't lowercase,
@ -367,19 +362,22 @@ impl<T: SelectorMapEntry> SelectorMap<T> {
&mut self.local_name_hash &mut self.local_name_hash
}; };
if name != lower_name { if name != lower_name {
hash.try_entry(lower_name.clone())? hash.try_reserve(1)?;
.or_insert_with(SmallVec::new) let vec = hash.entry(lower_name.clone()).or_default();
.try_push($entry.clone())?; vec.try_reserve(1)?;
vec.push($entry.clone());
} }
hash.try_entry(name.clone())?.or_insert_with(SmallVec::new) hash.try_reserve(1)?;
hash.entry(name.clone()).or_default()
},
Bucket::Namespace(url) => {
self.namespace_hash.try_reserve(1)?;
self.namespace_hash.entry(url.clone()).or_default()
}, },
Bucket::Namespace(url) => self
.namespace_hash
.try_entry(url.clone())?
.or_insert_with(SmallVec::new),
Bucket::Universal => &mut self.other, Bucket::Universal => &mut self.other,
} };
.try_push($entry)?; vec.try_reserve(1)?;
vec.push($entry);
}}; }};
} }
@ -742,11 +740,12 @@ impl<V: 'static> MaybeCaseInsensitiveHashMap<Atom, V> {
&mut self, &mut self,
mut key: Atom, mut key: Atom,
quirks_mode: QuirksMode, quirks_mode: QuirksMode,
) -> Result<hash_map::Entry<Atom, V>, FailedAllocationError> { ) -> Result<hash_map::Entry<Atom, V>, AllocErr> {
if quirks_mode == QuirksMode::Quirks { if quirks_mode == QuirksMode::Quirks {
key = key.to_ascii_lowercase() key = key.to_ascii_lowercase()
} }
self.0.try_entry(key) self.0.try_reserve(1)?;
Ok(self.0.entry(key))
} }
/// HashMap::is_empty /// HashMap::is_empty

4
components/style/stylesheets/stylesheet.rs
View file

@ -16,7 +16,6 @@ use crate::stylesheets::{CssRule, CssRules, Origin, UrlExtraData};
use crate::use_counters::UseCounters; use crate::use_counters::UseCounters;
use crate::{Namespace, Prefix}; use crate::{Namespace, Prefix};
use cssparser::{Parser, ParserInput, RuleListParser}; use cssparser::{Parser, ParserInput, RuleListParser};
use fallible::FallibleVec;
use fxhash::FxHashMap; use fxhash::FxHashMap;
#[cfg(feature = "gecko")] #[cfg(feature = "gecko")]
use malloc_size_of::{MallocSizeOfOps, MallocUnconditionalShallowSizeOf}; use malloc_size_of::{MallocSizeOfOps, MallocUnconditionalShallowSizeOf};
@ -506,9 +505,10 @@ impl Stylesheet {
// Use a fallible push here, and if it fails, just fall // Use a fallible push here, and if it fails, just fall
// out of the loop. This will cause the page to be // out of the loop. This will cause the page to be
// shown incorrectly, but it's better than OOMing. // shown incorrectly, but it's better than OOMing.
if rules.try_push(rule).is_err() { if rules.try_reserve(1).is_err() {
break; break;
} }
rules.push(rule);
}, },
Err((error, slice)) => { Err((error, slice)) => {
let location = error.location; let location = error.location;

80
components/style/stylist.rs
View file

@ -40,10 +40,9 @@ use crate::stylesheets::{
}; };
use crate::stylesheets::{StyleRule, StylesheetContents, StylesheetInDocument}; use crate::stylesheets::{StyleRule, StylesheetContents, StylesheetInDocument};
use crate::thread_state::{self, ThreadState}; use crate::thread_state::{self, ThreadState};
use crate::AllocErr;
use crate::{Atom, LocalName, Namespace, WeakAtom}; use crate::{Atom, LocalName, Namespace, WeakAtom};
use fallible::FallibleVec;
use fxhash::FxHashMap; use fxhash::FxHashMap;
use hashglobe::FailedAllocationError;
use malloc_size_of::MallocSizeOf; use malloc_size_of::MallocSizeOf;
#[cfg(feature = "gecko")] #[cfg(feature = "gecko")]
use malloc_size_of::{MallocShallowSizeOf, MallocSizeOfOps, MallocUnconditionalShallowSizeOf}; use malloc_size_of::{MallocShallowSizeOf, MallocSizeOfOps, MallocUnconditionalShallowSizeOf};
@ -113,7 +112,7 @@ trait CascadeDataCacheEntry: Sized {
collection: SheetCollectionFlusher<S>, collection: SheetCollectionFlusher<S>,
guard: &SharedRwLockReadGuard, guard: &SharedRwLockReadGuard,
old_entry: &Self, old_entry: &Self,
) -> Result<Arc<Self>, FailedAllocationError> ) -> Result<Arc<Self>, AllocErr>
where where
S: StylesheetInDocument + PartialEq + 'static; S: StylesheetInDocument + PartialEq + 'static;
/// Measures heap memory usage. /// Measures heap memory usage.
@ -150,7 +149,7 @@ where
collection: SheetCollectionFlusher<S>, collection: SheetCollectionFlusher<S>,
guard: &SharedRwLockReadGuard, guard: &SharedRwLockReadGuard,
old_entry: &Entry, old_entry: &Entry,
) -> Result<Option<Arc<Entry>>, FailedAllocationError> ) -> Result<Option<Arc<Entry>>, AllocErr>
where where
S: StylesheetInDocument + PartialEq + 'static, S: StylesheetInDocument + PartialEq + 'static,
{ {
@ -269,7 +268,7 @@ impl CascadeDataCacheEntry for UserAgentCascadeData {
collection: SheetCollectionFlusher<S>, collection: SheetCollectionFlusher<S>,
guard: &SharedRwLockReadGuard, guard: &SharedRwLockReadGuard,
_old: &Self, _old: &Self,
) -> Result<Arc<Self>, FailedAllocationError> ) -> Result<Arc<Self>, AllocErr>
where where
S: StylesheetInDocument + PartialEq + 'static, S: StylesheetInDocument + PartialEq + 'static,
{ {
@ -385,7 +384,7 @@ impl DocumentCascadeData {
quirks_mode: QuirksMode, quirks_mode: QuirksMode,
mut flusher: DocumentStylesheetFlusher<'a, S>, mut flusher: DocumentStylesheetFlusher<'a, S>,
guards: &StylesheetGuards, guards: &StylesheetGuards,
) -> Result<(), FailedAllocationError> ) -> Result<(), AllocErr>
where where
S: StylesheetInDocument + PartialEq + 'static, S: StylesheetInDocument + PartialEq + 'static,
{ {
@ -599,7 +598,7 @@ impl Stylist {
old_data: &CascadeData, old_data: &CascadeData,
collection: SheetCollectionFlusher<S>, collection: SheetCollectionFlusher<S>,
guard: &SharedRwLockReadGuard, guard: &SharedRwLockReadGuard,
) -> Result<Option<Arc<CascadeData>>, FailedAllocationError> ) -> Result<Option<Arc<CascadeData>>, AllocErr>
where where
S: StylesheetInDocument + PartialEq + 'static, S: StylesheetInDocument + PartialEq + 'static,
{ {
@ -1560,7 +1559,8 @@ impl<T: 'static> LayerOrderedVec<T> {
self.0.push((v, id)); self.0.push((v, id));
} }
fn sort(&mut self, layers: &[CascadeLayer]) { fn sort(&mut self, layers: &[CascadeLayer]) {
self.0.sort_by_key(|&(_, ref id)| layers[id.0 as usize].order) self.0
.sort_by_key(|&(_, ref id)| layers[id.0 as usize].order)
} }
} }
@ -1569,17 +1569,24 @@ impl<T: 'static> LayerOrderedMap<T> {
self.0.clear(); self.0.clear();
} }
#[cfg(feature = "gecko")] #[cfg(feature = "gecko")]
fn try_insert(&mut self, name: Atom, v: T, id: LayerId) -> Result<(), FailedAllocationError> { fn try_insert(&mut self, name: Atom, v: T, id: LayerId) -> Result<(), AllocErr> {
self.try_insert_with(name, v, id, |_, _| Ordering::Equal) self.try_insert_with(name, v, id, |_, _| Ordering::Equal)
} }
fn try_insert_with(&mut self, name: Atom, v: T, id: LayerId, cmp: impl Fn(&T, &T) -> Ordering) -> Result<(), FailedAllocationError> { fn try_insert_with(
let vec = self.0.try_entry(name)?.or_insert_with(Default::default); &mut self,
name: Atom,
v: T,
id: LayerId,
cmp: impl Fn(&T, &T) -> Ordering,
) -> Result<(), AllocErr> {
self.0.try_reserve(1)?;
let vec = self.0.entry(name).or_default();
if let Some(&mut (ref mut val, ref last_id)) = vec.last_mut() { if let Some(&mut (ref mut val, ref last_id)) = vec.last_mut() {
if *last_id == id { if *last_id == id {
if cmp(&val, &v) != Ordering::Greater { if cmp(&val, &v) != Ordering::Greater {
*val = v; *val = v;
} }
return Ok(()) return Ok(());
} }
} }
vec.push((v, id)); vec.push((v, id));
@ -1639,7 +1646,11 @@ impl ExtraStyleData {
} }
/// Add the given @font-feature-values rule. /// Add the given @font-feature-values rule.
fn add_font_feature_values(&mut self, rule: &Arc<Locked<FontFeatureValuesRule>>, layer: LayerId) { fn add_font_feature_values(
&mut self,
rule: &Arc<Locked<FontFeatureValuesRule>>,
layer: LayerId,
) {
self.font_feature_values.push(rule.clone(), layer); self.font_feature_values.push(rule.clone(), layer);
} }
@ -1649,7 +1660,7 @@ impl ExtraStyleData {
guard: &SharedRwLockReadGuard, guard: &SharedRwLockReadGuard,
rule: &Arc<Locked<CounterStyleRule>>, rule: &Arc<Locked<CounterStyleRule>>,
layer: LayerId, layer: LayerId,
) -> Result<(), FailedAllocationError> { ) -> Result<(), AllocErr> {
let name = rule.read_with(guard).name().0.clone(); let name = rule.read_with(guard).name().0.clone();
self.counter_styles.try_insert(name, rule.clone(), layer) self.counter_styles.try_insert(name, rule.clone(), layer)
} }
@ -1665,7 +1676,7 @@ impl ExtraStyleData {
guard: &SharedRwLockReadGuard, guard: &SharedRwLockReadGuard,
rule: &Arc<Locked<ScrollTimelineRule>>, rule: &Arc<Locked<ScrollTimelineRule>>,
layer: LayerId, layer: LayerId,
) -> Result<(), FailedAllocationError> { ) -> Result<(), AllocErr> {
let name = rule.read_with(guard).name.as_atom().clone(); let name = rule.read_with(guard).name.as_atom().clone();
self.scroll_timelines.try_insert(name, rule.clone(), layer) self.scroll_timelines.try_insert(name, rule.clone(), layer)
} }
@ -2123,7 +2134,7 @@ impl CascadeData {
quirks_mode: QuirksMode, quirks_mode: QuirksMode,
collection: SheetCollectionFlusher<S>, collection: SheetCollectionFlusher<S>,
guard: &SharedRwLockReadGuard, guard: &SharedRwLockReadGuard,
) -> Result<(), FailedAllocationError> ) -> Result<(), AllocErr>
where where
S: StylesheetInDocument + PartialEq + 'static, S: StylesheetInDocument + PartialEq + 'static,
{ {
@ -2262,7 +2273,8 @@ impl CascadeData {
{ {
self.extra_data.sort_by_layer(&self.layers); self.extra_data.sort_by_layer(&self.layers);
} }
self.animations.sort_with(&self.layers, compare_keyframes_in_same_layer); self.animations
.sort_with(&self.layers, compare_keyframes_in_same_layer);
} }
/// Collects all the applicable media query results into `results`. /// Collects all the applicable media query results into `results`.
@ -2323,7 +2335,7 @@ impl CascadeData {
mut current_layer: &mut LayerName, mut current_layer: &mut LayerName,
current_layer_id: LayerId, current_layer_id: LayerId,
mut precomputed_pseudo_element_decls: Option<&mut PrecomputedPseudoElementDeclarations>, mut precomputed_pseudo_element_decls: Option<&mut PrecomputedPseudoElementDeclarations>,
) -> Result<(), FailedAllocationError> ) -> Result<(), AllocErr>
where where
S: StylesheetInDocument + 'static, S: StylesheetInDocument + 'static,
{ {
@ -2409,12 +2421,14 @@ impl CascadeData {
// We choose the last one quite arbitrarily, // We choose the last one quite arbitrarily,
// expecting it's slightly more likely to be more // expecting it's slightly more likely to be more
// specific. // specific.
self.part_rules let map = self
.part_rules
.get_or_insert_with(|| Box::new(Default::default())) .get_or_insert_with(|| Box::new(Default::default()))
.for_insertion(pseudo_element) .for_insertion(pseudo_element);
.try_entry(parts.last().unwrap().clone().0)? map.try_reserve(1)?;
.or_insert_with(SmallVec::new) let vec = map.entry(parts.last().unwrap().clone().0).or_default();
.try_push(rule)?; vec.try_reserve(1)?;
vec.push(rule);
} else { } else {
// NOTE(emilio): It's fine to look at :host and then at // NOTE(emilio): It's fine to look at :host and then at
// ::slotted(..), since :host::slotted(..) could never // ::slotted(..), since :host::slotted(..) could never
@ -2444,13 +2458,19 @@ impl CascadeData {
keyframes_rule.vendor_prefix.clone(), keyframes_rule.vendor_prefix.clone(),
guard, guard,
); );
self.animations.try_insert_with(name, animation, current_layer_id, compare_keyframes_in_same_layer)?; self.animations.try_insert_with(
name,
animation,
current_layer_id,
compare_keyframes_in_same_layer,
)?;
}, },
#[cfg(feature = "gecko")] #[cfg(feature = "gecko")]
CssRule::ScrollTimeline(ref rule) => { CssRule::ScrollTimeline(ref rule) => {
// Note: Bug 1733260: we may drop @scroll-timeline rule once this spec issue // Note: Bug 1733260: we may drop @scroll-timeline rule once this spec issue
// https://github.com/w3c/csswg-drafts/issues/6674 gets landed. // https://github.com/w3c/csswg-drafts/issues/6674 gets landed.
self.extra_data.add_scroll_timeline(guard, rule, current_layer_id)?; self.extra_data
.add_scroll_timeline(guard, rule, current_layer_id)?;
}, },
#[cfg(feature = "gecko")] #[cfg(feature = "gecko")]
CssRule::FontFace(ref rule) => { CssRule::FontFace(ref rule) => {
@ -2458,11 +2478,13 @@ impl CascadeData {
}, },
#[cfg(feature = "gecko")] #[cfg(feature = "gecko")]
CssRule::FontFeatureValues(ref rule) => { CssRule::FontFeatureValues(ref rule) => {
self.extra_data.add_font_feature_values(rule, current_layer_id); self.extra_data
.add_font_feature_values(rule, current_layer_id);
}, },
#[cfg(feature = "gecko")] #[cfg(feature = "gecko")]
CssRule::CounterStyle(ref rule) => { CssRule::CounterStyle(ref rule) => {
self.extra_data.add_counter_style(guard, rule, current_layer_id); self.extra_data
.add_counter_style(guard, rule, current_layer_id)?;
}, },
#[cfg(feature = "gecko")] #[cfg(feature = "gecko")]
CssRule::Page(ref rule) => { CssRule::Page(ref rule) => {
@ -2640,7 +2662,7 @@ impl CascadeData {
guard: &SharedRwLockReadGuard, guard: &SharedRwLockReadGuard,
rebuild_kind: SheetRebuildKind, rebuild_kind: SheetRebuildKind,
mut precomputed_pseudo_element_decls: Option<&mut PrecomputedPseudoElementDeclarations>, mut precomputed_pseudo_element_decls: Option<&mut PrecomputedPseudoElementDeclarations>,
) -> Result<(), FailedAllocationError> ) -> Result<(), AllocErr>
where where
S: StylesheetInDocument + 'static, S: StylesheetInDocument + 'static,
{ {
@ -2820,7 +2842,7 @@ impl CascadeDataCacheEntry for CascadeData {
collection: SheetCollectionFlusher<S>, collection: SheetCollectionFlusher<S>,
guard: &SharedRwLockReadGuard, guard: &SharedRwLockReadGuard,
old: &Self, old: &Self,
) -> Result<Arc<Self>, FailedAllocationError> ) -> Result<Arc<Self>, AllocErr>
where where
S: StylesheetInDocument + PartialEq + 'static, S: StylesheetInDocument + PartialEq + 'static,
{ {

2
components/style/values/computed/mod.rs
View file

@ -84,12 +84,12 @@ pub use self::resolution::Resolution;
pub use self::svg::{DProperty, MozContextProperties}; pub use self::svg::{DProperty, MozContextProperties};
pub use self::svg::{SVGLength, SVGOpacity, SVGPaint, SVGPaintKind}; pub use self::svg::{SVGLength, SVGOpacity, SVGPaint, SVGPaintKind};
pub use self::svg::{SVGPaintOrder, SVGStrokeDashArray, SVGWidth}; pub use self::svg::{SVGPaintOrder, SVGStrokeDashArray, SVGWidth};
pub use self::text::HyphenateCharacter;
pub use self::text::TextUnderlinePosition; pub use self::text::TextUnderlinePosition;
pub use self::text::{InitialLetter, LetterSpacing, LineBreak, LineHeight}; pub use self::text::{InitialLetter, LetterSpacing, LineBreak, LineHeight};
pub use self::text::{OverflowWrap, RubyPosition, TextOverflow, WordBreak, WordSpacing}; pub use self::text::{OverflowWrap, RubyPosition, TextOverflow, WordBreak, WordSpacing};
pub use self::text::{TextAlign, TextAlignLast, TextEmphasisPosition, TextEmphasisStyle}; pub use self::text::{TextAlign, TextAlignLast, TextEmphasisPosition, TextEmphasisStyle};
pub use self::text::{TextDecorationLength, TextDecorationSkipInk, TextJustify}; pub use self::text::{TextDecorationLength, TextDecorationSkipInk, TextJustify};
pub use self::text::HyphenateCharacter;
pub use self::time::Time; pub use self::time::Time;
pub use self::transform::{Rotate, Scale, Transform, TransformOperation}; pub use self::transform::{Rotate, Scale, Transform, TransformOperation};
pub use self::transform::{TransformOrigin, TransformStyle, Translate}; pub use self::transform::{TransformOrigin, TransformStyle, Translate};

2
components/style/values/computed/text.rs
View file

@ -21,10 +21,10 @@ use style_traits::{CssWriter, ToCss};
pub use crate::values::specified::text::{ pub use crate::values::specified::text::{
MozControlCharacterVisibility, TextAlignLast, TextUnderlinePosition, MozControlCharacterVisibility, TextAlignLast, TextUnderlinePosition,
}; };
pub use crate::values::specified::HyphenateCharacter;
pub use crate::values::specified::{LineBreak, OverflowWrap, RubyPosition, WordBreak}; pub use crate::values::specified::{LineBreak, OverflowWrap, RubyPosition, WordBreak};
pub use crate::values::specified::{TextDecorationLine, TextEmphasisPosition}; pub use crate::values::specified::{TextDecorationLine, TextEmphasisPosition};
pub use crate::values::specified::{TextDecorationSkipInk, TextJustify, TextTransform}; pub use crate::values::specified::{TextDecorationSkipInk, TextJustify, TextTransform};
pub use crate::values::specified::HyphenateCharacter;
/// A computed value for the `initial-letter` property. /// A computed value for the `initial-letter` property.
pub type InitialLetter = GenericInitialLetter<CSSFloat, CSSInteger>; pub type InitialLetter = GenericInitialLetter<CSSFloat, CSSInteger>;

7
components/style/values/specified/length.rs
View file

@ -244,8 +244,11 @@ impl FontRelativeLength {
(reference_size, length) (reference_size, length)
}, },
FontRelativeLength::Ic(length) => { FontRelativeLength::Ic(length) => {
let metrics = let metrics = query_font_metrics(
query_font_metrics(context, base_size, FontMetricsOrientation::MatchContextPreferVertical); context,
base_size,
FontMetricsOrientation::MatchContextPreferVertical,
);
let reference_size = metrics.ic_width.unwrap_or_else(|| { let reference_size = metrics.ic_width.unwrap_or_else(|| {
// https://drafts.csswg.org/css-values/#ic // https://drafts.csswg.org/css-values/#ic
// //

2
components/style/values/specified/mod.rs
View file

@ -83,6 +83,7 @@ pub use self::svg::{DProperty, MozContextProperties};
pub use self::svg::{SVGLength, SVGOpacity, SVGPaint}; pub use self::svg::{SVGLength, SVGOpacity, SVGPaint};
pub use self::svg::{SVGPaintOrder, SVGStrokeDashArray, SVGWidth}; pub use self::svg::{SVGPaintOrder, SVGStrokeDashArray, SVGWidth};
pub use self::svg_path::SVGPathData; pub use self::svg_path::SVGPathData;
pub use self::text::HyphenateCharacter;
pub use self::text::RubyPosition; pub use self::text::RubyPosition;
pub use self::text::TextAlignLast; pub use self::text::TextAlignLast;
pub use self::text::TextUnderlinePosition; pub use self::text::TextUnderlinePosition;
@ -90,7 +91,6 @@ pub use self::text::{InitialLetter, LetterSpacing, LineBreak, LineHeight, TextAl
pub use self::text::{OverflowWrap, TextEmphasisPosition, TextEmphasisStyle, WordBreak}; pub use self::text::{OverflowWrap, TextEmphasisPosition, TextEmphasisStyle, WordBreak};
pub use self::text::{TextAlignKeyword, TextDecorationLine, TextOverflow, WordSpacing}; pub use self::text::{TextAlignKeyword, TextDecorationLine, TextOverflow, WordSpacing};
pub use self::text::{TextDecorationLength, TextDecorationSkipInk, TextJustify, TextTransform}; pub use self::text::{TextDecorationLength, TextDecorationSkipInk, TextJustify, TextTransform};
pub use self::text::HyphenateCharacter;
pub use self::time::Time; pub use self::time::Time;
pub use self::transform::{Rotate, Scale, Transform}; pub use self::transform::{Rotate, Scale, Transform};
pub use self::transform::{TransformOrigin, TransformStyle, Translate}; pub use self::transform::{TransformOrigin, TransformStyle, Translate};

14
components/style/values/specified/page.rs
View file

@ -5,9 +5,9 @@
//! Specified @page at-rule properties and named-page style properties //! Specified @page at-rule properties and named-page style properties
use crate::parser::{Parse, ParserContext}; use crate::parser::{Parse, ParserContext};
use crate::values::{generics, CustomIdent};
use crate::values::generics::size::Size2D; use crate::values::generics::size::Size2D;
use crate::values::specified::length::NonNegativeLength; use crate::values::specified::length::NonNegativeLength;
use crate::values::{generics, CustomIdent};
use cssparser::Parser; use cssparser::Parser;
use style_traits::ParseError; use style_traits::ParseError;
@ -50,7 +50,17 @@ impl Parse for PageSize {
/// Page name value. /// Page name value.
/// ///
/// https://drafts.csswg.org/css-page-3/#using-named-pages /// https://drafts.csswg.org/css-page-3/#using-named-pages
#[derive(Clone, Debug, MallocSizeOf, PartialEq, SpecifiedValueInfo, ToCss, ToComputedValue, ToResolvedValue, ToShmem)] #[derive(
Clone,
Debug,
MallocSizeOf,
PartialEq,
SpecifiedValueInfo,
ToCss,
ToComputedValue,
ToResolvedValue,
ToShmem,
)]
#[repr(C, u8)] #[repr(C, u8)]
pub enum PageName { pub enum PageName {
/// `auto` value. /// `auto` value.