mirror of
https://github.com/servo/servo.git
synced 2025-08-03 20:50:07 +01:00
Rebase and fix up compile errors for rust upgrade.
This commit is contained in:
parent
fe662bbf23
commit
0a0b4c657c
2 changed files with 3 additions and 3 deletions
|
@ -51,7 +51,7 @@ use servo_msg::constellation_msg::ConstellationChan;
|
||||||
use servo_util::smallvec::{SmallVec1, SmallVec};
|
use servo_util::smallvec::{SmallVec1, SmallVec};
|
||||||
use servo_util::str::LengthOrPercentageOrAuto;
|
use servo_util::str::LengthOrPercentageOrAuto;
|
||||||
use std::cell::{Cell, RefCell};
|
use std::cell::{Cell, RefCell};
|
||||||
use std::collections::hashmap::HashMap;
|
use std::collections::HashMap;
|
||||||
use std::comm::{Receiver, Sender};
|
use std::comm::{Receiver, Sender};
|
||||||
use std::io::timer::Timer;
|
use std::io::timer::Timer;
|
||||||
use std::rc::Rc;
|
use std::rc::Rc;
|
||||||
|
|
|
@ -494,7 +494,7 @@ impl ScriptTask {
|
||||||
needs_reflow.insert(id);
|
needs_reflow.insert(id);
|
||||||
}
|
}
|
||||||
FromConstellation(ViewportMsg(id, rect)) => {
|
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");
|
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) {
|
if inner_page.set_page_clip_rect_with_new_viewport(rect) {
|
||||||
needs_reflow.insert(id);
|
needs_reflow.insert(id);
|
||||||
|
@ -535,7 +535,7 @@ impl ScriptTask {
|
||||||
FromConstellation(ReflowCompleteMsg(id, reflow_id)) => self.handle_reflow_complete_msg(id, reflow_id),
|
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(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(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),
|
FromScript(ExitWindowMsg(id)) => self.handle_exit_window_msg(id),
|
||||||
FromConstellation(ResizeMsg(..)) => panic!("should have handled ResizeMsg already"),
|
FromConstellation(ResizeMsg(..)) => panic!("should have handled ResizeMsg already"),
|
||||||
FromScript(XHRProgressMsg(addr, progress)) => XMLHttpRequest::handle_progress(addr, progress),
|
FromScript(XHRProgressMsg(addr, progress)) => XMLHttpRequest::handle_progress(addr, progress),
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue