diff options
| author | Anthony Ramine <nox@nox.paris> | 2020-04-06 12:06:00 +0200 |
|---|---|---|
| committer | Anthony Ramine <nox@nox.paris> | 2020-04-06 12:39:52 +0200 |
| commit | e3be136c9b9d44ed0977780de8e8a8b17e279460 (patch) | |
| tree | 3ccceef96280cb9f23a2ed58f095c4adafac92bc /components/script/dom/node.rs | |
| parent | 3df65c02fe73a4cce9e391fa1de0b9a4d613c51b (diff) | |
| download | servo-e3be136c9b9d44ed0977780de8e8a8b17e279460.tar.gz servo-e3be136c9b9d44ed0977780de8e8a8b17e279460.zip | |
Rename a bunch of style/layout data items
GetLayoutData::get_style_and_layout_data becomes
GetOpaqueStyleAndLayoutData::get_opaque_style_and_layout_data.
GetRawData::get_raw_data becomes GetStyleAndLayoutData::get_style_and_layout_data.
LayoutNode::init_style_and_layout_data becomes
LayoutNode::init_opaque_style_and_layout_data.
LayoutNode::take_style_and_layout_data becomes
LayoutNode::take_opaque_style_and_layout_data.
Diffstat (limited to 'components/script/dom/node.rs')
| -rw-r--r-- | components/script/dom/node.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index 8530078c919..99079062e17 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -1282,9 +1282,9 @@ pub trait LayoutNodeHelpers<'dom> { fn children_count(self) -> u32; - fn get_style_and_layout_data(self) -> Option<&'dom OpaqueStyleAndLayoutData>; - unsafe fn init_style_and_layout_data(self, data: OpaqueStyleAndLayoutData); - unsafe fn take_style_and_layout_data(self) -> OpaqueStyleAndLayoutData; + fn get_opaque_style_and_layout_data(self) -> Option<&'dom OpaqueStyleAndLayoutData>; + unsafe fn init_opaque_style_and_layout_data(self, data: OpaqueStyleAndLayoutData); + unsafe fn take_opaque_style_and_layout_data(self) -> OpaqueStyleAndLayoutData; fn text_content(self) -> Cow<'dom, str>; fn selection(self) -> Option<Range<usize>>; @@ -1410,13 +1410,13 @@ impl<'dom> LayoutNodeHelpers<'dom> for LayoutDom<'dom, Node> { #[inline] #[allow(unsafe_code)] - fn get_style_and_layout_data(self) -> Option<&'dom OpaqueStyleAndLayoutData> { + fn get_opaque_style_and_layout_data(self) -> Option<&'dom OpaqueStyleAndLayoutData> { unsafe { (*self.unsafe_get().style_and_layout_data.get()).as_ref() } } #[inline] #[allow(unsafe_code)] - unsafe fn init_style_and_layout_data(self, val: OpaqueStyleAndLayoutData) { + unsafe fn init_opaque_style_and_layout_data(self, val: OpaqueStyleAndLayoutData) { let data = &mut *self.unsafe_get().style_and_layout_data.get(); debug_assert!(data.is_none()); *data = Some(val); @@ -1424,7 +1424,7 @@ impl<'dom> LayoutNodeHelpers<'dom> for LayoutDom<'dom, Node> { #[inline] #[allow(unsafe_code)] - unsafe fn take_style_and_layout_data(self) -> OpaqueStyleAndLayoutData { + unsafe fn take_opaque_style_and_layout_data(self) -> OpaqueStyleAndLayoutData { (*self.unsafe_get().style_and_layout_data.get()) .take() .unwrap() |