Skip to content

/ servo

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

stylo: Fuse ServoStyleContext and ServoComputedValues #17767

Merged
merged 16 commits into from Jul 18, 2017
+17,811 −14,461
Merged

stylo: Fuse ServoStyleContext and ServoComputedValues #17767

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3343c82
Update bindings
Manishearth Jul 17, 2017
4c5cc89
stylo: Create C++-side ServoComputedValues
Manishearth Jul 17, 2017
d1c235d
stylo: Add RawOffsetArc<T>
Manishearth Jul 17, 2017
d52f04d
stylo: Use RawOffsetArc in ComputedValues
Manishearth Jul 17, 2017
5d78743
stylo: Replace real ComputedValues with bindgenned ComputedValues2
Manishearth Jul 17, 2017
04b0ae6
stylo: Introduce ComputedValuesInner
Manishearth Jul 17, 2017
808b1f5
stylo: Use ComputedValuesInner instead of ComputedValues when we don'…
Manishearth Jul 17, 2017
74519cc
stylo: Make Servo Arc types use ptr to T instead of ptr to ArcInner<T>
Manishearth Jul 17, 2017
89930e7
stylo: Switch Gecko over to ServoStyleContext
Manishearth Jul 17, 2017
cfad95b
stylo: Use ServoStyleContext in ServoStyleSet/ServoRestyleManager
Manishearth Jul 17, 2017
ff4bc5a
stylo: Flatten ServoComputedValues into ServoStyleContext
Manishearth Jul 17, 2017
e78947f
stylo: Remove FFI calls for fetching style structs from ServoComputed…
Manishearth Jul 17, 2017
2a49a73
stylo: Stop using mStyleIfVisited in Servo
Manishearth Jul 17, 2017
b280585
stylo: Clean up GetContext, call it UpdateWithElementState
Manishearth Jul 17, 2017
c33fa3e
Update bindings
Manishearth Jul 18, 2017
8eafe6a
Fix tidy
Manishearth Jul 18, 2017
File filter...
Filter file types
Clear filters
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Prev Next

stylo: Use RawOffsetArc in ComputedValues

  • Loading branch information
@Manishearth
Manishearth committed Jul 18, 2017
commit d52f04d105d46ec8d9ca99e15694a67a43bd6a05
53 components/style/gecko/generated/structs_debug.rs
View file
Open in desktop
@@ -13,6 +13,7 @@ pub type ServoWritingMode = ::logical_geometry::WritingMode;
pub type ServoFontComputationData = ::properties::FontComputationData;
pub type ServoCustomPropertiesMap = Option<::stylearc::Arc<::custom_properties::CustomPropertiesMap>>;
pub type ServoVisitedStyle = Option<::stylearc::Arc<ServoComputedValues2>>;
pub type ServoRawOffsetArc<T> = ::stylearc::RawOffsetArc<T>;

