From 12b6ce3b7cb8844b72241b4fe2a0bae6c239c8c5 Mon Sep 17 00:00:00 2001
From: Martin Robinson <mrobinson@igalia.com>
Date: Thu, 25 Jun 2015 11:07:36 -0700
Subject: [PATCH] Update to latest rust-layers

The stride option is no longer required when creating a NativeSurface.
---
 src/draw_buffer.rs            | 2 +-
 src/layers_surface_wrapper.rs | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/draw_buffer.rs b/src/draw_buffer.rs
index 405de1e..0d7b055 100644
--- a/src/draw_buffer.rs
+++ b/src/draw_buffer.rs
@@ -266,7 +266,7 @@ impl DrawBufferHelpers for DrawBuffer {
                 let mut texture = Texture::new(target, Size2D::new(self.size.width as usize, self.size.height as usize));
                 texture.flip = flip;
 
-                let surface_wrapper = LayersSurfaceWrapper::new(context.get_metadata(), self.size, self.size.width * (if attrs.alpha { 4 } else { 3 }));
+                let surface_wrapper = LayersSurfaceWrapper::new(context.get_metadata(), self.size);
                 surface_wrapper.bind_to_texture(&texture);
 
                 Some(ColorAttachment::TextureWithSurface(surface_wrapper, texture))
diff --git a/src/layers_surface_wrapper.rs b/src/layers_surface_wrapper.rs
index 9f03d4f..240ba53 100644
--- a/src/layers_surface_wrapper.rs
+++ b/src/layers_surface_wrapper.rs
@@ -29,13 +29,12 @@ fn create_compositing_context(_: &NativeGraphicsMetadata) -> NativeCompositingGr
 }
 
 impl LayersSurfaceWrapper {
-    pub fn new(metadata: NativeGraphicsMetadata, size: Size2D<i32>, stride: i32) -> LayersSurfaceWrapper {
+    pub fn new(metadata: NativeGraphicsMetadata, size: Size2D<i32>) -> LayersSurfaceWrapper {
         let graphics_ctx = NativePaintingGraphicsContext::from_metadata(&metadata);
 
         let compositing_ctx = create_compositing_context(&metadata);
 
-        // TODO(ecoal95): Check if size.width is the stride we must use
-        let mut surf = NativeSurface::new(&graphics_ctx, size, stride);
+        let mut surf = NativeSurface::new(&graphics_ctx, size);
         surf.mark_will_leak();
 
         LayersSurfaceWrapper {