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

Pass SharedStyleContext to CanvasFragmentInfo::new.

Browse source
This commit is contained in:
Ms2ger 2016-08-23 16:58:45 +02:00
parent d00d9994e9
commit 7524e5549f
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/layout/construct.rs
View file

@ -332,7 +332,7 @@ impl<'a, ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNode>
} }
Some(LayoutNodeType::Element(LayoutElementType::HTMLCanvasElement)) => { Some(LayoutNodeType::Element(LayoutElementType::HTMLCanvasElement)) => {
let data = node.canvas_data().unwrap(); let data = node.canvas_data().unwrap();
SpecificFragmentInfo::Canvas(box CanvasFragmentInfo::new(node, data, self.layout_context)) SpecificFragmentInfo::Canvas(box CanvasFragmentInfo::new(node, data, self.style_context()))
} }
_ => { _ => {
// This includes pseudo-elements. // This includes pseudo-elements.

7
components/layout/fragment.rs
View file

@ -324,9 +324,12 @@ pub struct CanvasFragmentInfo {
} }
impl CanvasFragmentInfo { impl CanvasFragmentInfo {
pub fn new<N: ThreadSafeLayoutNode>(node: &N, data: HTMLCanvasData, ctx: &LayoutContext) -> CanvasFragmentInfo { pub fn new<N: ThreadSafeLayoutNode>(node: &N,
data: HTMLCanvasData,
ctx: &SharedStyleContext)
-> CanvasFragmentInfo {
CanvasFragmentInfo { CanvasFragmentInfo {
replaced_image_fragment_info: ReplacedImageFragmentInfo::new(node, ctx.style_context()), replaced_image_fragment_info: ReplacedImageFragmentInfo::new(node, ctx),
ipc_renderer: data.ipc_renderer ipc_renderer: data.ipc_renderer
.map(|renderer| Arc::new(Mutex::new(renderer))), .map(|renderer| Arc::new(Mutex::new(renderer))),
dom_width: Au::from_px(data.width as i32), dom_width: Au::from_px(data.width as i32),