diff --git a/src/rust-layers b/src/rust-layers index eb86bb090d6..ce1f192686d 160000 --- a/src/rust-layers +++ b/src/rust-layers @@ -1 +1 @@ -Subproject commit eb86bb090d6bbf5f543c75756b52ba42d1ec3ddf +Subproject commit ce1f192686d0d4acebdcdc8280c9054826c81bf1 diff --git a/src/servo/gfx/render_layers.rs b/src/servo/gfx/render_layers.rs index 1c979409f7d..6826308ff13 100644 --- a/src/servo/gfx/render_layers.rs +++ b/src/servo/gfx/render_layers.rs @@ -50,6 +50,8 @@ pub fn render_layers(layer: &RenderLayer, assert stride % 32 == 0; assert stride >= width; + debug!("tile stride %u", stride); + let tile_rect = Rect(Point2D(x, y), Size2D(width, height)); let buffer; diff --git a/src/servo/platform/osmain.rs b/src/servo/platform/osmain.rs index a16b8662b5a..8f6561a5317 100644 --- a/src/servo/platform/osmain.rs +++ b/src/servo/platform/osmain.rs @@ -103,15 +103,19 @@ fn mainloop(mode: Mode, let context = layers::rendergl::init_render_context(); - let image_data = @layers::layers::BasicImageData::new( - Size2D(0u, 0u), 0, layers::layers::RGB24Format, ~[]); - let image = @layers::layers::Image::new(image_data as @layers::layers::ImageData); - let image_layer = @layers::layers::ImageLayer(image); - let original_layer_transform = image_layer.common.transform; - image_layer.common.set_transform(original_layer_transform.scale(&800.0f32, &600.0f32, &1f32)); - let root_layer = @layers::layers::ContainerLayer(); - root_layer.add_child(layers::layers::ImageLayerKind(image_layer)); + let original_layer_transform; + { + let image_data = @layers::layers::BasicImageData::new( + Size2D(0u, 0u), 0, layers::layers::RGB24Format, ~[]); + let image = @layers::layers::Image::new(image_data as @layers::layers::ImageData); + let image_layer = @layers::layers::ImageLayer(image); + original_layer_transform = image_layer.common.transform; + image_layer.common.set_transform(original_layer_transform.scale(&800.0f32, &600.0f32, + &1f32)); + root_layer.add_child(layers::layers::ImageLayerKind(image_layer)); + } + let scene = @layers::scene::Scene(layers::layers::ContainerLayerKind(root_layer), Size2D(800.0f32, 600.0f32),