mirror of
https://github.com/servo/servo.git
synced 2025-08-06 14:10:11 +01:00
Update rustc to 00b112c45a604fa6f4b59af2a40c9deeadfdb7c6/rustc-1.0.0-dev.
This commit is contained in:
parent
ff8cbff810
commit
95fc29fa0d
255 changed files with 3550 additions and 3362 deletions
|
@ -13,10 +13,10 @@ use hyper::method::Method;
|
|||
use layers::geometry::DevicePixel;
|
||||
use servo_util::cursor::Cursor;
|
||||
use servo_util::geometry::{PagePx, ViewportPx};
|
||||
use std::comm::{channel, Sender, Receiver};
|
||||
use std::sync::mpsc::{channel, Sender, Receiver};
|
||||
use url::Url;
|
||||
|
||||
#[deriving(Clone)]
|
||||
#[derive(Clone)]
|
||||
pub struct ConstellationChan(pub Sender<Msg>);
|
||||
|
||||
impl ConstellationChan {
|
||||
|
@ -26,20 +26,20 @@ impl ConstellationChan {
|
|||
}
|
||||
}
|
||||
|
||||
#[deriving(PartialEq, Eq, Copy)]
|
||||
#[derive(PartialEq, Eq, Copy)]
|
||||
pub enum IFrameSandboxState {
|
||||
IFrameSandboxed,
|
||||
IFrameUnsandboxed
|
||||
}
|
||||
|
||||
// We pass this info to various tasks, so it lives in a separate, cloneable struct.
|
||||
#[deriving(Clone, Copy)]
|
||||
#[derive(Clone, Copy)]
|
||||
pub struct Failure {
|
||||
pub pipeline_id: PipelineId,
|
||||
pub subpage_id: Option<SubpageId>,
|
||||
}
|
||||
|
||||
#[deriving(Copy)]
|
||||
#[derive(Copy)]
|
||||
pub struct WindowSizeData {
|
||||
/// The size of the initial layout viewport, before parsing an
|
||||
/// http://www.w3.org/TR/css-device-adapt/#initial-viewport
|
||||
|
@ -52,7 +52,7 @@ pub struct WindowSizeData {
|
|||
pub device_pixel_ratio: ScaleFactor<ViewportPx, DevicePixel, f32>,
|
||||
}
|
||||
|
||||
#[deriving(PartialEq, Eq, Copy, Clone)]
|
||||
#[derive(PartialEq, Eq, Copy, Clone)]
|
||||
pub enum KeyState {
|
||||
Pressed,
|
||||
Released,
|
||||
|
@ -60,7 +60,7 @@ pub enum KeyState {
|
|||
}
|
||||
|
||||
//N.B. Straight up copied from glfw-rs
|
||||
#[deriving(Show, PartialEq, Eq, Copy, Clone)]
|
||||
#[derive(Show, PartialEq, Eq, Copy, Clone)]
|
||||
pub enum Key {
|
||||
Space,
|
||||
Apostrophe,
|
||||
|
@ -186,7 +186,6 @@ pub enum Key {
|
|||
}
|
||||
|
||||
bitflags! {
|
||||
#[deriving(Copy)]
|
||||
flags KeyModifiers: u8 {
|
||||
const SHIFT = 0x01,
|
||||
const CONTROL = 0x02,
|
||||
|
@ -218,7 +217,7 @@ pub enum Msg {
|
|||
/// Similar to net::resource_task::LoadData
|
||||
/// can be passed to LoadUrl to load a page with GET/POST
|
||||
/// parameters or headers
|
||||
#[deriving(Clone)]
|
||||
#[derive(Clone)]
|
||||
pub struct LoadData {
|
||||
pub url: Url,
|
||||
pub method: Method,
|
||||
|
@ -238,27 +237,27 @@ impl LoadData {
|
|||
}
|
||||
|
||||
/// Represents the two different ways to which a page can be navigated
|
||||
#[deriving(Clone, PartialEq, Eq, Copy, Hash, Show)]
|
||||
#[derive(Clone, PartialEq, Eq, Copy, Hash, Show)]
|
||||
pub enum NavigationType {
|
||||
Load, // entered or clicked on a url
|
||||
Navigate, // browser forward/back buttons
|
||||
}
|
||||
|
||||
#[deriving(Clone, PartialEq, Eq, Copy, Hash, Show)]
|
||||
#[derive(Clone, PartialEq, Eq, Copy, Hash, Show)]
|
||||
pub enum NavigationDirection {
|
||||
Forward,
|
||||
Back,
|
||||
}
|
||||
|
||||
#[deriving(Clone, PartialEq, Eq, Copy, Hash, Show)]
|
||||
#[derive(Clone, PartialEq, Eq, Copy, Hash, Show)]
|
||||
pub struct PipelineId(pub uint);
|
||||
|
||||
#[deriving(Clone, PartialEq, Eq, Copy, Hash, Show)]
|
||||
#[derive(Clone, PartialEq, Eq, Copy, Hash, Show)]
|
||||
pub struct SubpageId(pub uint);
|
||||
|
||||
// The type of pipeline exit. During complete shutdowns, pipelines do not have to
|
||||
// release resources automatically released on process termination.
|
||||
#[deriving(Copy)]
|
||||
#[derive(Copy)]
|
||||
pub enum PipelineExitType {
|
||||
PipelineOnly,
|
||||
Complete,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue