From 7524e5549f8cda195d8453929770cf26218929c5 Mon Sep 17 00:00:00 2001
From: Ms2ger <Ms2ger@gmail.com>
Date: Tue, 23 Aug 2016 16:58:45 +0200
Subject: [PATCH] Pass SharedStyleContext to CanvasFragmentInfo::new.

---
 components/layout/construct.rs | 2 +-
 components/layout/fragment.rs  | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/components/layout/construct.rs b/components/layout/construct.rs
index bb7f0372189..cf8d69cbbf3 100644
--- a/components/layout/construct.rs
+++ b/components/layout/construct.rs
@@ -332,7 +332,7 @@ impl<'a, ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNode>
             }
             Some(LayoutNodeType::Element(LayoutElementType::HTMLCanvasElement)) => {
                 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.
diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs
index 24703e46ae0..0626ed76867 100644
--- a/components/layout/fragment.rs
+++ b/components/layout/fragment.rs
@@ -324,9 +324,12 @@ pub struct 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 {
-            replaced_image_fragment_info: ReplacedImageFragmentInfo::new(node, ctx.style_context()),
+            replaced_image_fragment_info: ReplacedImageFragmentInfo::new(node, ctx),
             ipc_renderer: data.ipc_renderer
                               .map(|renderer| Arc::new(Mutex::new(renderer))),
             dom_width: Au::from_px(data.width as i32),