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

Rebase and fix up compile errors for rust upgrade.

Browse source
This commit is contained in:
Glenn Watson 2014-11-13 11:25:19 +10:00
parent fe662bbf23
commit 0a0b4c657c
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/script/dom/bindings/trace.rs
View file

@ -51,7 +51,7 @@ use servo_msg::constellation_msg::ConstellationChan;
use servo_util::smallvec::{SmallVec1, SmallVec};
use servo_util::str::LengthOrPercentageOrAuto;
use std::cell::{Cell, RefCell};
use std::collections::hashmap::HashMap;
use std::collections::HashMap;
use std::comm::{Receiver, Sender};
use std::io::timer::Timer;
use std::rc::Rc;

4
components/script/script_task.rs
View file

@ -494,7 +494,7 @@ impl ScriptTask {
needs_reflow.insert(id);
}
FromConstellation(ViewportMsg(id, rect)) => {
let mut page = self.page.borrow_mut();
let page = self.page.borrow_mut();
let inner_page = page.find(id).expect("Page rect message sent to nonexistent pipeline");
if inner_page.set_page_clip_rect_with_new_viewport(rect) {
needs_reflow.insert(id);
@ -535,7 +535,7 @@ impl ScriptTask {
FromConstellation(ReflowCompleteMsg(id, reflow_id)) => self.handle_reflow_complete_msg(id, reflow_id),
FromConstellation(ResizeInactiveMsg(id, new_size)) => self.handle_resize_inactive_msg(id, new_size),
FromConstellation(ExitPipelineMsg(id)) => if self.handle_exit_pipeline_msg(id) { return false },
FromConstellation(ViewportMsg(..)) => fail!("should have handled ViewportMsg already"),
FromConstellation(ViewportMsg(..)) => panic!("should have handled ViewportMsg already"),
FromScript(ExitWindowMsg(id)) => self.handle_exit_window_msg(id),
FromConstellation(ResizeMsg(..)) => panic!("should have handled ResizeMsg already"),
FromScript(XHRProgressMsg(addr, progress)) => XMLHttpRequest::handle_progress(addr, progress),