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

Rename RenderRequest -> PaintRequest

Browse source
This commit is contained in:
Tetsuharu OHZEKI 2014-12-08 03:54:41 +09:00
parent cee3d517e8
commit 9b6faaf7f0
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/compositing/compositor.rs
View file

@ -29,7 +29,7 @@ use geom::point::{Point2D, TypedPoint2D};
use geom::rect::{Rect, TypedRect}; use geom::rect::{Rect, TypedRect};
use geom::size::TypedSize2D; use geom::size::TypedSize2D;
use geom::scale_factor::ScaleFactor; 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::geometry::{DevicePixel, LayerPixel};
use layers::layers::{BufferRequest, Layer, LayerBufferSet}; use layers::layers::{BufferRequest, Layer, LayerBufferSet};
use layers::rendergl; use layers::rendergl;
@ -838,10 +838,10 @@ impl<Window: WindowMethods> IOCompositor<Window> {
requests: Vec<(Rc<Layer<CompositorData>>, requests: Vec<(Rc<Layer<CompositorData>>,
Vec<BufferRequest>)>) -> Vec<BufferRequest>)>) ->
HashMap<PipelineId, (RenderChan, HashMap<PipelineId, (RenderChan,
Vec<RenderRequest>)> { Vec<PaintRequest>)> {
let scale = self.device_pixels_per_page_px(); let scale = self.device_pixels_per_page_px();
let mut results: let mut results:
HashMap<PipelineId, (RenderChan, Vec<RenderRequest>)> = HashMap::new(); HashMap<PipelineId, (RenderChan, Vec<PaintRequest>)> = HashMap::new();
for (layer, mut layer_requests) in requests.into_iter() { for (layer, mut layer_requests) in requests.into_iter() {
let &(_, ref mut vec) = let &(_, ref mut vec) =
@ -862,7 +862,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
request.page_rect = request.page_rect / scale.get(); request.page_rect = request.page_rect / scale.get();
} }
vec.push(RenderRequest { vec.push(PaintRequest {
buffer_requests: layer_requests, buffer_requests: layer_requests,
scale: scale.get(), scale: scale.get(),
layer_id: layer.extra_data.borrow().id, layer_id: layer.extra_data.borrow().id,

6
components/gfx/paint_task.rs
View file

@ -60,7 +60,7 @@ impl PaintLayer {
} }
} }
pub struct RenderRequest { pub struct PaintRequest {
pub buffer_requests: Vec<BufferRequest>, pub buffer_requests: Vec<BufferRequest>,
pub scale: f32, pub scale: f32,
pub layer_id: LayerId, pub layer_id: LayerId,
@ -69,7 +69,7 @@ pub struct RenderRequest {
pub enum Msg { pub enum Msg {
RenderInitMsg(Arc<StackingContext>), RenderInitMsg(Arc<StackingContext>),
RenderMsg(Vec<RenderRequest>), RenderMsg(Vec<PaintRequest>),
UnusedBufferMsg(Vec<Box<LayerBuffer>>), UnusedBufferMsg(Vec<Box<LayerBuffer>>),
PaintPermissionGranted, PaintPermissionGranted,
PaintPermissionRevoked, PaintPermissionRevoked,
@ -254,7 +254,7 @@ impl<C> PaintTask<C> where C: RenderListener + Send {
let mut replies = Vec::new(); let mut replies = Vec::new();
self.compositor.set_render_state(self.id, RenderingRenderState); 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() { in requests.into_iter() {
if self.epoch == epoch { if self.epoch == epoch {
self.render(&mut replies, buffer_requests, scale, layer_id); self.render(&mut replies, buffer_requests, scale, layer_id);