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

Reduce coupling between layout and the DOM by separating out the layout interface.

Browse source 
Eventually, the layout interface will be moved along with the DOM into a
separate crate.
This commit is contained in:
Patrick Walton 2013-05-28 16:41:55 -07:00
parent 83e1bd81e8
commit 0a95672236
8 changed files with 194 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/components/main/scripting/script_task.rs
View file

@ -10,10 +10,10 @@ use dom::document::Document;
use dom::event::{Event, ResizeEvent, ReflowEvent};
use dom::node::define_bindings;
use dom::window::Window;
use layout::layout_task::{AddStylesheet, BuildData, BuildMsg, Damage, LayoutQuery};
use layout::layout_task::{LayoutQueryResponse, LayoutTask, MatchSelectorsDamage, NoDamage};
use layout::layout_task::{QueryMsg, ReflowDamage};
use layout::layout_task;
use layout_interface::{AddStylesheetMsg, BuildData, BuildMsg, Damage, LayoutQuery};
use layout_interface::{LayoutResponse, LayoutTask, MatchSelectorsDamage, NoDamage};
use layout_interface::{QueryMsg, ReflowDamage};
use layout_interface;
use core::cast::transmute;
use core::cell::Cell;
@ -292,7 +292,8 @@ impl ScriptContext {
for self.root_frame.each |frame| {
frame.document.teardown();
}
self.layout_task.send(layout_task::ExitMsg)
self.layout_task.chan.send(layout_interface::ExitMsg)
}
/// The entry point to document loading. Defines bindings, sets up the window and document
@ -321,7 +322,7 @@ impl ScriptContext {
// in the script task.
loop {
match html_parsing_result.style_port.recv() {
Some(sheet) => self.layout_task.send(AddStylesheet(sheet)),
Some(sheet) => self.layout_task.chan.send(AddStylesheetMsg(sheet)),
None => break,
}
}
@ -416,7 +417,7 @@ impl ScriptContext {
damage: replace(&mut self.damage, NoDamage),
};
self.layout_task.send(BuildMsg(data))
self.layout_task.chan.send(BuildMsg(data))
}
}
@ -424,11 +425,11 @@ impl ScriptContext {
}
/// Sends the given query to layout.
pub fn query_layout(&mut self, query: LayoutQuery) -> LayoutQueryResponse {
pub fn query_layout(&mut self, query: LayoutQuery) -> Result<LayoutResponse,()> {
self.join_layout();
let (response_port, response_chan) = comm::stream();
self.layout_task.send(QueryMsg(query, response_chan));
self.layout_task.chan.send(QueryMsg(query, response_chan));
response_port.recv()
}