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

Merge remote-tracking branch 'origin/master' into HEAD

Browse source 
Conflicts:
	src/components/script/dom/bindings/proxyhandler.rs
	src/components/script/dom/bindings/text.rs
This commit is contained in:
Brian Anderson 2013-08-29 15:22:17 -07:00
commit 9624148f18
58 changed files with 2099 additions and 862 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/components/script/script_task.rs
View file

@ -566,6 +566,7 @@ impl ScriptTask {
}
page.layout_chan.send(layout_interface::ExitMsg);
}
self.compositor.close();
}
/// The entry point to document loading. Defines bindings, sets up the window and document