Skip to content

/ servo

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update webrender, copy new shaders, pin ipc-channel. #12711

Merged
merged 4 commits into from Aug 3, 2016
+1,871 −91
Merged

Update webrender, copy new shaders, pin ipc-channel. #12711

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e5f183a
Add wr-debug option.
gw3583 Aug 1, 2016
2ebf861
Copy shaders from WR repo.
gw3583 Aug 1, 2016
c349e4b
Copy fixed box-shadow shader.
gw3583 Aug 2, 2016
db8c3ef
Update cargo.lock for wr2, pin ipc-channel.
gw3583 Aug 3, 2016
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

2 components/canvas/Cargo.toml
View file
Open in desktop
@@ -15,7 +15,7 @@ canvas_traits = {path = "../canvas_traits"}
euclid = "0.7.1"
gfx_traits = {path = "../gfx_traits"}
gleam = "0.2.8"
ipc-channel = {git = "https://github.com/servo/ipc-channel"}
ipc-channel = "0.4.0"
log = "0.3.5"
num-traits = "0.1.32"
offscreen_gl_context = "0.1.2"
2 components/canvas_traits/Cargo.toml
View file
Open in desktop
@@ -16,7 +16,7 @@ euclid = "0.7.1"
gfx_traits = {path = "../gfx_traits"}
heapsize = "0.3.0"
heapsize_plugin = "0.1.2"
ipc-channel = {git = "https://github.com/servo/ipc-channel"}
ipc-channel = "0.4.0"
plugins = {path = "../plugins"}
serde = {version = "0.7.15", features = ["nightly"]}
serde_macros = "0.7.15"
2 components/compositing/Cargo.toml
View file
Open in desktop
@@ -16,7 +16,7 @@ euclid = "0.7.1"
gfx_traits = {path = "../gfx_traits"}
gleam = "0.2.8"
image = "0.10"
ipc-channel = {git = "https://github.com/servo/ipc-channel"}
ipc-channel = "0.4.0"
layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]}
log = "0.3.5"
msg = {path = "../msg"}
2 components/constellation/Cargo.toml
View file
Open in desktop
@@ -18,7 +18,7 @@ devtools_traits = {path = "../devtools_traits"}
euclid = "0.7.1"
gfx = {path = "../gfx"}
gfx_traits = {path = "../gfx_traits"}
ipc-channel = {git = "https://github.com/servo/ipc-channel"}
ipc-channel = "0.4.0"
layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]}
layout_traits = {path = "../layout_traits"}
log = "0.3.5"
2 components/devtools/Cargo.toml
View file
Open in desktop
@@ -12,7 +12,7 @@ path = "lib.rs"
[dependencies]
devtools_traits = {path = "../devtools_traits"}
hyper = { version = "0.9.9", features = [ "serde-serialization" ] }
ipc-channel = {git = "https://github.com/servo/ipc-channel"}
ipc-channel = "0.4.0"
log = "0.3.5"
msg = {path = "../msg"}
plugins = {path = "../plugins"}
2 components/devtools_traits/Cargo.toml
View file
Open in desktop
@@ -14,7 +14,7 @@ bitflags = "0.7"
heapsize = "0.3.0"
heapsize_plugin = "0.1.2"
hyper = {version = "0.9.9", features = ["serde-serialization"]}
ipc-channel = {git = "https://github.com/servo/ipc-channel"}
ipc-channel = "0.4.0"
msg = {path = "../msg"}
serde = "0.7.15"
serde_macros = "0.7.15"
2 components/gfx/Cargo.toml
View file
Open in desktop
@@ -20,7 +20,7 @@ gfx_traits = {path = "../gfx_traits"}
harfbuzz-sys = "0.1"
heapsize = "0.3.0"
heapsize_plugin = "0.1.2"
ipc-channel = {git = "https://github.com/servo/ipc-channel"}
ipc-channel = "0.4.0"
layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]}
lazy_static = "0.2"
libc = "0.2"
2 components/layout/Cargo.toml
View file
Open in desktop
@@ -21,7 +21,7 @@ gfx = {path = "../gfx"}
gfx_traits = {path = "../gfx_traits"}
heapsize = "0.3.0"
heapsize_plugin = "0.1.2"
ipc-channel = {git = "https://github.com/servo/ipc-channel"}
ipc-channel = "0.4.0"
libc = "0.2"
log = "0.3.5"
msg = {path = "../msg"}
2 components/layout_thread/Cargo.toml
View file
Open in desktop
@@ -18,7 +18,7 @@ gfx = {path = "../gfx"}
gfx_traits = {path = "../gfx_traits"}
heapsize = "0.3.0"
heapsize_plugin = "0.1.2"
ipc-channel = {git = "https://github.com/servo/ipc-channel"}
ipc-channel = "0.4.0"
layout = {path = "../layout"}
layout_traits = {path = "../layout_traits"}
log = "0.3.5"
2 components/layout_traits/Cargo.toml
View file
Open in desktop
@@ -16,7 +16,7 @@ msg = {path = "../msg"}
net_traits = {path = "../net_traits"}
profile_traits = {path = "../profile_traits"}
util = {path = "../util"}
ipc-channel = {git = "https://github.com/servo/ipc-channel"}
ipc-channel = "0.4.0"
url = {version = "1.0.0", features = ["heap_size"]}