#[allow(non_snake_case, non_camel_case_types, non_upper_case_globals)]
pub mod root {
@@ -7615,30 +7616,30 @@ pub mod root {
#[repr(C)]
#[derive(Debug)]
pub struct ServoComputedValues2 {
pub Font: *mut root::nsStyleFont,
pub Color: *mut root::nsStyleColor,
pub List: *mut root::nsStyleList,
pub Text: *mut root::nsStyleText,
pub Visibility: *mut root::nsStyleVisibility,
pub UserInterface: *mut root::nsStyleUserInterface,
pub TableBorder: *mut root::nsStyleTableBorder,
pub SVG: *mut root::nsStyleSVG,
pub Variables: *mut root::nsStyleVariables,
pub Background: *mut root::nsStyleBackground,
pub Position: *mut root::nsStylePosition,
pub TextReset: *mut root::nsStyleTextReset,
pub Display: *mut root::nsStyleDisplay,
pub Content: *mut root::nsStyleContent,
pub UIReset: *mut root::nsStyleUIReset,
pub Table: *mut root::nsStyleTable,
pub Margin: *mut root::nsStyleMargin,
pub Padding: *mut root::nsStylePadding,
pub Border: *mut root::nsStyleBorder,
pub Outline: *mut root::nsStyleOutline,
pub XUL: *mut root::nsStyleXUL,
pub SVGReset: *mut root::nsStyleSVGReset,
pub Column: *mut root::nsStyleColumn,
pub Effects: *mut root::nsStyleEffects,
pub Font: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleFont>,
pub Color: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleColor>,
pub List: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleList>,
pub Text: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleText>,
pub Visibility: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleVisibility>,
pub UserInterface: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleUserInterface>,
pub TableBorder: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleTableBorder>,
pub SVG: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleSVG>,
pub Variables: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleVariables>,
pub Background: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleBackground>,
pub Position: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStylePosition>,
pub TextReset: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleTextReset>,
pub Display: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleDisplay>,
pub Content: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleContent>,
pub UIReset: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleUIReset>,
pub Table: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleTable>,
pub Margin: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleMargin>,
pub Padding: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStylePadding>,
pub Border: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleBorder>,
pub Outline: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleOutline>,
pub XUL: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleXUL>,
pub SVGReset: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleSVGReset>,
pub Column: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleColumn>,
pub Effects: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleEffects>,
pub custom_properties: ::gecko_bindings::structs::ServoCustomPropertiesMap,
pub writing_mode: ::gecko_bindings::structs::ServoWritingMode,
pub font_computation_data: ::gecko_bindings::structs::ServoFontComputationData,
root::nsCharTraits ) ));
}
#[test]
fn __bindgen_test_layout__bindgen_ty_id_189479_instantiation_33() {
fn __bindgen_test_layout__bindgen_ty_id_189482_instantiation_33() {
assert_eq!(::std::mem::size_of::<u8>() , 1usize , concat ! (
"Size of template specialization: " , stringify ! ( u8 )
));
) ));
}
#[test]
fn __bindgen_test_layout__bindgen_ty_id_189515_instantiation_34() {
fn __bindgen_test_layout__bindgen_ty_id_189518_instantiation_34() {
assert_eq!(::std::mem::size_of::<u8>() , 1usize , concat ! (
"Size of template specialization: " , stringify ! ( u8 )
));
53 components/style/gecko/generated/structs_release.rs
View file
Open in desktop
@@ -13,6 +13,7 @@ pub type ServoWritingMode = ::logical_geometry::WritingMode;
pub type ServoFontComputationData = ::properties::FontComputationData;
pub type ServoCustomPropertiesMap = Option<::stylearc::Arc<::custom_properties::CustomPropertiesMap>>;
pub type ServoVisitedStyle = Option<::stylearc::Arc<ServoComputedValues2>>;
pub type ServoRawOffsetArc<T> = ::stylearc::RawOffsetArc<T>;

#[allow(non_snake_case, non_camel_case_types, non_upper_case_globals)]
pub mod root {
@@ -7467,30 +7468,30 @@ pub mod root {
#[repr(C)]
#[derive(Debug)]
pub struct ServoComputedValues2 {
pub Font: *mut root::nsStyleFont,
pub Color: *mut root::nsStyleColor,
pub List: *mut root::nsStyleList,
pub Text: *mut root::nsStyleText,
pub Visibility: *mut root::nsStyleVisibility,
pub UserInterface: *mut root::nsStyleUserInterface,
pub TableBorder: *mut root::nsStyleTableBorder,
pub SVG: *mut root::nsStyleSVG,
pub Variables: *mut root::nsStyleVariables,
pub Background: *mut root::nsStyleBackground,
pub Position: *mut root::nsStylePosition,
pub TextReset: *mut root::nsStyleTextReset,
pub Display: *mut root::nsStyleDisplay,
pub Content: *mut root::nsStyleContent,
pub UIReset: *mut root::nsStyleUIReset,
pub Table: *mut root::nsStyleTable,
pub Margin: *mut root::nsStyleMargin,
pub Padding: *mut root::nsStylePadding,
pub Border: *mut root::nsStyleBorder,
pub Outline: *mut root::nsStyleOutline,
pub XUL: *mut root::nsStyleXUL,
pub SVGReset: *mut root::nsStyleSVGReset,
pub Column: *mut root::nsStyleColumn,
pub Effects: *mut root::nsStyleEffects,
pub Font: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleFont>,
pub Color: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleColor>,
pub List: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleList>,
pub Text: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleText>,
pub Visibility: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleVisibility>,
pub UserInterface: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleUserInterface>,
pub TableBorder: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleTableBorder>,
pub SVG: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleSVG>,
pub Variables: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleVariables>,
pub Background: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleBackground>,
pub Position: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStylePosition>,
pub TextReset: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleTextReset>,
pub Display: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleDisplay>,
pub Content: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleContent>,
pub UIReset: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleUIReset>,
pub Table: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleTable>,
pub Margin: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleMargin>,
pub Padding: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStylePadding>,
pub Border: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleBorder>,
pub Outline: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleOutline>,
pub XUL: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleXUL>,
pub SVGReset: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleSVGReset>,
pub Column: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleColumn>,
pub Effects: ::gecko_bindings::structs::ServoRawOffsetArc<root::nsStyleEffects>,
pub custom_properties: ::gecko_bindings::structs::ServoCustomPropertiesMap,
pub writing_mode: ::gecko_bindings::structs::ServoWritingMode,
pub font_computation_data: ::gecko_bindings::structs::ServoFontComputationData,
root::nsCharTraits ) ));
}
#[test]
fn __bindgen_test_layout__bindgen_ty_id_187138_instantiation_33() {
fn __bindgen_test_layout__bindgen_ty_id_187141_instantiation_33() {
assert_eq!(::std::mem::size_of::<u8>() , 1usize , concat ! (
"Size of template specialization: " , stringify ! ( u8 )
));
) ));
}
#[test]
fn __bindgen_test_layout__bindgen_ty_id_187174_instantiation_34() {
fn __bindgen_test_layout__bindgen_ty_id_187177_instantiation_34() {
assert_eq!(::std::mem::size_of::<u8>() , 1usize , concat ! (
"Size of template specialization: " , stringify ! ( u8 )
));
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.