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

Fix crash on executing URL with hashtag(local bookmark)

Browse source
This commit is contained in:
Junyoung Cho 2013-12-30 15:16:41 +09:00
parent 2b487ed3e9
commit 755a158131
1 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -93,7 +93,10 @@ pub struct IOCompositor {
constellation_chan: ConstellationChan, constellation_chan: ConstellationChan,
/// The channel on which messages can be sent to the profiler. /// The channel on which messages can be sent to the profiler.
profiler_chan: ProfilerChan profiler_chan: ProfilerChan,
/// Pending scroll to fragment event, if any
fragment_point: Option<Point2D<f32>>
} }
impl IOCompositor { impl IOCompositor {
@ -129,7 +132,8 @@ impl IOCompositor {
zoom_time: 0f64, zoom_time: 0f64,
compositor_layer: None, compositor_layer: None,
constellation_chan: constellation_chan.clone(), constellation_chan: constellation_chan.clone(),
profiler_chan: profiler_chan profiler_chan: profiler_chan,
fragment_point: None
} }
} }
@ -336,6 +340,13 @@ impl IOCompositor {
let page_window = Size2D(window_size.width as f32 / world_zoom, let page_window = Size2D(window_size.width as f32 / world_zoom,
window_size.height as f32 / world_zoom); window_size.height as f32 / world_zoom);
assert!(layer.resize(id, new_size, page_window, epoch)); assert!(layer.resize(id, new_size, page_window, epoch));
match self.fragment_point.take() {
Some(point) => {
let recomposite = layer.move(point, page_window) | self.recomposite;
self.recomposite = recomposite;
},
None => {}
}
true true
} }
None => { None => {
@ -432,13 +443,15 @@ impl IOCompositor {
let page_window = Size2D(self.window_size.width as f32 / world_zoom, let page_window = Size2D(self.window_size.width as f32 / world_zoom,
self.window_size.height as f32 / world_zoom); self.window_size.height as f32 / world_zoom);
let ask: bool = match self.compositor_layer { let ask: bool = match self.compositor_layer {
Some(ref mut layer) if layer.pipeline.id == id => { Some(ref mut layer) if layer.pipeline.id == id && !layer.hidden => {
let recomposite = layer.move(point, page_window) | self.recomposite; let recomposite = layer.move(point, page_window) | self.recomposite;
self.recomposite = recomposite; self.recomposite = recomposite;
true true
} }
Some(_) | None => { Some(_) | None => {
self.fragment_point = Some(point);
false false
} }
}; };