mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-24 02:35:41 +00:00
5a62942911
Servo currently uses `heapsize`, but Stylo/Gecko use `malloc_size_of`. `malloc_size_of` is better -- it handles various cases that `heapsize` does not -- so this patch changes Servo to use `malloc_size_of`. This patch makes the following changes to the `malloc_size_of` crate. - Adds `MallocSizeOf` trait implementations for numerous types, some built-in (e.g. `VecDeque`), some external and Servo-only (e.g. `string_cache`). - Makes `enclosing_size_of_op` optional, because vanilla jemalloc doesn't support that operation. - For `HashSet`/`HashMap`, falls back to a computed estimate when `enclosing_size_of_op` isn't available. - Adds an extern "C" `malloc_size_of` function that does the actual heap measurement; this is based on the same functions from the `heapsize` crate. This patch makes the following changes elsewhere. - Converts all the uses of `heapsize` to instead use `malloc_size_of`. - Disables the "heapsize"/"heap_size" feature for the external crates that provide it. - Removes the `HeapSizeOf` implementation from `hashglobe`. - Adds `ignore` annotations to a few `Rc`/`Arc`, because `malloc_size_of` doesn't derive those types, unlike `heapsize`. <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [ ] These changes fix https://bugzilla.mozilla.org/show_bug.cgi?id=1409255 <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because testing is on the Gecko side. <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> Source-Repo: https://github.com/servo/servo Source-Revision: 4c538b642e4bdfbf42c522c5a59c258a6d14546e --HG-- extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear extra : subtree_revision : f9a6feed1088d0b0be2b55d7f0c2ec9c594ac33b
106 lines
3.6 KiB
Rust
106 lines
3.6 KiB
Rust
/* 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 http://mozilla.org/MPL/2.0/. */
|
|
|
|
//! A list of common mouse cursors per CSS3-UI § 8.1.1.
|
|
|
|
use super::ToCss;
|
|
|
|
macro_rules! define_cursor {
|
|
(
|
|
common properties = [
|
|
$( $c_css: expr => $c_variant: ident = $c_value: expr, )+
|
|
]
|
|
gecko properties = [
|
|
$( $g_css: expr => $g_variant: ident = $g_value: expr, )+
|
|
]
|
|
) => {
|
|
/// <https://drafts.csswg.org/css-ui/#cursor>
|
|
#[derive(Clone, Copy, Debug, Eq, MallocSizeOf, PartialEq)]
|
|
#[cfg_attr(feature = "servo", derive(Deserialize, Serialize))]
|
|
#[repr(u8)]
|
|
#[allow(missing_docs)]
|
|
pub enum Cursor {
|
|
$( $c_variant = $c_value, )+
|
|
$( #[cfg(feature = "gecko")] $g_variant = $g_value, )+
|
|
}
|
|
|
|
impl Cursor {
|
|
/// Given a CSS keyword, get the corresponding cursor enum.
|
|
pub fn from_css_keyword(keyword: &str) -> Result<Cursor, ()> {
|
|
match_ignore_ascii_case! { &keyword,
|
|
$( $c_css => Ok(Cursor::$c_variant), )+
|
|
$( #[cfg(feature = "gecko")] $g_css => Ok(Cursor::$g_variant), )+
|
|
_ => Err(())
|
|
}
|
|
}
|
|
|
|
/// From the C u8 value, get the corresponding Cursor enum.
|
|
pub fn from_u8(value: u8) -> Result<Cursor, ()> {
|
|
match value {
|
|
$( $c_value => Ok(Cursor::$c_variant), )+
|
|
$( #[cfg(feature = "gecko")] $g_value => Ok(Cursor::$g_variant), )+
|
|
_ => Err(())
|
|
}
|
|
}
|
|
}
|
|
|
|
impl ToCss for Cursor {
|
|
fn to_css<W>(&self, dest: &mut W) -> ::std::fmt::Result where W: ::std::fmt::Write {
|
|
match *self {
|
|
$( Cursor::$c_variant => dest.write_str($c_css), )+
|
|
$( #[cfg(feature = "gecko")] Cursor::$g_variant => dest.write_str($g_css), )+
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
define_cursor! {
|
|
common properties = [
|
|
"none" => None = 0,
|
|
"default" => Default = 1,
|
|
"pointer" => Pointer = 2,
|
|
"context-menu" => ContextMenu = 3,
|
|
"help" => Help = 4,
|
|
"progress" => Progress = 5,
|
|
"wait" => Wait = 6,
|
|
"cell" => Cell = 7,
|
|
"crosshair" => Crosshair = 8,
|
|
"text" => Text = 9,
|
|
"vertical-text" => VerticalText = 10,
|
|
"alias" => Alias = 11,
|
|
"copy" => Copy = 12,
|
|
"move" => Move = 13,
|
|
"no-drop" => NoDrop = 14,
|
|
"not-allowed" => NotAllowed = 15,
|
|
"grab" => Grab = 16,
|
|
"grabbing" => Grabbing = 17,
|
|
"e-resize" => EResize = 18,
|
|
"n-resize" => NResize = 19,
|
|
"ne-resize" => NeResize = 20,
|
|
"nw-resize" => NwResize = 21,
|
|
"s-resize" => SResize = 22,
|
|
"se-resize" => SeResize = 23,
|
|
"sw-resize" => SwResize = 24,
|
|
"w-resize" => WResize = 25,
|
|
"ew-resize" => EwResize = 26,
|
|
"ns-resize" => NsResize = 27,
|
|
"nesw-resize" => NeswResize = 28,
|
|
"nwse-resize" => NwseResize = 29,
|
|
"col-resize" => ColResize = 30,
|
|
"row-resize" => RowResize = 31,
|
|
"all-scroll" => AllScroll = 32,
|
|
"zoom-in" => ZoomIn = 33,
|
|
"zoom-out" => ZoomOut = 34,
|
|
]
|
|
// gecko only properties
|
|
gecko properties = [
|
|
"-moz-grab" => MozGrab = 35,
|
|
"-moz-grabbing" => MozGrabbing = 36,
|
|
"-moz-zoom-in" => MozZoomIn = 37,
|
|
"-moz-zoom-out" => MozZoomOut = 38,
|
|
]
|
|
}
|