Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 23:03:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Switch CEF on screen build from glfw -> glutin.

Browse source
This commit is contained in:
Glenn Watson 2015-01-19 08:56:43 +10:00
parent 9844ec907e
commit db31b818bc
4 changed files with 54 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

49
ports/cef/Cargo.lock generated
View file

@ -9,8 +9,7 @@ dependencies = [
"devtools 0.0.1",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"gfx 0.0.1",
"glfw 0.0.1 (git+https://github.com/servo/glfw-rs?ref=servo)",
"glfw_app 0.0.1",
"glutin_app 0.0.1",
"js 0.1.0 (git+https://github.com/servo/rust-mozjs)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"msg 0.0.1",
@ -24,6 +23,14 @@ dependencies = [
"util 0.0.1",
]
[[package]]
name = "android_glue"
version = "0.0.1"
source = "git+https://github.com/servo/android-rs-glue?ref=servo#122bc28545b5e59a923c466a484c403fa691bd55"
dependencies = [
"compile_msg 0.1.3 (git+https://github.com/huonw/compile_msg)",
]
[[package]]
name = "azure"
version = "0.1.0"
@ -61,6 +68,11 @@ name = "cocoa"
version = "0.1.1"
source = "git+https://github.com/servo/rust-cocoa#bf53a53ce306279fc1cae0d56fdd5e7216696420"
[[package]]
name = "compile_msg"
version = "0.1.3"
source = "git+https://github.com/huonw/compile_msg#b19da50cacf5b11bbc065da6b449f6b4fe7c019a"
[[package]]
name = "compositing"
version = "0.0.1"
@ -327,6 +339,34 @@ dependencies = [
"util 0.0.1",
]
[[package]]
name = "glutin"
version = "0.0.2"
source = "git+https://github.com/servo/glutin?ref=servo#db27370a1cbafcbfcaeee52a44076a61b3e0573c"
dependencies = [
"android_glue 0.0.1 (git+https://github.com/servo/android-rs-glue?ref=servo)",
"cocoa 0.1.1 (git+https://github.com/servo/rust-cocoa)",
"core_graphics 0.1.0 (git+https://github.com/servo/rust-core-graphics)",
"gl_common 0.0.1 (git+https://github.com/bjz/gl-rs.git)",
"gl_generator 0.0.1 (git+https://github.com/bjz/gl-rs.git)",
"winapi 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "glutin_app"
version = "0.0.1"
dependencies = [
"cgl 0.0.1 (git+https://github.com/servo/rust-cgl)",
"compositing 0.0.1",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"gleam 0.0.1 (git+https://github.com/servo/gleam)",
"glutin 0.0.2 (git+https://github.com/servo/glutin?ref=servo)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"msg 0.0.1",
"time 0.1.0 (git+https://github.com/rust-lang/time)",
"util 0.0.1",
]
[[package]]
name = "glx"
version = "0.0.1"
@ -726,6 +766,11 @@ name = "uuid"
version = "0.1.1"
source = "git+https://github.com/rust-lang/uuid#fc793c974a25c126c5cf5daa3b18973512a7a6a0"
[[package]]
name = "winapi"
version = "0.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "xlib"
version = "0.1.0"

8
ports/cef/Cargo.toml
View file

@ -11,8 +11,8 @@ crate-type = ["dylib"]
[dependencies.servo]
path = "../../components/servo"
[dependencies.glfw_app]
path = "../glfw"
[dependencies.glutin_app]
path = "../glutin"
[dependencies.plugins]
path = "../../components/plugins"
@ -44,10 +44,6 @@ git = "https://github.com/servo/rust-azure"
[dependencies.geom]
git = "https://github.com/servo/rust-geom"
[dependencies.glfw]
git = "https://github.com/servo/glfw-rs"
branch = "servo"
[dependencies.js]
git = "https://github.com/servo/rust-mozjs"

8
ports/cef/browser.rs
View file

@ -13,7 +13,7 @@ use types::{cef_browser_settings_t, cef_string_t, cef_window_info_t};
use window;
use compositing::windowing::{WindowNavigateMsg, WindowEvent};
use glfw_app;
use glutin_app;
use libc::c_int;
use servo_util::opts;
use std::cell::{Cell, RefCell};
@ -22,7 +22,7 @@ thread_local!(pub static BROWSERS: RefCell<Vec<CefBrowser>> = RefCell::new(vec!(
pub enum ServoBrowser {
Invalid,
OnScreen(Browser<glfw_app::window::Window>),
OnScreen(Browser<glutin_app::window::Window>),
OffScreen(Browser<window::Window>),
}
@ -93,8 +93,8 @@ impl ServoCefBrowser {
let host = ServoCefBrowserHost::new(client.clone()).as_cef_interface();
let servo_browser = if window_info.windowless_rendering_enabled == 0 {
let glfw_window = glfw_app::create_window();
let servo_browser = Browser::new(Some(glfw_window.clone()));
let glutin_window = glutin_app::create_window();
let servo_browser = Browser::new(Some(glutin_window.clone()));
ServoBrowser::OnScreen(servo_browser)
} else {
ServoBrowser::Invalid

3
ports/cef/lib.rs
View file

@ -20,8 +20,7 @@ extern crate azure;
extern crate geom;
extern crate gfx;
extern crate gleam;
extern crate glfw;
extern crate glfw_app;
extern crate glutin_app;
extern crate js;
extern crate layers;
extern crate png;