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

Rename gfx::paint_task::Msg

Browse source
This commit is contained in:
Tetsuharu OHZEKI 2014-12-08 11:52:31 +09:00
parent 7ff790d941
commit 79722bdc03
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
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::{PaintChan, RenderMsg, PaintRequest, UnusedBufferMsg}; use gfx::paint_task::{PaintChan, PaintMsg, 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;
@ -379,7 +379,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
} }
fn has_render_msg_tracking(&self) -> bool { fn has_render_msg_tracking(&self) -> bool {
// only track RenderMsg's if the compositor outputs to a file. // only track PaintMsg's if the compositor outputs to a file.
opts::get().output_file.is_some() opts::get().output_file.is_some()
} }
@ -928,7 +928,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
let mut num_render_msgs_sent = 0; let mut num_render_msgs_sent = 0;
for (_pipeline_id, (chan, requests)) in pipeline_requests.into_iter() { for (_pipeline_id, (chan, requests)) in pipeline_requests.into_iter() {
num_render_msgs_sent += 1; num_render_msgs_sent += 1;
let _ = chan.send_opt(RenderMsg(requests)); let _ = chan.send_opt(PaintMsg(requests));
} }
self.add_outstanding_render_msg(num_render_msgs_sent); self.add_outstanding_render_msg(num_render_msgs_sent);

8
components/gfx/paint_task.rs
View file

@ -68,8 +68,8 @@ pub struct PaintRequest {
} }
pub enum Msg { pub enum Msg {
RenderInitMsg(Arc<StackingContext>), PaintInitMsg(Arc<StackingContext>),
RenderMsg(Vec<PaintRequest>), PaintMsg(Vec<PaintRequest>),
UnusedBufferMsg(Vec<Box<LayerBuffer>>), UnusedBufferMsg(Vec<Box<LayerBuffer>>),
PaintPermissionGranted, PaintPermissionGranted,
PaintPermissionRevoked, PaintPermissionRevoked,
@ -227,7 +227,7 @@ impl<C> PaintTask<C> where C: RenderListener + Send {
loop { loop {
match self.port.recv() { match self.port.recv() {
RenderInitMsg(stacking_context) => { PaintInitMsg(stacking_context) => {
self.epoch.next(); self.epoch.next();
self.root_stacking_context = Some(stacking_context.clone()); self.root_stacking_context = Some(stacking_context.clone());
@ -243,7 +243,7 @@ impl<C> PaintTask<C> where C: RenderListener + Send {
self.epoch, self.epoch,
&*stacking_context); &*stacking_context);
} }
RenderMsg(requests) => { PaintMsg(requests) => {
if !self.paint_permission { if !self.paint_permission {
debug!("paint_task: render ready msg"); debug!("paint_task: render ready msg");
let ConstellationChan(ref mut c) = self.constellation_chan; let ConstellationChan(ref mut c) = self.constellation_chan;

4
components/layout/layout_task.rs
View file

@ -28,7 +28,7 @@ use geom::scale_factor::ScaleFactor;
use gfx::color; use gfx::color;
use gfx::display_list::{DisplayList, OpaqueNode, StackingContext}; use gfx::display_list::{DisplayList, OpaqueNode, StackingContext};
use gfx::font_cache_task::FontCacheTask; use gfx::font_cache_task::FontCacheTask;
use gfx::paint_task::{mod, RenderInitMsg, PaintChan, PaintLayer}; use gfx::paint_task::{mod, PaintInitMsg, PaintChan, PaintLayer};
use layout_traits; use layout_traits;
use layout_traits::{LayoutControlMsg, LayoutTaskFactory}; use layout_traits::{LayoutControlMsg, LayoutTaskFactory};
use log; use log;
@ -690,7 +690,7 @@ impl LayoutTask {
debug!("Layout done!"); debug!("Layout done!");
self.paint_chan.send(RenderInitMsg(stacking_context)); self.paint_chan.send(PaintInitMsg(stacking_context));
}); });
} }