Remove dependencies on the native crate.

This commit is contained in:
Ms2ger 2015-01-04 11:58:37 +01:00
parent 394508953e
commit 04eb923da9
11 changed files with 6 additions and 26 deletions

View file

@ -25,7 +25,6 @@ extern crate "util" as servo_util;
extern crate gleam; extern crate gleam;
extern crate libc; extern crate libc;
extern crate native;
extern crate time; extern crate time;
extern crate url; extern crate url;

View file

@ -6,7 +6,6 @@
use compositor_task::{CompositorProxy, Msg}; use compositor_task::{CompositorProxy, Msg};
use native::task::NativeTaskBuilder;
use std::io::timer; use std::io::timer;
use std::task::TaskBuilder; use std::task::TaskBuilder;
use std::time::duration::Duration; use std::time::duration::Duration;
@ -34,7 +33,7 @@ enum ToScrollingTimerMsg {
impl ScrollingTimerProxy { impl ScrollingTimerProxy {
pub fn new(compositor_proxy: Box<CompositorProxy+Send>) -> ScrollingTimerProxy { pub fn new(compositor_proxy: Box<CompositorProxy+Send>) -> ScrollingTimerProxy {
let (to_scrolling_timer_sender, to_scrolling_timer_receiver) = channel(); let (to_scrolling_timer_sender, to_scrolling_timer_receiver) = channel();
TaskBuilder::new().native().spawn(proc() { TaskBuilder::new().spawn(proc() {
let mut scrolling_timer = ScrollingTimer { let mut scrolling_timer = ScrollingTimer {
compositor_proxy: compositor_proxy, compositor_proxy: compositor_proxy,
receiver: to_scrolling_timer_receiver, receiver: to_scrolling_timer_receiver,

View file

@ -16,7 +16,6 @@ extern crate collections;
extern crate geom; extern crate geom;
extern crate layers; extern crate layers;
extern crate libc; extern crate libc;
extern crate native;
extern crate rustrt; extern crate rustrt;
extern crate stb_image; extern crate stb_image;
extern crate png; extern crate png;

View file

@ -20,7 +20,6 @@ use layers::platform::surface::{NativeGraphicsMetadata, NativePaintingGraphicsCo
use layers::platform::surface::{NativeSurface, NativeSurfaceMethods}; use layers::platform::surface::{NativeSurface, NativeSurfaceMethods};
use layers::layers::{BufferRequest, LayerBuffer, LayerBufferSet}; use layers::layers::{BufferRequest, LayerBuffer, LayerBufferSet};
use layers; use layers;
use native::task::NativeTaskBuilder;
use servo_msg::compositor_msg::{Epoch, PaintState, LayerId}; use servo_msg::compositor_msg::{Epoch, PaintState, LayerId};
use servo_msg::compositor_msg::{LayerMetadata, PaintListener, ScrollPolicy}; use servo_msg::compositor_msg::{LayerMetadata, PaintListener, ScrollPolicy};
use servo_msg::constellation_msg::Msg as ConstellationMsg; use servo_msg::constellation_msg::Msg as ConstellationMsg;
@ -442,7 +441,7 @@ impl WorkerThreadProxy {
let native_graphics_metadata = native_graphics_metadata.clone(); let native_graphics_metadata = native_graphics_metadata.clone();
let font_cache_task = font_cache_task.clone(); let font_cache_task = font_cache_task.clone();
let time_profiler_chan = time_profiler_chan.clone(); let time_profiler_chan = time_profiler_chan.clone();
TaskBuilder::new().native().spawn(proc() { TaskBuilder::new().spawn(proc() {
let mut worker_thread = WorkerThread::new(from_worker_sender, let mut worker_thread = WorkerThread::new(from_worker_sender,
to_worker_receiver, to_worker_receiver,
native_graphics_metadata, native_graphics_metadata,

View file

@ -23,7 +23,6 @@ extern crate hyper;
extern crate js; extern crate js;
extern crate libc; extern crate libc;
extern crate msg; extern crate msg;
extern crate native;
extern crate net; extern crate net;
extern crate rustrt; extern crate rustrt;
extern crate serialize; extern crate serialize;

View file

@ -20,7 +20,6 @@ extern crate script;
extern crate layout; extern crate layout;
extern crate gfx; extern crate gfx;
extern crate libc; extern crate libc;
extern crate native;
extern crate rustrt; extern crate rustrt;
extern crate url; extern crate url;

View file

@ -11,7 +11,6 @@
extern crate libc; extern crate libc;
extern crate servo; extern crate servo;
extern crate native;
extern crate time; extern crate time;
extern crate "util" as servo_util; extern crate "util" as servo_util;

View file

@ -18,7 +18,6 @@ extern crate geom;
extern crate getopts; extern crate getopts;
extern crate layers; extern crate layers;
extern crate libc; extern crate libc;
extern crate native;
extern crate rand; extern crate rand;
extern crate rustrt; extern crate rustrt;
extern crate serialize; extern crate serialize;

View file

@ -6,7 +6,6 @@ use std::str::IntoMaybeOwned;
use std::task; use std::task;
use std::comm::Sender; use std::comm::Sender;
use std::task::TaskBuilder; use std::task::TaskBuilder;
use native::task::NativeTaskBuilder;
use rtinstrument; use rtinstrument;
use task_state; use task_state;
@ -18,10 +17,7 @@ pub fn spawn_named<S: IntoMaybeOwned<'static>>(name: S, f: proc():Send) {
} }
pub fn spawn_named_native<S: IntoMaybeOwned<'static>>(name: S, f: proc():Send) { pub fn spawn_named_native<S: IntoMaybeOwned<'static>>(name: S, f: proc():Send) {
let builder = task::TaskBuilder::new().named(name).native(); spawn_named(name, f)
builder.spawn(proc() {
rtinstrument::instrument(f);
});
} }
/// Arrange to send a particular message to a channel if the task fails. /// Arrange to send a particular message to a channel if the task fails.
@ -30,17 +26,11 @@ pub fn spawn_named_with_send_on_failure<T: Send>(name: &'static str,
f: proc(): Send, f: proc(): Send,
msg: T, msg: T,
dest: Sender<T>, dest: Sender<T>,
native: bool) { _native: bool) {
let with_state = proc() { let future_result = TaskBuilder::new().named(name).try_future(proc() {
task_state::initialize(state); task_state::initialize(state);
rtinstrument::instrument(f); rtinstrument::instrument(f);
}; });
let future_result = if native {
TaskBuilder::new().named(name).native().try_future(with_state)
} else {
TaskBuilder::new().named(name).try_future(with_state)
};
let watched_name = name.into_string(); let watched_name = name.into_string();
let watcher_name = format!("{}Watcher", watched_name); let watcher_name = format!("{}Watcher", watched_name);

View file

@ -20,7 +20,6 @@ extern crate script;
extern crate layout; extern crate layout;
extern crate gfx; extern crate gfx;
extern crate libc; extern crate libc;
extern crate native;
extern crate rustrt; extern crate rustrt;
extern crate url; extern crate url;

View file

@ -6,7 +6,6 @@
#![deny(unused_variables)] #![deny(unused_variables)]
extern crate servo; extern crate servo;
extern crate native;
extern crate time; extern crate time;
extern crate "util" as servo_util; extern crate "util" as servo_util;