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

Auto merge of #10652 - dzbarsky:reserved, r=dzbarsky

Browse source 
Prevent use of reserved names in BindAttribLocation

(Depend on the WebGL tests landing)

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10652)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-04-19 09:46:24 +05:30
commit 82b952c03f
3 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/script/dom/webglprogram.rs
View file

@ -147,7 +147,7 @@ impl WebGLProgram {
}
// Check if the name is reserved
if name.starts_with("webgl") || name.starts_with("_webgl_") {
if name.starts_with("gl_") || name.starts_with("webgl") || name.starts_with("_webgl_") {
return Err(WebGLError::InvalidOperation);
}
@ -185,6 +185,10 @@ impl WebGLProgram {
}
// Check if the name is reserved
if name.starts_with("gl_") {
return Err(WebGLError::InvalidOperation);
}
if name.starts_with("webgl") || name.starts_with("_webgl_") {
return Ok(None);
}

10
components/script/dom/webglrenderingcontext.rs
View file

@ -979,12 +979,10 @@ impl WebGLRenderingContextMethods for WebGLRenderingContext {
fn GetUniformLocation(&self,
program: Option<&WebGLProgram>,
name: DOMString) -> Option<Root<WebGLUniformLocation>> {
if let Some(program) = program {
handle_potential_webgl_error!(self, program.get_uniform_location(name), None)
.map(|location| WebGLUniformLocation::new(self.global().r(), location, program.id()))
} else {
None
}
program.and_then(|p| {
handle_potential_webgl_error!(self, p.get_uniform_location(name), None)
.map(|location| WebGLUniformLocation::new(self.global().r(), location, p.id()))
})
}
// https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.3

3
tests/wpt/metadata/webgl/conformance-1.0.3/conformance/programs/gl-bind-attrib-location-test.html.ini
View file

@ -1,3 +1,4 @@
[gl-bind-attrib-location-test.html]
type: testharness
expected: CRASH
[WebGL test #6: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
expected: FAIL