aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-06-07 02:27:29 -0700
committerGitHub <noreply@github.com>2017-06-07 02:27:29 -0700
commit3db7f5d556d85ff6af9bb81f693a2c65e6e791fa (patch)
tree712ee49010840b98a6e13dfecd6235e42e19773c
parent644773d492909e4450832954d21970271655e798 (diff)
parentc034d99880c1e2fe8e955cf673ce7f5e8b1e2a85 (diff)
downloadservo-3db7f5d556d85ff6af9bb81f693a2c65e6e791fa.tar.gz
servo-3db7f5d556d85ff6af9bb81f693a2c65e6e791fa.zip
Auto merge of #17189 - bd339:iss17038, r=emilio
Add pref to force WebGL context creation failure <!-- Please describe your changes on the following line: --> Introduces the pref `webgl.testing.context_creation_error`, to force creation of a new WebGLRenderingContext to fail. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #17038 (github issue number if applicable). <!-- Either: --> - [X] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17189) <!-- Reviewable:end -->
-rw-r--r--components/script/dom/webglrenderingcontext.rs5
-rw-r--r--resources/prefs.json3
-rw-r--r--tests/wpt/mozilla/meta/MANIFEST.json2
-rw-r--r--tests/wpt/mozilla/meta/mozilla/webgl/context_creation_error.html.ini4
-rw-r--r--tests/wpt/mozilla/tests/mozilla/webgl/context_creation_error.html4
5 files changed, 10 insertions, 8 deletions
diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs
index eb1578d1b3a..8267c5bf2d1 100644
--- a/components/script/dom/webglrenderingcontext.rs
+++ b/components/script/dom/webglrenderingcontext.rs
@@ -51,6 +51,7 @@ use net_traits::image::base::PixelFormat;
use net_traits::image_cache::ImageResponse;
use offscreen_gl_context::{GLContextAttributes, GLLimits};
use script_traits::ScriptMsg as ConstellationMsg;
+use servo_config::prefs::PREFS;
use std::cell::Cell;
use std::collections::HashMap;
use webrender_traits;
@@ -166,6 +167,10 @@ impl WebGLRenderingContext {
size: Size2D<i32>,
attrs: GLContextAttributes)
-> Result<WebGLRenderingContext, String> {
+ if let Some(true) = PREFS.get("webgl.testing.context_creation_error").as_boolean() {
+ return Err("WebGL context creation error forced by pref `webgl.testing.context_creation_error`".into());
+ }
+
let (sender, receiver) = ipc::channel().unwrap();
let constellation_chan = window.upcast::<GlobalScope>().constellation_chan();
constellation_chan.send(ConstellationMsg::CreateWebGLPaintThread(size, attrs, sender))
diff --git a/resources/prefs.json b/resources/prefs.json
index 32406257d61..3c8203a0972 100644
--- a/resources/prefs.json
+++ b/resources/prefs.json
@@ -66,5 +66,6 @@
"shell.homepage": "https://servo.org",
"shell.keep_screen_on.enabled": false,
"shell.native-orientation": "both",
- "shell.native-titlebar.enabled": true
+ "shell.native-titlebar.enabled": true,
+ "webgl.testing.context_creation_error": false
}
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 06dc122bd79..66f4ca615c8 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -31668,7 +31668,7 @@
"support"
],
"mozilla/webgl/context_creation_error.html": [
- "d6ffc0c4ea5671399d3c9b6440608b47c80699cf",
+ "583df4d3fb090862383338a50548b4afb333dd52",
"testharness"
],
"mozilla/webgl/draw_arrays_simple.html": [
diff --git a/tests/wpt/mozilla/meta/mozilla/webgl/context_creation_error.html.ini b/tests/wpt/mozilla/meta/mozilla/webgl/context_creation_error.html.ini
index bb16d57a91d..e7d26a40344 100644
--- a/tests/wpt/mozilla/meta/mozilla/webgl/context_creation_error.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/webgl/context_creation_error.html.ini
@@ -1,5 +1,3 @@
[context_creation_error.html]
type: reftest
- [WebGLContextEvent "webglcontextcreationerror" event]
- expected: FAIL
-
+ prefs: ["webgl.testing.context_creation_error:true"]
diff --git a/tests/wpt/mozilla/tests/mozilla/webgl/context_creation_error.html b/tests/wpt/mozilla/tests/mozilla/webgl/context_creation_error.html
index bc16a868ed0..296bc918032 100644
--- a/tests/wpt/mozilla/tests/mozilla/webgl/context_creation_error.html
+++ b/tests/wpt/mozilla/tests/mozilla/webgl/context_creation_error.html
@@ -14,9 +14,7 @@ async_test(function() {
"'statusMessage' should be a string, " + typeof(e.statusMessage) + " found");
}), false);
- // TODO: Create a dummy function to fail the webgl context forcefully from js tests.
- // Now that antialias doesn't throw an error, there isn't a way to force context creation errors.
- var gl = canvas.getContext('webgl', { antialiasing: true });
+ var gl = canvas.getContext('webgl');
assert_false(!!gl, "WebGLContext creation succeeded, please update this test!");
});