mirror of
https://github.com/servo/servo.git
synced 2025-08-06 14:10:11 +01:00
Remove libgreen support.
This commit is contained in:
Cameron Zwarich
parent
68c90e2797
commit
e3b7aeb531
5 changed files with 3 additions and 96 deletions
25
components/servo/Cargo.lock
generated
25
components/servo/Cargo.lock
generated
|
|
@ -6,11 +6,9 @@ dependencies = [
|
|||
"gfx 0.0.1",
|
||||
"glfw_app 0.0.1",
|
||||
"glutin_app 0.0.1",
|
||||
"green 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
|
||||
"layout 0.0.1",
|
||||
"msg 0.0.1",
|
||||
"net 0.0.1",
|
||||
"rustuv 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
|
||||
"script 0.0.1",
|
||||
"url 0.1.0 (git+https://github.com/servo/rust-url)",
|
||||
"util 0.0.1",
|
||||
|
|
@ -324,11 +322,6 @@ dependencies = [
|
|||
"gl_generator 0.0.1 (git+https://github.com/bjz/gl-rs.git)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "green"
|
||||
version = "0.0.1"
|
||||
source = "git+https://github.com/servo/green-rs?ref=servo#9300d7e7dc73680c7446d78b10a309095636e64d"
|
||||
|
||||
[[package]]
|
||||
name = "harfbuzz"
|
||||
version = "0.1.0"
|
||||
|
|
@ -374,11 +367,9 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "js"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/servo/rust-mozjs#2a7acd8c04949796c71145db61b7868128e497f2"
|
||||
source = "git+https://github.com/servo/rust-mozjs#7563bbd5abf12a1f0d01661c525b1f2491f783a9"
|
||||
dependencies = [
|
||||
"green 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
|
||||
"mozjs-sys 0.0.0 (git+https://github.com/servo/mozjs)",
|
||||
"rustuv 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -510,15 +501,6 @@ name = "rust-xml"
|
|||
version = "0.1.0"
|
||||
source = "git+https://github.com/netvl/rust-xml#d6c57380a300b94f7e7881979dbe5459dbe4ca06"
|
||||
|
||||
[[package]]
|
||||
name = "rustuv"
|
||||
version = "0.0.1"
|
||||
source = "git+https://github.com/servo/green-rs?ref=servo#9300d7e7dc73680c7446d78b10a309095636e64d"
|
||||
dependencies = [
|
||||
"green 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
|
||||
"tls 0.0.1 (git+https://github.com/alexcrichton/tls-rs)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "script"
|
||||
version = "0.0.1"
|
||||
|
|
@ -614,11 +596,6 @@ dependencies = [
|
|||
name = "task_info"
|
||||
version = "0.0.1"
|
||||
|
||||
[[package]]
|
||||
name = "tls"
|
||||
version = "0.0.1"
|
||||
source = "git+https://github.com/alexcrichton/tls-rs#2abeb8996f3795f1e870523b7684dcc2ce64fa85"
|
||||
|
||||
[[package]]
|
||||
name = "url"
|
||||
version = "0.1.0"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
@ -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))]
|
||||
|
|
@ -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) =
|
||||
|
|
@ -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.
|
||||
|
|
@ -151,7 +137,6 @@ impl<Window> Browser<Window> where Window: WindowMethods + 'static {
|
|||
memory_profiler_chan);
|
||||
|
||||
Browser {
|
||||
pool: pool,
|
||||
compositor: compositor,
|
||||
}
|
||||
}
|
||||
|
|
@ -166,7 +151,6 @@ impl<Window> Browser<Window> where Window: WindowMethods + 'static {
|
|||
|
||||
pub fn shutdown(mut self) {
|
||||
self.compositor.shutdown();
|
||||
self.pool.shutdown();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
25
ports/android/glut_app/Cargo.lock
generated
25
ports/android/glut_app/Cargo.lock
generated
|
|
@ -255,11 +255,6 @@ dependencies = [
|
|||
"gl_generator 0.0.1 (git+https://github.com/bjz/gl-rs.git)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "green"
|
||||
version = "0.0.1"
|
||||
source = "git+https://github.com/servo/green-rs?ref=servo#9300d7e7dc73680c7446d78b10a309095636e64d"
|
||||
|
||||
[[package]]
|
||||
name = "harfbuzz"
|
||||
version = "0.1.0"
|
||||
|
|
@ -305,11 +300,9 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "js"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/servo/rust-mozjs#2a7acd8c04949796c71145db61b7868128e497f2"
|
||||
source = "git+https://github.com/servo/rust-mozjs#7563bbd5abf12a1f0d01661c525b1f2491f783a9"
|
||||
dependencies = [
|
||||
"green 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
|
||||
"mozjs-sys 0.0.0 (git+https://github.com/servo/mozjs)",
|
||||
"rustuv 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -446,15 +439,6 @@ name = "rust-xml"
|
|||
version = "0.1.0"
|
||||
source = "git+https://github.com/netvl/rust-xml#d6c57380a300b94f7e7881979dbe5459dbe4ca06"
|
||||
|
||||
[[package]]
|
||||
name = "rustuv"
|
||||
version = "0.0.1"
|
||||
source = "git+https://github.com/servo/green-rs?ref=servo#9300d7e7dc73680c7446d78b10a309095636e64d"
|
||||
dependencies = [
|
||||
"green 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
|
||||
"tls 0.0.1 (git+https://github.com/alexcrichton/tls-rs)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "script"
|
||||
version = "0.0.1"
|
||||
|
|
@ -498,11 +482,9 @@ version = "0.0.1"
|
|||
dependencies = [
|
||||
"compositing 0.0.1",
|
||||
"gfx 0.0.1",
|
||||
"green 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
|
||||
"layout 0.0.1",
|
||||
"msg 0.0.1",
|
||||
"net 0.0.1",
|
||||
"rustuv 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
|
||||
"script 0.0.1",
|
||||
"url 0.1.0 (git+https://github.com/servo/rust-url)",
|
||||
"util 0.0.1",
|
||||
|
|
@ -561,11 +543,6 @@ dependencies = [
|
|||
name = "task_info"
|
||||
version = "0.0.1"
|
||||
|
||||
[[package]]
|
||||
name = "tls"
|
||||
version = "0.0.1"
|
||||
source = "git+https://github.com/alexcrichton/tls-rs#2abeb8996f3795f1e870523b7684dcc2ce64fa85"
|
||||
|
||||
[[package]]
|
||||
name = "url"
|
||||
version = "0.1.0"
|
||||
|
|
|
|||
25
ports/cef/Cargo.lock
generated
25
ports/cef/Cargo.lock
generated
|
|
@ -286,11 +286,6 @@ dependencies = [
|
|||
"gl_generator 0.0.1 (git+https://github.com/bjz/gl-rs.git)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "green"
|
||||
version = "0.0.1"
|
||||
source = "git+https://github.com/servo/green-rs?ref=servo#9300d7e7dc73680c7446d78b10a309095636e64d"
|
||||
|
||||
[[package]]
|
||||
name = "harfbuzz"
|
||||
version = "0.1.0"
|
||||
|
|
@ -336,11 +331,9 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "js"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/servo/rust-mozjs#2a7acd8c04949796c71145db61b7868128e497f2"
|
||||
source = "git+https://github.com/servo/rust-mozjs#7563bbd5abf12a1f0d01661c525b1f2491f783a9"
|
||||
dependencies = [
|
||||
"green 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
|
||||
"mozjs-sys 0.0.0 (git+https://github.com/servo/mozjs)",
|
||||
"rustuv 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -472,15 +465,6 @@ name = "rust-xml"
|
|||
version = "0.1.0"
|
||||
source = "git+https://github.com/netvl/rust-xml#d6c57380a300b94f7e7881979dbe5459dbe4ca06"
|
||||
|
||||
[[package]]
|
||||
name = "rustuv"
|
||||
version = "0.0.1"
|
||||
source = "git+https://github.com/servo/green-rs?ref=servo#9300d7e7dc73680c7446d78b10a309095636e64d"
|
||||
dependencies = [
|
||||
"green 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
|
||||
"tls 0.0.1 (git+https://github.com/alexcrichton/tls-rs)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "script"
|
||||
version = "0.0.1"
|
||||
|
|
@ -530,11 +514,9 @@ dependencies = [
|
|||
"compositing 0.0.1",
|
||||
"gfx 0.0.1",
|
||||
"glfw_app 0.0.1",
|
||||
"green 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
|
||||
"layout 0.0.1",
|
||||
"msg 0.0.1",
|
||||
"net 0.0.1",
|
||||
"rustuv 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
|
||||
"script 0.0.1",
|
||||
"url 0.1.0 (git+https://github.com/servo/rust-url)",
|
||||
"util 0.0.1",
|
||||
|
|
@ -593,11 +575,6 @@ dependencies = [
|
|||
name = "task_info"
|
||||
version = "0.0.1"
|
||||
|
||||
[[package]]
|
||||
name = "tls"
|
||||
version = "0.0.1"
|
||||
source = "git+https://github.com/alexcrichton/tls-rs#2abeb8996f3795f1e870523b7684dcc2ce64fa85"
|
||||
|
||||
[[package]]
|
||||
name = "url"
|
||||
version = "0.1.0"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue