aboutsummaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
Diffstat (limited to 'components')
-rw-r--r--components/canvas/Cargo.toml2
-rw-r--r--components/canvas/webgl_thread.rs3
-rw-r--r--components/canvas_traits/webgl.rs4
-rw-r--r--components/compositing/Cargo.toml2
-rw-r--r--components/script/Cargo.toml2
-rw-r--r--components/script/dom/webglrenderingcontext.rs8
-rw-r--r--components/servo/Cargo.toml2
7 files changed, 18 insertions, 5 deletions
diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml
index 604fb4e16aa..576f948e4bd 100644
--- a/components/canvas/Cargo.toml
+++ b/components/canvas/Cargo.toml
@@ -16,7 +16,7 @@ compositing = {path = "../compositing"}
cssparser = "0.23.0"
euclid = "0.17"
fnv = "1.0"
-gleam = "0.4"
+gleam = "0.4.29"
ipc-channel = "0.10"
log = "0.3.5"
num-traits = "0.1.32"
diff --git a/components/canvas/webgl_thread.rs b/components/canvas/webgl_thread.rs
index 97fa759c74c..8b6ae674825 100644
--- a/components/canvas/webgl_thread.rs
+++ b/components/canvas/webgl_thread.rs
@@ -892,6 +892,9 @@ impl WebGLImpl {
ctx.gl().delete_vertex_arrays(&[id.get()]),
WebGLCommand::BindVertexArray(id) =>
ctx.gl().bind_vertex_array(id.map_or(0, WebGLVertexArrayId::get)),
+ WebGLCommand::AliasedPointSizeRange(sender) => {
+ sender.send(ctx.gl().alias_point_size_range()).unwrap()
+ }
}
// TODO: update test expectations in order to enable debug assertions
diff --git a/components/canvas_traits/webgl.rs b/components/canvas_traits/webgl.rs
index 208a728f293..269dc42e709 100644
--- a/components/canvas_traits/webgl.rs
+++ b/components/canvas_traits/webgl.rs
@@ -274,6 +274,7 @@ pub enum WebGLCommand {
CreateVertexArray(WebGLSender<Option<WebGLVertexArrayId>>),
DeleteVertexArray(WebGLVertexArrayId),
BindVertexArray(Option<WebGLVertexArrayId>),
+ AliasedPointSizeRange(WebGLSender<(f32, f32)>),
}
macro_rules! define_resource_id_struct {
@@ -546,7 +547,8 @@ impl fmt::Debug for WebGLCommand {
GenerateMipmap(..) => "GenerateMipmap",
CreateVertexArray(..) => "CreateVertexArray",
DeleteVertexArray(..) => "DeleteVertexArray",
- BindVertexArray(..) => "BindVertexArray"
+ BindVertexArray(..) => "BindVertexArray",
+ AliasedPointSizeRange(..) => "AliasedPointSizeRange",
};
write!(f, "CanvasWebGLMsg::{}(..)", name)
diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml
index 8896f70d8b0..083e41d5ab3 100644
--- a/components/compositing/Cargo.toml
+++ b/components/compositing/Cargo.toml
@@ -13,7 +13,7 @@ path = "lib.rs"
[dependencies]
euclid = "0.17"
gfx_traits = {path = "../gfx_traits"}
-gleam = "0.4"
+gleam = "0.4.29"
image = "0.18"
ipc-channel = "0.10"
libc = "0.2"
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
index c9edde464ee..173887dbed6 100644
--- a/components/script/Cargo.toml
+++ b/components/script/Cargo.toml
@@ -45,7 +45,7 @@ domobject_derive = {path = "../domobject_derive"}
encoding_rs = "0.7"
euclid = "0.17"
fnv = "1.0"
-gleam = "0.4"
+gleam = "0.4.29"
half = "1.0"
html5ever = "0.22"
hyper = "0.10"
diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs
index 24c0c3df069..97b65e00019 100644
--- a/components/script/dom/webglrenderingcontext.rs
+++ b/components/script/dom/webglrenderingcontext.rs
@@ -1328,6 +1328,14 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
[x, y, width, height].to_jsval(cx, rval.handle_mut());
return rval.get();
}
+ constants::ALIASED_POINT_SIZE_RANGE => {
+ let (sender, receiver) = webgl_channel().unwrap();
+ self.send_command(WebGLCommand::AliasedPointSizeRange(sender));
+ let (width, height) = receiver.recv().unwrap();
+ rooted!(in(cx) let mut rval = UndefinedValue());
+ [width, height].to_jsval(cx, rval.handle_mut());
+ return rval.get();
+ }
_ => {
if !self.extension_manager.is_get_parameter_name_enabled(parameter) {
self.webgl_error(WebGLError::InvalidEnum);
diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml
index 65c32af94e8..ac3c9b84fae 100644
--- a/components/servo/Cargo.toml
+++ b/components/servo/Cargo.toml
@@ -40,7 +40,7 @@ devtools_traits = {path = "../devtools_traits"}
env_logger = "0.4"
euclid = "0.17"
gfx = {path = "../gfx"}
-gleam = "0.4"
+gleam = "0.4.29"
ipc-channel = "0.10"
layout_thread = {path = "../layout_thread"}
log = "0.3"