Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Remove libgreen support.
  • Loading branch information
Cameron Zwarich committed Dec 3, 2014
1 parent 68c90e2 commit e3b7aeb
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 96 deletions.
25 changes: 1 addition & 24 deletions components/servo/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions components/servo/Cargo.toml
Expand Up @@ -61,11 +61,3 @@ optional = true

[dependencies.url]
git = "https://github.com/servo/rust-url"

[dependencies.green]
git = "https://github.com/servo/green-rs"
branch = "servo"

[dependencies.rustuv]
git = "https://github.com/servo/green-rs"
branch = "servo"
16 changes: 0 additions & 16 deletions components/servo/lib.rs
Expand Up @@ -15,14 +15,12 @@ extern crate log;

extern crate compositing;
extern crate devtools;
extern crate rustuv;
extern crate "net" as servo_net;
extern crate "msg" as servo_msg;
#[phase(plugin, link)]
extern crate "util" as servo_util;
extern crate script;
extern crate layout;
extern crate green;
extern crate gfx;
extern crate libc;
extern crate native;
Expand Down Expand Up @@ -54,8 +52,6 @@ use servo_util::opts;
#[cfg(not(test))]
use servo_util::taskpool::TaskPool;

#[cfg(not(test))]
use green::GreenTaskBuilder;
#[cfg(not(test))]
use std::os;
#[cfg(not(test))]
Expand All @@ -64,25 +60,16 @@ use std::rc::Rc;
use std::task::TaskBuilder;

pub struct Browser<Window> {
pool: green::SchedPool,
compositor: Box<CompositorEventListener + 'static>,
}

impl<Window> Browser<Window> where Window: WindowMethods + 'static {
#[cfg(not(test))]
pub fn new(window: Option<Rc<Window>>) -> Browser<Window> {
use rustuv::EventLoop;
fn event_loop() -> Box<green::EventLoop + Send> {
box EventLoop::new().unwrap() as Box<green::EventLoop + Send>
}

::servo_util::opts::set_experimental_enabled(opts::get().enable_experimental);
let opts = opts::get();
RegisterBindings::RegisterProxyHandlers();

let mut pool_config = green::PoolConfig::new();
pool_config.event_loop_factory = event_loop;
let mut pool = green::SchedPool::new(pool_config);
let shared_task_pool = TaskPool::new(8);

let (compositor_proxy, compositor_receiver) =
Expand All @@ -99,7 +86,6 @@ impl<Window> Browser<Window> where Window: WindowMethods + 'static {
let (result_chan, result_port) = channel();
let compositor_proxy_for_constellation = compositor_proxy.clone_compositor_proxy();
TaskBuilder::new()
.green(&mut pool)
.spawn(proc() {
let opts = &opts_clone;
// Create a Servo instance.
Expand Down Expand Up @@ -151,7 +137,6 @@ impl<Window> Browser<Window> where Window: WindowMethods + 'static {
memory_profiler_chan);

Browser {
pool: pool,
compositor: compositor,
}
}
Expand All @@ -166,7 +151,6 @@ impl<Window> Browser<Window> where Window: WindowMethods + 'static {

pub fn shutdown(mut self) {
self.compositor.shutdown();
self.pool.shutdown();
}
}

25 changes: 1 addition & 24 deletions ports/android/glut_app/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 1 addition & 24 deletions ports/cef/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 comments on commit e3b7aeb

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging zwarich/servo/remove-libgreen = e3b7aeb into auto

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

zwarich/servo/remove-libgreen = e3b7aeb merged ok, testing candidate = 92cc423

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 92cc423

Please sign in to comment.