Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 21:20:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Reindent script_task.rs.

Browse source
This commit is contained in:
Ms2ger 2015-02-06 12:31:12 +01:00
parent f451291782
commit e85b3b6acb
1 changed files with 36 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

72
components/script/script_task.rs
View file

@ -622,7 +622,7 @@ impl ScriptTask {
ScriptMsg::DOMMessage(..) => ScriptMsg::DOMMessage(..) =>
panic!("unexpected message"), panic!("unexpected message"),
ScriptMsg::WorkerDispatchErrorEvent(addr, msg, file_name,line_num, col_num) => ScriptMsg::WorkerDispatchErrorEvent(addr, msg, file_name,line_num, col_num) =>
Worker::handle_error_message(addr, msg, file_name, line_num, col_num), Worker::handle_error_message(addr, msg, file_name, line_num, col_num),
ScriptMsg::RunnableMsg(runnable) => ScriptMsg::RunnableMsg(runnable) =>
runnable.handler(), runnable.handler(),
ScriptMsg::RefcountCleanup(addr) => ScriptMsg::RefcountCleanup(addr) =>
@ -774,16 +774,16 @@ impl ScriptTask {
let borrowed_page = self.page.borrow_mut(); let borrowed_page = self.page.borrow_mut();
let parent_window = parent_id.and_then(|pid| { let parent_window = parent_id.and_then(|pid| {
// In the case a parent id exists but the matching page // In the case a parent id exists but the matching page
// cannot be found, this means the page exists in a different // cannot be found, this means the page exists in a different
// script task (due to origin) so it shouldn't be returned. // script task (due to origin) so it shouldn't be returned.
// TODO: window.parent will continue to return self in that // TODO: window.parent will continue to return self in that
// case, which is wrong. We should be returning an object that // case, which is wrong. We should be returning an object that
// denies access to most properties (per // denies access to most properties (per
// https://github.com/servo/servo/issues/3939#issuecomment-62287025). // https://github.com/servo/servo/issues/3939#issuecomment-62287025).
borrowed_page.find(pid).and_then(|page| { borrowed_page.find(pid).and_then(|page| {
Some(page.frame.borrow().as_ref().unwrap().window.root()) Some(page.frame.borrow().as_ref().unwrap().window.root())
}) })
}); });
let page = borrowed_page.find(pipeline_id).expect("ScriptTask: received a load let page = borrowed_page.find(pipeline_id).expect("ScriptTask: received a load
@ -967,7 +967,7 @@ impl ScriptTask {
fn handle_event(&self, pipeline_id: PipelineId, event: CompositorEvent) { fn handle_event(&self, pipeline_id: PipelineId, event: CompositorEvent) {
match event { match event {
ResizeEvent(new_size) => { ResizeEvent(new_size) => {
self.handle_resize_event(pipeline_id, new_size); self.handle_resize_event(pipeline_id, new_size);
} }
ReflowEvent(nodes) => { ReflowEvent(nodes) => {
@ -995,13 +995,13 @@ impl ScriptTask {
} }
ClickEvent(_button, point) => { ClickEvent(_button, point) => {
self.handle_click_event(pipeline_id, _button, point); self.handle_click_event(pipeline_id, _button, point);
} }
MouseDownEvent(..) => {} MouseDownEvent(..) => {}
MouseUpEvent(..) => {} MouseUpEvent(..) => {}
MouseMoveEvent(point) => { MouseMoveEvent(point) => {
self.handle_mouse_move_event(pipeline_id, point); self.handle_mouse_move_event(pipeline_id, point);
} }
KeyEvent(key, state, modifiers) => { KeyEvent(key, state, modifiers) => {
@ -1169,8 +1169,8 @@ impl ScriptTask {
debug!("node address is {:?}", node_address.0); debug!("node address is {:?}", node_address.0);
let temp_node = let temp_node =
node::from_untrusted_node_address( node::from_untrusted_node_address(
self.js_runtime.ptr, node_address).root(); self.js_runtime.ptr, node_address).root();
let maybe_elem: Option<JSRef<Element>> = ElementCast::to_ref(temp_node.r()); let maybe_elem: Option<JSRef<Element>> = ElementCast::to_ref(temp_node.r());
let maybe_node = match maybe_elem { let maybe_node = match maybe_elem {
@ -1234,30 +1234,30 @@ impl ScriptTask {
} }
if node_address.len() > 0 { if node_address.len() > 0 {
let top_most_node = let top_most_node =
node::from_untrusted_node_address(self.js_runtime.ptr, node_address[0]).root(); node::from_untrusted_node_address(self.js_runtime.ptr, node_address[0]).root();
if let Some(ref frame) = *page.frame() { if let Some(ref frame) = *page.frame() {
let window = frame.window.root(); let window = frame.window.root();
let x = point.x.to_i32().unwrap_or(0); let x = point.x.to_i32().unwrap_or(0);
let y = point.y.to_i32().unwrap_or(0); let y = point.y.to_i32().unwrap_or(0);
let mouse_event = MouseEvent::new(window.r(), let mouse_event = MouseEvent::new(window.r(),
"mousemove".to_owned(), "mousemove".to_owned(),
true, true,
true, true,
Some(window.r()), Some(window.r()),
0i32, 0i32,
x, y, x, y, x, y, x, y,
false, false, false, false, false, false, false, false,
0i16, 0i16,
None).root(); None).root();
let event: JSRef<Event> = EventCast::from_ref(mouse_event.r()); let event: JSRef<Event> = EventCast::from_ref(mouse_event.r());
let target: JSRef<EventTarget> = EventTargetCast::from_ref(top_most_node.r()); let target: JSRef<EventTarget> = EventTargetCast::from_ref(top_most_node.r());
event.fire(target); event.fire(target);
} }
} }
for node_address in node_address.iter() { for node_address in node_address.iter() {