mirror of
https://github.com/servo/servo.git
synced 2025-08-03 12:40:06 +01:00
Rename gfx/render_task.rs -> gfx/paint_task.rs
This commit is contained in:
parent
ccef723851
commit
daba904302
10 changed files with 12 additions and 12 deletions
|
@ -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::render_task::{RenderChan, RenderMsg, RenderRequest, UnusedBufferMsg};
|
use gfx::paint_task::{RenderChan, RenderMsg, RenderRequest, 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;
|
||||||
|
|
|
@ -14,7 +14,7 @@ use geom::matrix::identity;
|
||||||
use geom::point::{Point2D, TypedPoint2D};
|
use geom::point::{Point2D, TypedPoint2D};
|
||||||
use geom::size::{Size2D, TypedSize2D};
|
use geom::size::{Size2D, TypedSize2D};
|
||||||
use geom::rect::Rect;
|
use geom::rect::Rect;
|
||||||
use gfx::render_task::UnusedBufferMsg;
|
use gfx::paint_task::UnusedBufferMsg;
|
||||||
use layers::color::Color;
|
use layers::color::Color;
|
||||||
use layers::geometry::LayerPixel;
|
use layers::geometry::LayerPixel;
|
||||||
use layers::layers::{Layer, LayerBufferSet};
|
use layers::layers::{Layer, LayerBufferSet};
|
||||||
|
|
|
@ -10,7 +10,7 @@ use devtools_traits::DevtoolsControlChan;
|
||||||
use geom::rect::{Rect, TypedRect};
|
use geom::rect::{Rect, TypedRect};
|
||||||
use geom::scale_factor::ScaleFactor;
|
use geom::scale_factor::ScaleFactor;
|
||||||
use gfx::font_cache_task::FontCacheTask;
|
use gfx::font_cache_task::FontCacheTask;
|
||||||
use gfx::render_task;
|
use gfx::paint_task;
|
||||||
use layers::geometry::DevicePixel;
|
use layers::geometry::DevicePixel;
|
||||||
use layout_traits::{LayoutControlChan, LayoutTaskFactory, ExitNowMsg};
|
use layout_traits::{LayoutControlChan, LayoutTaskFactory, ExitNowMsg};
|
||||||
use libc;
|
use libc;
|
||||||
|
@ -506,7 +506,7 @@ impl<LTF: LayoutTaskFactory, STF: ScriptTaskFactory> Constellation<LTF, STF> {
|
||||||
fn force_pipeline_exit(old_pipeline: &Rc<Pipeline>) {
|
fn force_pipeline_exit(old_pipeline: &Rc<Pipeline>) {
|
||||||
let ScriptControlChan(ref old_script) = old_pipeline.script_chan;
|
let ScriptControlChan(ref old_script) = old_pipeline.script_chan;
|
||||||
let _ = old_script.send_opt(ExitPipelineMsg(old_pipeline.id));
|
let _ = old_script.send_opt(ExitPipelineMsg(old_pipeline.id));
|
||||||
let _ = old_pipeline.render_chan.send_opt(render_task::ExitMsg(None));
|
let _ = old_pipeline.render_chan.send_opt(paint_task::ExitMsg(None));
|
||||||
let LayoutControlChan(ref old_layout) = old_pipeline.layout_chan;
|
let LayoutControlChan(ref old_layout) = old_pipeline.layout_chan;
|
||||||
let _ = old_layout.send_opt(ExitNowMsg);
|
let _ = old_layout.send_opt(ExitNowMsg);
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,8 +8,8 @@ use script_traits::{ScriptControlChan, ScriptTaskFactory};
|
||||||
use script_traits::{AttachLayoutMsg, LoadMsg, NewLayoutInfo, ExitPipelineMsg};
|
use script_traits::{AttachLayoutMsg, LoadMsg, NewLayoutInfo, ExitPipelineMsg};
|
||||||
|
|
||||||
use devtools_traits::DevtoolsControlChan;
|
use devtools_traits::DevtoolsControlChan;
|
||||||
use gfx::render_task::{PaintPermissionGranted, PaintPermissionRevoked};
|
use gfx::paint_task::{PaintPermissionGranted, PaintPermissionRevoked};
|
||||||
use gfx::render_task::{RenderChan, RenderTask};
|
use gfx::paint_task::{RenderChan, RenderTask};
|
||||||
use servo_msg::constellation_msg::{ConstellationChan, Failure, PipelineId, SubpageId};
|
use servo_msg::constellation_msg::{ConstellationChan, Failure, PipelineId, SubpageId};
|
||||||
use servo_msg::constellation_msg::{LoadData, WindowSizeData};
|
use servo_msg::constellation_msg::{LoadData, WindowSizeData};
|
||||||
use servo_net::image_cache_task::ImageCacheTask;
|
use servo_net::image_cache_task::ImageCacheTask;
|
||||||
|
|
|
@ -24,7 +24,7 @@ use azure::azure::AzFloat;
|
||||||
use collections::dlist::{mod, DList};
|
use collections::dlist::{mod, DList};
|
||||||
use geom::{Point2D, Rect, SideOffsets2D, Size2D, Matrix2D};
|
use geom::{Point2D, Rect, SideOffsets2D, Size2D, Matrix2D};
|
||||||
use libc::uintptr_t;
|
use libc::uintptr_t;
|
||||||
use render_task::RenderLayer;
|
use paint_task::RenderLayer;
|
||||||
use script_traits::UntrustedNodeAddress;
|
use script_traits::UntrustedNodeAddress;
|
||||||
use servo_msg::compositor_msg::LayerId;
|
use servo_msg::compositor_msg::LayerId;
|
||||||
use servo_net::image::base::Image;
|
use servo_net::image::base::Image;
|
||||||
|
|
|
@ -59,7 +59,7 @@ mod render_context;
|
||||||
pub mod color;
|
pub mod color;
|
||||||
#[path="display_list/mod.rs"]
|
#[path="display_list/mod.rs"]
|
||||||
pub mod display_list;
|
pub mod display_list;
|
||||||
pub mod render_task;
|
pub mod paint_task;
|
||||||
|
|
||||||
// Fonts
|
// Fonts
|
||||||
pub mod font;
|
pub mod font;
|
||||||
|
|
|
@ -30,7 +30,7 @@ use gfx::display_list::{ImageDisplayItem, ImageDisplayItemClass, LineDisplayItem
|
||||||
use gfx::display_list::{LineDisplayItemClass, PseudoDisplayItemClass, SidewaysLeft, SidewaysRight};
|
use gfx::display_list::{LineDisplayItemClass, PseudoDisplayItemClass, SidewaysLeft, SidewaysRight};
|
||||||
use gfx::display_list::{SolidColorDisplayItem, SolidColorDisplayItemClass, StackingContext};
|
use gfx::display_list::{SolidColorDisplayItem, SolidColorDisplayItemClass, StackingContext};
|
||||||
use gfx::display_list::{TextDisplayItem, TextDisplayItemClass, Upright};
|
use gfx::display_list::{TextDisplayItem, TextDisplayItemClass, Upright};
|
||||||
use gfx::render_task::RenderLayer;
|
use gfx::paint_task::RenderLayer;
|
||||||
use servo_msg::compositor_msg::{FixedPosition, Scrollable};
|
use servo_msg::compositor_msg::{FixedPosition, Scrollable};
|
||||||
use servo_msg::constellation_msg::{ConstellationChan, FrameRectMsg};
|
use servo_msg::constellation_msg::{ConstellationChan, FrameRectMsg};
|
||||||
use servo_net::image::holder::ImageHolder;
|
use servo_net::image::holder::ImageHolder;
|
||||||
|
|
|
@ -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::render_task::{mod, RenderInitMsg, RenderChan, RenderLayer};
|
use gfx::paint_task::{mod, RenderInitMsg, RenderChan, RenderLayer};
|
||||||
use layout_traits;
|
use layout_traits;
|
||||||
use layout_traits::{LayoutControlMsg, LayoutTaskFactory};
|
use layout_traits::{LayoutControlMsg, LayoutTaskFactory};
|
||||||
use log;
|
use log;
|
||||||
|
@ -463,7 +463,7 @@ impl LayoutTask {
|
||||||
LayoutTask::return_rw_data(possibly_locked_rw_data, rw_data);
|
LayoutTask::return_rw_data(possibly_locked_rw_data, rw_data);
|
||||||
}
|
}
|
||||||
|
|
||||||
self.render_chan.send(render_task::ExitMsg(Some(response_chan)));
|
self.render_chan.send(paint_task::ExitMsg(Some(response_chan)));
|
||||||
response_port.recv()
|
response_port.recv()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@ extern crate "util" as servo_util;
|
||||||
// that these modules won't have to depend on layout.
|
// that these modules won't have to depend on layout.
|
||||||
|
|
||||||
use gfx::font_cache_task::FontCacheTask;
|
use gfx::font_cache_task::FontCacheTask;
|
||||||
use gfx::render_task::RenderChan;
|
use gfx::paint_task::RenderChan;
|
||||||
use servo_msg::constellation_msg::{ConstellationChan, PipelineId};
|
use servo_msg::constellation_msg::{ConstellationChan, PipelineId};
|
||||||
use servo_msg::constellation_msg::Failure;
|
use servo_msg::constellation_msg::Failure;
|
||||||
use servo_net::image_cache_task::ImageCacheTask;
|
use servo_net::image_cache_task::ImageCacheTask;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue