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

Simplify CompositorData creation

Browse source 
We already have a layer_properties struct, so we should always use it
instead of passing the information in it out-of-band.
This commit is contained in:
Cameron Zwarich 2014-07-19 20:14:42 -07:00
parent 61105dcbff
commit 31049adc1d
2 changed files with 23 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/components/compositing/compositor.rs
View file

@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use compositor_data::CompositorData;
use compositor_data::{CompositorData, WantsScrollEvents};
use compositor_task::{Msg, CompositorTask, Exit, ChangeReadyState, SetIds, LayerProperties};
use compositor_task::{GetGraphicsMetadata, CreateOrUpdateRootLayer, CreateOrUpdateDescendantLayer};
use compositor_task::{SetLayerClipRect, Paint, ScrollFragmentPoint, LoadComplete};
@ -34,7 +34,7 @@ use layers::scene::Scene;
use layers::layers::Layer;
use opengles::gl2;
use png;
use servo_msg::compositor_msg::{Blank, Epoch, FinishedLoading, IdleRenderState};
use servo_msg::compositor_msg::{Blank, Epoch, FixedPosition, FinishedLoading, IdleRenderState};
use servo_msg::compositor_msg::{LayerId, ReadyState, RenderState};
use servo_msg::constellation_msg::{ConstellationChan, ExitMsg, LoadUrlMsg, NavigateMsg};
use servo_msg::constellation_msg::{PipelineId, ResizedWindowMsg, WindowSizeData};
@ -364,9 +364,18 @@ impl IOCompositor {
Some(ref root_pipeline) => root_pipeline.clone(),
None => fail!("Compositor: Making new layer without initialized pipeline"),
};
let new_compositor_data = CompositorData::new_root(root_pipeline,
layer_properties.epoch,
layer_properties.background_color);
let root_properties = LayerProperties {
pipeline_id: root_pipeline.id,
epoch: layer_properties.epoch,
id: LayerId::null(),
rect: Rect::zero(),
background_color: layer_properties.background_color,
scroll_policy: FixedPosition,
};
let new_compositor_data = CompositorData::new(root_pipeline,
root_properties,
WantsScrollEvents);
let new_root = Rc::new(Layer::new(layer_properties.rect,
self.opts.tile_size,
new_compositor_data));

35
src/components/compositing/compositor_data.rs
View file

@ -13,7 +13,7 @@ use geom::size::{Size2D, TypedSize2D};
use gfx::render_task::{ReRenderRequest, RenderChan, UnusedBufferMsg};
use layers::layers::{Layer, LayerBufferSet};
use layers::platform::surface::NativeSurfaceMethods;
use servo_msg::compositor_msg::{Epoch, FixedPosition, LayerId};
use servo_msg::compositor_msg::{Epoch, LayerId};
use servo_msg::compositor_msg::ScrollPolicy;
use servo_msg::constellation_msg::PipelineId;
use servo_util::geometry::PagePx;
@ -53,45 +53,28 @@ pub enum WantsScrollEventsFlag {
impl CompositorData {
pub fn new(pipeline: CompositionPipeline,
layer_id: LayerId,
epoch: Epoch,
wants_scroll_events: WantsScrollEventsFlag,
scroll_policy: ScrollPolicy,
background_color: Color)
layer_properties: LayerProperties,
wants_scroll_events: WantsScrollEventsFlag)
-> CompositorData {
CompositorData {
pipeline: pipeline,
id: layer_id,
id: layer_properties.id,
scroll_offset: TypedPoint2D(0f32, 0f32),
wants_scroll_events: wants_scroll_events,
scroll_policy: scroll_policy,
background_color: background_color,
epoch: epoch,
scroll_policy: layer_properties.scroll_policy,
background_color: layer_properties.background_color,
epoch: layer_properties.epoch,
}
}
pub fn new_root(pipeline: CompositionPipeline,
epoch: Epoch,
background_color: Color) -> CompositorData {
CompositorData::new(pipeline,
LayerId::null(),
epoch,
WantsScrollEvents,
FixedPosition,
background_color)
}
/// Adds a child layer to the layer with the given ID and the given pipeline, if it doesn't
/// exist yet. The child layer will have the same pipeline, tile size, memory limit, and CPU
/// painting status as its parent.
pub fn add_child(layer: Rc<Layer<CompositorData>>,
layer_properties: LayerProperties) {
let new_compositor_data = CompositorData::new(layer.extra_data.borrow().pipeline.clone(),
layer_properties.id,
layer_properties.epoch,
DoesntWantScrollEvents,
layer_properties.scroll_policy,
layer_properties.background_color);
layer_properties,
DoesntWantScrollEvents);
let new_kid = Rc::new(Layer::new(layer_properties.rect,
layer.tile_size,
new_compositor_data));