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

Replace OpaqueStyleAndLayoutData by StyleAndOpaqueLayoutData

Browse source
This commit is contained in:
Anthony Ramine 2020-04-06 14:42:05 +02:00
parent 88d79fe46d
commit 030a1cf8fb
12 changed files with 129 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

21
components/layout/query.rs
View file

@ -6,7 +6,6 @@
use crate::construct::ConstructionResult;
use crate::context::LayoutContext;
use crate::data::StyleAndLayoutData;
use crate::display_list::items::{DisplayList, OpaqueNode, ScrollOffsetMap};
use crate::display_list::IndexableText;
use crate::flow::{Flow, GetBaseFlow};
@ -1036,24 +1035,12 @@ fn inner_text_collection_steps<'dom>(
_ => child,
};
let element_data = {
&node
.get_opaque_style_and_layout_data()
.as_ref()
.map(|opaque| {
&opaque
.downcast_ref::<StyleAndLayoutData>()
.unwrap()
.style_data
.element_data
})
let element_data = match node.get_style_and_opaque_layout_data() {
Some(data) => &data.style_data.element_data,
None => continue,
};
if element_data.is_none() {
continue;
}
let style = match element_data.unwrap().borrow().styles.get_primary() {
let style = match element_data.borrow().styles.get_primary() {
None => continue,
Some(style) => style.clone(),
};