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

Update to latest Rust.

Browse source
This commit is contained in:
Jack Moffitt 2013-07-08 18:41:33 -06:00
parent e0e5e1a2a7
commit 870db39836
75 changed files with 539 additions and 626 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -167,7 +167,7 @@ pub fn task_from_context(js_context: *JSContext) -> *mut ScriptTask {
#[unsafe_destructor]
impl Drop for ScriptTask {
fn finalize(&self) {
fn drop(&self) {
unsafe {
let _ = local_data::local_data_pop(global_script_context_key);
}
@ -247,7 +247,7 @@ impl ScriptTask {
}
}
pub fn create<C: ScriptListener + Owned>(id: uint,
pub fn create<C: ScriptListener + Send>(id: uint,
compositor: C,
layout_chan: LayoutChan,
script_port: Port<ScriptMsg>,
@ -356,8 +356,8 @@ impl ScriptTask {
/// The entry point to document loading. Defines bindings, sets up the window and document
/// objects, parses HTML and CSS, and kicks off initial layout.
fn load(&mut self, url: Url) {
for self.last_loaded_url.iter().advance |&last_loaded_url| {
if url == last_loaded_url { return; }
for self.last_loaded_url.iter().advance |last_loaded_url| {
if url == *last_loaded_url { return; }
}
// Define the script DOM bindings.
//
@ -419,9 +419,9 @@ impl ScriptTask {
self.js_compartment.define_functions(debug_fns);
// Evaluate every script in the document.
do js_scripts.consume |_, bytes| {
for js_scripts.iter().advance |bytes| {
let _ = self.js_context.evaluate_script(self.js_compartment.global_obj,
bytes,
bytes.clone(),
~"???",
1);
}
@ -501,7 +501,7 @@ impl ScriptTask {
}
/// Sends the given query to layout.
pub fn query_layout<T: Owned>(&mut self, query: LayoutQuery, response_port: Port<Result<T, ()>>) -> Result<T,()> {
pub fn query_layout<T: Send>(&mut self, query: LayoutQuery, response_port: Port<Result<T, ()>>) -> Result<T,()> {
self.join_layout();
self.layout_chan.send(QueryMsg(query));
response_port.recv()