[dependencies.webrender_traits]
2 components/msg/Cargo.toml
View file
Open in desktop
@@ -15,7 +15,7 @@ cssparser = {version = "0.5.4", features = ["heap_size", "serde-serialization"]}
heapsize = "0.3.0"
heapsize_plugin = "0.1.2"
hyper = {version = "0.9.9", features = ["serde-serialization"]}
ipc-channel = {git = "https://github.com/servo/ipc-channel"}
ipc-channel = "0.4.0"
plugins = {path = "../plugins"}
serde = "0.7.15"
serde_macros = "0.7.15"
2 components/net/Cargo.toml
View file
Open in desktop
@@ -19,7 +19,7 @@ devtools_traits = {path = "../devtools_traits"}
flate2 = "0.2.0"
hyper = {version = "0.9.9", features = ["serde-serialization"]}
immeta = "0.3.1"
ipc-channel = {git = "https://github.com/servo/ipc-channel"}
ipc-channel = "0.4.0"
lazy_static = "0.2"
log = "0.3.5"
matches = "0.1"
2 components/net_traits/Cargo.toml
View file
Open in desktop
@@ -12,7 +12,7 @@ path = "lib.rs"
[dependencies]
util = {path = "../util"}
msg = {path = "../msg"}
ipc-channel = {git = "https://github.com/servo/ipc-channel"}
ipc-channel = "0.4.0"
heapsize = "0.3.0"
heapsize_plugin = "0.1.2"
hyper = { version = "0.9.9", features = [ "serde-serialization" ] }
2 components/profile/Cargo.toml
View file
Open in desktop
@@ -13,7 +13,7 @@ path = "lib.rs"
profile_traits = {path = "../profile_traits"}
plugins = {path = "../plugins"}
util = {path = "../util", features = ["servo"]}
ipc-channel = {git = "https://github.com/servo/ipc-channel"}
ipc-channel = "0.4.0"
heartbeats-simple = "0.3"
log = "0.3.5"
serde = "0.7.15"
2 components/profile_traits/Cargo.toml
View file
Open in desktop
@@ -13,7 +13,7 @@ path = "lib.rs"
energy-profiling = ["energymon", "energy-monitor"]

[dependencies]
ipc-channel = {git = "https://github.com/servo/ipc-channel"}
ipc-channel = "0.4.0"
energymon = {git = "https://github.com/energymon/energymon-rust.git", optional = true}
energy-monitor = {version = "0.2.0", optional = true}
plugins = {path = "../plugins"}
2 components/script/Cargo.toml
View file
Open in desktop
@@ -38,7 +38,7 @@ heapsize_plugin = "0.1.2"
html5ever = {version = "0.5.1", features = ["heap_size", "unstable"]}
hyper = {version = "0.9.9", features = ["serde-serialization"]}
image = "0.10"
ipc-channel = {git = "https://github.com/servo/ipc-channel"}
ipc-channel = "0.4.0"
js = {git = "https://github.com/servo/rust-mozjs"}
libc = "0.2"
log = "0.3.5"
2 components/script_layout_interface/Cargo.toml
View file
Open in desktop
@@ -18,7 +18,7 @@ euclid = "0.7.1"
gfx_traits = {path = "../gfx_traits"}
heapsize = "0.3.0"
heapsize_plugin = "0.1.2"
ipc-channel = {git = "https://github.com/servo/ipc-channel"}
ipc-channel = "0.4.0"
libc = "0.2"
log = "0.3.5"
msg = {path = "../msg"}
2 components/script_traits/Cargo.toml
View file
Open in desktop
@@ -18,7 +18,7 @@ euclid = "0.7.1"
gfx_traits = {path = "../gfx_traits"}
heapsize = "0.3.0"
heapsize_plugin = "0.1.2"
ipc-channel = {git = "https://github.com/servo/ipc-channel"}
ipc-channel = "0.4.0"
layers = {git = "https://github.com/servo/rust-layers", features = ["plugins"]}
libc = "0.2"
msg = {path = "../msg"}
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.