Upgrade to rustc 551a74dddd84cf01440ee84148ebd18bc68bd7c8.

This commit is contained in:
Simon Sapin 2015-04-23 00:14:02 +02:00 committed by Josh Matthews
parent 7b87085c18
commit ef8edd4e87
168 changed files with 2247 additions and 2408 deletions

View file

@ -59,7 +59,7 @@ git = "https://github.com/servo/rust-core-text"
git = "https://github.com/servo/gleam"
[dependencies.clipboard]
git = "https://github.com/aweinstock314/rust-x11-clipboard"
git = "https://github.com/servo/rust-x11-clipboard"
[dependencies]
url = "0.2.16"

View file

@ -39,7 +39,6 @@ use std::cmp;
use std::collections::HashMap;
use std::collections::hash_map::Entry::{Occupied, Vacant};
use std::mem as std_mem;
use std::num::Float;
use std::rc::Rc;
use std::slice::bytes::copy_memory;
use std::sync::mpsc::Sender;
@ -1189,8 +1188,8 @@ impl<Window: WindowMethods> IOCompositor<Window> {
let dst_start = y * stride;
let src_start = (height - y - 1) * stride;
let src_slice = &orig_pixels[src_start .. src_start + stride];
copy_memory(&mut pixels[dst_start .. dst_start + stride],
&src_slice[..stride]);
copy_memory(&src_slice[..stride],
&mut pixels[dst_start .. dst_start + stride]);
}
let mut img = png::Image {
width: width as u32,

View file

@ -20,7 +20,6 @@ use script_traits::CompositorEvent::{ClickEvent, MouseDownEvent, MouseMoveEvent,
use script_traits::{ScriptControlChan, ConstellationControlMsg};
use msg::compositor_msg::{Epoch, LayerId, ScrollPolicy};
use msg::constellation_msg::PipelineId;
use std::num::Float;
use std::rc::Rc;
pub struct CompositorData {
@ -63,6 +62,7 @@ impl CompositorData {
Rc::new(Layer::new(Rect::from_untyped(&layer_properties.rect),
tile_size,
to_layers_color(&layer_properties.background_color),
1.0,
new_compositor_data))
}
}

View file

@ -4,10 +4,7 @@
#![feature(box_syntax)]
#![feature(core)]
#![feature(io)]
#![feature(old_io)]
#![feature(rustc_private)]
#![feature(std_misc)]
#[macro_use]
extern crate log;

View file

@ -6,10 +6,8 @@
use compositor_task::{CompositorProxy, Msg};
use std::old_io::timer;
use std::sync::mpsc::{Receiver, Sender, channel};
use std::thread::Builder;
use std::time::duration::Duration;
use std::thread::{Builder, sleep_ms};
use time;
/// The amount of time in nanoseconds that we give to the painting thread to paint new tiles upon
@ -61,8 +59,8 @@ impl ScrollingTimer {
match self.receiver.recv() {
Ok(ToScrollingTimerMsg::ScrollEventProcessedMsg(timestamp)) => {
let target = timestamp as i64 + TIMEOUT;
let delta = target - (time::precise_time_ns() as i64);
timer::sleep(Duration::nanoseconds(delta));
let delta_ns = target - (time::precise_time_ns() as i64);
sleep_ms((delta_ns / 1000) as u32);
self.compositor_proxy.send(Msg::ScrollTimeout(timestamp));
}
Ok(ToScrollingTimerMsg::ExitMsg) | Err(_) => break,