diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs index bbdec47a6d3..8c9edd8ab36 100644 --- a/components/compositing/compositor.rs +++ b/components/compositing/compositor.rs @@ -29,7 +29,7 @@ use geom::point::{Point2D, TypedPoint2D}; use geom::rect::{Rect, TypedRect}; use geom::size::TypedSize2D; use geom::scale_factor::ScaleFactor; -use gfx::paint_task::{RenderChan, RenderMsg, RenderRequest, UnusedBufferMsg}; +use gfx::paint_task::{RenderChan, RenderMsg, PaintRequest, UnusedBufferMsg}; use layers::geometry::{DevicePixel, LayerPixel}; use layers::layers::{BufferRequest, Layer, LayerBufferSet}; use layers::rendergl; @@ -838,10 +838,10 @@ impl IOCompositor { requests: Vec<(Rc>, Vec)>) -> HashMap)> { + Vec)> { let scale = self.device_pixels_per_page_px(); let mut results: - HashMap)> = HashMap::new(); + HashMap)> = HashMap::new(); for (layer, mut layer_requests) in requests.into_iter() { let &(_, ref mut vec) = @@ -862,7 +862,7 @@ impl IOCompositor { request.page_rect = request.page_rect / scale.get(); } - vec.push(RenderRequest { + vec.push(PaintRequest { buffer_requests: layer_requests, scale: scale.get(), layer_id: layer.extra_data.borrow().id, diff --git a/components/gfx/paint_task.rs b/components/gfx/paint_task.rs index 1c78a2d2de9..e3e21b46965 100644 --- a/components/gfx/paint_task.rs +++ b/components/gfx/paint_task.rs @@ -60,7 +60,7 @@ impl PaintLayer { } } -pub struct RenderRequest { +pub struct PaintRequest { pub buffer_requests: Vec, pub scale: f32, pub layer_id: LayerId, @@ -69,7 +69,7 @@ pub struct RenderRequest { pub enum Msg { RenderInitMsg(Arc), - RenderMsg(Vec), + RenderMsg(Vec), UnusedBufferMsg(Vec>), PaintPermissionGranted, PaintPermissionRevoked, @@ -254,7 +254,7 @@ impl PaintTask where C: RenderListener + Send { let mut replies = Vec::new(); self.compositor.set_render_state(self.id, RenderingRenderState); - for RenderRequest { buffer_requests, scale, layer_id, epoch } + for PaintRequest { buffer_requests, scale, layer_id, epoch } in requests.into_iter() { if self.epoch == epoch { self.render(&mut replies, buffer_requests, scale, layer_id);