mirror of
https://github.com/servo/servo.git
synced 2025-08-06 14:10:11 +01:00
Further changes required by Servo
This commit is contained in:
parent
f48b95e2e3
commit
a7699d9034
23 changed files with 76 additions and 117 deletions
|
@ -19,7 +19,5 @@ malloc_size_of = { path = "../malloc_size_of" }
|
|||
malloc_size_of_derive = { workspace = true }
|
||||
parking_lot = { workspace = true }
|
||||
serde = { workspace = true }
|
||||
webrender_api = { workspace = true }
|
||||
|
||||
[dev-dependencies]
|
||||
size_of_test = { path = "../size_of_test" }
|
||||
webrender_api = { workspace = true }
|
||||
|
|
|
@ -198,6 +198,9 @@ pub struct PipelineNamespaceId(pub u32);
|
|||
|
||||
namespace_id! {PipelineId, PipelineIndex}
|
||||
|
||||
size_of_test!(PipelineId, 8);
|
||||
size_of_test!(Option<PipelineId>, 8);
|
||||
|
||||
impl PipelineId {
|
||||
pub fn new() -> PipelineId {
|
||||
PIPELINE_NAMESPACE.with(|tls| {
|
||||
|
@ -240,6 +243,9 @@ impl fmt::Display for PipelineId {
|
|||
|
||||
namespace_id! {BrowsingContextId, BrowsingContextIndex}
|
||||
|
||||
size_of_test!(BrowsingContextId, 8);
|
||||
size_of_test!(Option<BrowsingContextId>, 8);
|
||||
|
||||
impl BrowsingContextId {
|
||||
pub fn new() -> BrowsingContextId {
|
||||
PIPELINE_NAMESPACE.with(|tls| {
|
||||
|
@ -269,6 +275,9 @@ thread_local!(pub static TOP_LEVEL_BROWSING_CONTEXT_ID: Cell<Option<TopLevelBrow
|
|||
)]
|
||||
pub struct TopLevelBrowsingContextId(pub BrowsingContextId);
|
||||
|
||||
size_of_test!(TopLevelBrowsingContextId, 8);
|
||||
size_of_test!(Option<TopLevelBrowsingContextId>, 8);
|
||||
|
||||
impl TopLevelBrowsingContextId {
|
||||
pub fn new() -> TopLevelBrowsingContextId {
|
||||
TopLevelBrowsingContextId(BrowsingContextId::new())
|
||||
|
|
|
@ -12,5 +12,7 @@ extern crate malloc_size_of;
|
|||
extern crate malloc_size_of_derive;
|
||||
#[macro_use]
|
||||
extern crate serde;
|
||||
#[macro_use]
|
||||
extern crate size_of_test;
|
||||
|
||||
pub mod constellation_msg;
|
||||
|
|
|
@ -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/. */
|
||||
|
||||
#![cfg(target_pointer_width = "64")]
|
||||
|
||||
#[macro_use]
|
||||
extern crate size_of_test;
|
||||
|
||||
use msg::constellation_msg::BrowsingContextId;
|
||||
use msg::constellation_msg::PipelineId;
|
||||
use msg::constellation_msg::TopLevelBrowsingContextId;
|
||||
|
||||
size_of_test!(test_size_of_pipeline_id, PipelineId, 8);
|
||||
size_of_test!(test_size_of_optional_pipeline_id, Option<PipelineId>, 8);
|
||||
size_of_test!(test_size_of_browsing_context_id, BrowsingContextId, 8);
|
||||
size_of_test!(
|
||||
test_size_of_optional_browsing_context_id,
|
||||
Option<BrowsingContextId>,
|
||||
8
|
||||
);
|
||||
size_of_test!(
|
||||
test_size_of_top_level_browsing_context_id,
|
||||
TopLevelBrowsingContextId,
|
||||
8
|
||||
);
|
||||
size_of_test!(
|
||||
test_size_of_top_level_optional_browsing_context_id,
|
||||
Option<TopLevelBrowsingContextId>,
|
||||
8
|
||||
);
|
Loading…
Add table
Add a link
Reference in a new issue