diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-08-16 09:45:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-16 09:45:13 -0500 |
| commit | 4d10d39e8fe841c5fe2ac58da2daaa13c10c140e (patch) | |
| tree | f77d68b734a6327898cc8c01505b0723bf45ed4a /components/script/dom/webgluniformlocation.rs | |
| parent | ee94e2b7c0bd327abe8f9545b2a1f792f67a2bdd (diff) | |
| parent | cfe22e3979b7270833a4b450b25fb2157deb1da2 (diff) | |
| download | servo-4d10d39e8fe841c5fe2ac58da2daaa13c10c140e.tar.gz servo-4d10d39e8fe841c5fe2ac58da2daaa13c10c140e.zip | |
Auto merge of #18114 - emilio:revert-webgl-refactor, r=nox
Revert "Auto merge of #17891 - MortimerGoro:webgl_move, r=glennw,emilio"
This reverts commit 90f55ea4580e2a15f7d70d0491444f18b972d450, reversing
changes made to 2e60b27a2186a8cba4b952960155dfcf3f47d7db.
Doing that per Josh's request, since it's causing very frequent intermittent OOMs on the android builders.
<!-- 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/18114)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/webgluniformlocation.rs')
| -rw-r--r-- | components/script/dom/webgluniformlocation.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/script/dom/webgluniformlocation.rs b/components/script/dom/webgluniformlocation.rs index 47292adeb18..228808303c4 100644 --- a/components/script/dom/webgluniformlocation.rs +++ b/components/script/dom/webgluniformlocation.rs @@ -3,12 +3,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ // https://www.khronos.org/registry/webgl/specs/latest/1.0/webgl.idl -use canvas_traits::webgl::WebGLProgramId; use dom::bindings::codegen::Bindings::WebGLUniformLocationBinding; use dom::bindings::js::Root; use dom::bindings::reflector::{Reflector, reflect_dom_object}; use dom::window::Window; use dom_struct::dom_struct; +use webrender_api::WebGLProgramId; #[dom_struct] pub struct WebGLUniformLocation { |