Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-19 22:59:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

removed unused constellation chan from render task

Browse source
This commit is contained in:
Tim Kuehn 2013-07-03 16:32:50 -07:00
parent dc8e3cbf9b
commit 1f55db99bb
3 changed files with 1 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/components/gfx/render_task.rs
View file

@ -9,7 +9,6 @@ use azure::azure_hl::{B8G8R8A8, DrawTarget};
use display_list::DisplayList; use display_list::DisplayList;
use servo_msg::compositor_msg::{RenderListener, IdleRenderState, RenderingRenderState, LayerBuffer}; use servo_msg::compositor_msg::{RenderListener, IdleRenderState, RenderingRenderState, LayerBuffer};
use servo_msg::compositor_msg::{LayerBufferSet}; use servo_msg::compositor_msg::{LayerBufferSet};
use servo_msg::constellation_msg::{ConstellationChan};
use font_context::FontContext; use font_context::FontContext;
use geom::matrix2d::Matrix2D; use geom::matrix2d::Matrix2D;
use geom::point::Point2D; use geom::point::Point2D;
@ -70,8 +69,6 @@ priv struct RenderTask<C> {
/// The layer to be rendered /// The layer to be rendered
render_layer: Option<RenderLayer>, render_layer: Option<RenderLayer>,
/// A channel to the constellation for -- just in case
constellation_chan: ConstellationChan,
/// Permission to send paint messages to the compositor /// Permission to send paint messages to the compositor
paint_permission: bool, paint_permission: bool,
/// Cached copy of last layers rendered /// Cached copy of last layers rendered
@ -83,19 +80,16 @@ impl<C: RenderListener + Owned> RenderTask<C> {
port: Port<Msg>, port: Port<Msg>,
compositor: C, compositor: C,
opts: Opts, opts: Opts,
constellation_chan: ConstellationChan,
profiler_chan: ProfilerChan) { profiler_chan: ProfilerChan) {
let compositor = Cell::new(compositor); let compositor = Cell::new(compositor);
let opts = Cell::new(opts); let opts = Cell::new(opts);
let port = Cell::new(port); let port = Cell::new(port);
let constellation_chan = Cell::new(constellation_chan);
let profiler_chan = Cell::new(profiler_chan); let profiler_chan = Cell::new(profiler_chan);
do spawn { do spawn {
let compositor = compositor.take(); let compositor = compositor.take();
let share_gl_context = compositor.get_gl_context(); let share_gl_context = compositor.get_gl_context();
let opts = opts.take(); let opts = opts.take();
let constellation_chan = constellation_chan.take();
let profiler_chan = profiler_chan.take(); let profiler_chan = profiler_chan.take();
// FIXME: rust/#5967 // FIXME: rust/#5967
@ -111,7 +105,6 @@ impl<C: RenderListener + Owned> RenderTask<C> {
share_gl_context: share_gl_context, share_gl_context: share_gl_context,
render_layer: None, render_layer: None,
constellation_chan: constellation_chan,
paint_permission: false, paint_permission: false,
last_paint_msg: None, last_paint_msg: None,
}; };

3
src/components/main/compositing/mod.rs
View file

@ -23,7 +23,6 @@ use std::comm;
use std::comm::{Chan, SharedChan, Port}; use std::comm::{Chan, SharedChan, Port};
use std::num::Orderable; use std::num::Orderable;
use std::task; use std::task;
use std::util;
use geom::matrix::identity; use geom::matrix::identity;
use geom::point::Point2D; use geom::point::Point2D;
use geom::size::Size2D; use geom::size::Size2D;
@ -289,7 +288,7 @@ impl CompositorTask {
// Iterate over the children of the container layer. // Iterate over the children of the container layer.
let mut current_layer_child = root_layer.first_child; let mut current_layer_child = root_layer.first_child;
for new_layer_buffer_set.buffers.each |buffer| { for new_layer_buffer_set.buffers.iter().advance |buffer| {
let width = buffer.rect.size.width as uint; let width = buffer.rect.size.width as uint;
let height = buffer.rect.size.height as uint; let height = buffer.rect.size.height as uint;

1
src/components/main/pipeline.rs
View file

@ -47,7 +47,6 @@ impl Pipeline {
render_port, render_port,
compositor_chan.clone(), compositor_chan.clone(),
copy opts, copy opts,
constellation_chan.clone(),
profiler_chan.clone()); profiler_chan.clone());
LayoutTask::create(layout_port, LayoutTask::create(layout_port,