mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Rename RenderLayer -> PaintLayer
This commit is contained in:
parent
d87def0743
commit
cee3d517e8
4 changed files with 19 additions and 19 deletions
|
@ -30,7 +30,7 @@ use gfx::display_list::{ImageDisplayItem, ImageDisplayItemClass, LineDisplayItem
|
|||
use gfx::display_list::{LineDisplayItemClass, PseudoDisplayItemClass, SidewaysLeft, SidewaysRight};
|
||||
use gfx::display_list::{SolidColorDisplayItem, SolidColorDisplayItemClass, StackingContext};
|
||||
use gfx::display_list::{TextDisplayItem, TextDisplayItemClass, Upright};
|
||||
use gfx::paint_task::RenderLayer;
|
||||
use gfx::paint_task::PaintLayer;
|
||||
use servo_msg::compositor_msg::{FixedPosition, Scrollable};
|
||||
use servo_msg::constellation_msg::{ConstellationChan, FrameRectMsg};
|
||||
use servo_net::image::holder::ImageHolder;
|
||||
|
@ -812,7 +812,7 @@ pub trait BlockFlowDisplayListBuilding {
|
|||
fn build_display_list_for_floating_block(&mut self, layout_context: &LayoutContext);
|
||||
fn create_stacking_context(&self,
|
||||
display_list: Box<DisplayList>,
|
||||
layer: Option<Arc<RenderLayer>>)
|
||||
layer: Option<Arc<PaintLayer>>)
|
||||
-> Arc<StackingContext>;
|
||||
}
|
||||
|
||||
|
@ -875,7 +875,7 @@ impl BlockFlowDisplayListBuilding for BlockFlow {
|
|||
let transparent = color::rgba(1.0, 1.0, 1.0, 0.0);
|
||||
let stacking_context =
|
||||
self.create_stacking_context(display_list,
|
||||
Some(Arc::new(RenderLayer::new(self.layer_id(0),
|
||||
Some(Arc::new(PaintLayer::new(self.layer_id(0),
|
||||
transparent,
|
||||
scroll_policy))));
|
||||
self.base.display_list_building_result = StackingContextResult(stacking_context)
|
||||
|
@ -897,7 +897,7 @@ impl BlockFlowDisplayListBuilding for BlockFlow {
|
|||
|
||||
fn create_stacking_context(&self,
|
||||
display_list: Box<DisplayList>,
|
||||
layer: Option<Arc<RenderLayer>>)
|
||||
layer: Option<Arc<PaintLayer>>)
|
||||
-> Arc<StackingContext> {
|
||||
let bounds = Rect(self.base.stacking_relative_position,
|
||||
self.base.overflow.size.to_physical(self.base.writing_mode));
|
||||
|
|
|
@ -28,7 +28,7 @@ use geom::scale_factor::ScaleFactor;
|
|||
use gfx::color;
|
||||
use gfx::display_list::{DisplayList, OpaqueNode, StackingContext};
|
||||
use gfx::font_cache_task::FontCacheTask;
|
||||
use gfx::paint_task::{mod, RenderInitMsg, RenderChan, RenderLayer};
|
||||
use gfx::paint_task::{mod, RenderInitMsg, RenderChan, PaintLayer};
|
||||
use layout_traits;
|
||||
use layout_traits::{LayoutControlMsg, LayoutTaskFactory};
|
||||
use log;
|
||||
|
@ -676,7 +676,7 @@ impl LayoutTask {
|
|||
let mut display_list = box DisplayList::new();
|
||||
flow::mut_base(layout_root.deref_mut()).display_list_building_result
|
||||
.add_to(&mut *display_list);
|
||||
let render_layer = Arc::new(RenderLayer::new(layout_root.layer_id(0),
|
||||
let paint_layer = Arc::new(PaintLayer::new(layout_root.layer_id(0),
|
||||
color,
|
||||
Scrollable));
|
||||
let origin = Rect(Point2D(Au(0), Au(0)), root_size);
|
||||
|
@ -684,7 +684,7 @@ impl LayoutTask {
|
|||
origin,
|
||||
0,
|
||||
1.0,
|
||||
Some(render_layer)));
|
||||
Some(paint_layer)));
|
||||
|
||||
rw_data.stacking_context = Some(stacking_context.clone());
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue