auto merge of #5125 : glennw/servo/remove-iframe-layers, r=larsbergstrom

This commit is contained in:
bors-servo 2015-03-03 15:12:45 -07:00
commit e19fbc686c
10 changed files with 145 additions and 37 deletions

View file

@ -52,6 +52,7 @@ use geom::{Point2D, Rect, Size2D};
use gfx::display_list::{ClippingRegion, DisplayList};
use rustc_serialize::{Encoder, Encodable};
use msg::compositor_msg::LayerId;
use msg::constellation_msg::ConstellationChan;
use servo_util::geometry::{Au, MAX_AU};
use servo_util::logical_geometry::{LogicalPoint, LogicalRect, LogicalSize};
use servo_util::opts;
@ -1919,6 +1920,10 @@ impl Flow for BlockFlow {
CoordinateSystem::Parent)
.translate(stacking_context_position));
}
fn remove_compositor_layers(&self, constellation_chan: ConstellationChan) {
self.fragment.remove_compositor_layers(constellation_chan);
}
}
impl fmt::Debug for BlockFlow {