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

layout: Carry out some minor style cleanups.

Browse source
This commit is contained in:
Patrick Walton 2015-08-07 18:15:39 -07:00
parent 300315bb78
commit bf26a2373f
3 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/compositing/compositor.rs
View file

@ -255,13 +255,13 @@ impl<Window: WindowMethods> IOCompositor<Window> {
time_profiler_chan: time::ProfilerChan, time_profiler_chan: time::ProfilerChan,
mem_profiler_chan: mem::ProfilerChan) mem_profiler_chan: mem::ProfilerChan)
-> IOCompositor<Window> { -> IOCompositor<Window> {
// Register this thread as a memory reporter, via its own channel. // Register this thread as a memory reporter, via its own channel.
let (reporter_sender, reporter_receiver) = ipc::channel().unwrap(); let (reporter_sender, reporter_receiver) = ipc::channel().unwrap();
let compositor_proxy_for_memory_reporter = sender.clone_compositor_proxy(); let compositor_proxy_for_memory_reporter = sender.clone_compositor_proxy();
ROUTER.add_route(reporter_receiver.to_opaque(), box move |reporter_request| { ROUTER.add_route(reporter_receiver.to_opaque(), box move |reporter_request| {
let reporter_request: ReporterRequest = reporter_request.to().unwrap(); let reporter_request: ReporterRequest = reporter_request.to().unwrap();
compositor_proxy_for_memory_reporter.send(Msg::CollectMemoryReports(reporter_request.reports_channel)); compositor_proxy_for_memory_reporter.send(Msg::CollectMemoryReports(
reporter_request.reports_channel));
}); });
let reporter = Reporter(reporter_sender); let reporter = Reporter(reporter_sender);
mem_profiler_chan.send(mem::ProfilerMsg::RegisterReporter(reporter_name(), reporter)); mem_profiler_chan.send(mem::ProfilerMsg::RegisterReporter(reporter_name(), reporter));
@ -376,7 +376,8 @@ impl<Window: WindowMethods> IOCompositor<Window> {
self.get_title_for_main_frame(); self.get_title_for_main_frame();
} }
(Msg::InitializeLayersForPipeline(pipeline_id, epoch, properties), ShutdownState::NotShuttingDown) => { (Msg::InitializeLayersForPipeline(pipeline_id, epoch, properties),
ShutdownState::NotShuttingDown) => {
self.get_or_create_pipeline_details(pipeline_id).current_epoch = epoch; self.get_or_create_pipeline_details(pipeline_id).current_epoch = epoch;
for (index, layer_properties) in properties.iter().enumerate() { for (index, layer_properties) in properties.iter().enumerate() {
if index == 0 { if index == 0 {
@ -692,7 +693,9 @@ impl<Window: WindowMethods> IOCompositor<Window> {
} }
} }
fn create_or_update_base_layer(&mut self, pipeline_id: PipelineId, layer_properties: LayerProperties) { fn create_or_update_base_layer(&mut self,
pipeline_id: PipelineId,
layer_properties: LayerProperties) {
debug_assert!(layer_properties.parent_id.is_none()); debug_assert!(layer_properties.parent_id.is_none());
let root_layer = match self.find_pipeline_root_layer(pipeline_id) { let root_layer = match self.find_pipeline_root_layer(pipeline_id) {

4
components/gfx/paint_task.rs
View file

@ -334,7 +334,9 @@ impl<C> PaintTask<C> where C: PaintListener + Send + 'static {
&Matrix4::identity(), &Matrix4::identity(),
&Matrix4::identity(), &Matrix4::identity(),
None); None);
self.compositor.initialize_layers_for_pipeline(self.id, properties, self.current_epoch.unwrap()); self.compositor.initialize_layers_for_pipeline(self.id,
properties,
self.current_epoch.unwrap());
fn build(properties: &mut Vec<LayerProperties>, fn build(properties: &mut Vec<LayerProperties>,
stacking_context: &StackingContext, stacking_context: &StackingContext,

15
components/layout/display_list_builder.rs
View file

@ -477,7 +477,7 @@ impl FragmentDisplayListBuilding for Fragment {
(-border.left, -border.top) (-border.left, -border.top)
} }
background_origin::T::content_box => { background_origin::T::content_box => {
let border_padding = (self.border_padding).to_physical(self.style.writing_mode); let border_padding = self.border_padding.to_physical(self.style.writing_mode);
(border_padding.left - border.left, border_padding.top - border.top) (border_padding.left - border.left, border_padding.top - border.top)
} }
}; };
@ -676,10 +676,11 @@ impl FragmentDisplayListBuilding for Fragment {
clip: &ClippingRegion) { clip: &ClippingRegion) {
// NB: According to CSS-BACKGROUNDS, box shadows render in *reverse* order (front to back). // NB: According to CSS-BACKGROUNDS, box shadows render in *reverse* order (front to back).
for box_shadow in style.get_effects().box_shadow.0.iter().rev() { for box_shadow in style.get_effects().box_shadow.0.iter().rev() {
let bounds = shadow_bounds(&absolute_bounds.translate(&Point2D::new(box_shadow.offset_x, let bounds =
box_shadow.offset_y)), shadow_bounds(&absolute_bounds.translate(&Point2D::new(box_shadow.offset_x,
box_shadow.blur_radius, box_shadow.offset_y)),
box_shadow.spread_radius); box_shadow.blur_radius,
box_shadow.spread_radius);
list.push(DisplayItem::BoxShadowClass(box BoxShadowDisplayItem { list.push(DisplayItem::BoxShadowClass(box BoxShadowDisplayItem {
base: BaseDisplayItem::new(bounds, base: BaseDisplayItem::new(bounds,
DisplayItemMetadata::new(self.node, DisplayItemMetadata::new(self.node,
@ -1557,7 +1558,9 @@ impl BlockFlowDisplayListBuilding for BlockFlow {
ScrollPolicy::Scrollable ScrollPolicy::Scrollable
}; };
let paint_layer = PaintLayer::new(self.layer_id(0), color::transparent(), scroll_policy); let paint_layer = PaintLayer::new(self.layer_id(0),
color::transparent(),
scroll_policy);
let layer = StackingContextLayer::Existing(paint_layer); let layer = StackingContextLayer::Existing(paint_layer);
let stacking_context = self.fragment.create_stacking_context( let stacking_context = self.fragment.create_stacking_context(
&self.base, &self.base,