diff --git a/components/canvas/webgl_paint_task.rs b/components/canvas/webgl_paint_task.rs
index f6c5553b424..f5cd8a87fab 100644
--- a/components/canvas/webgl_paint_task.rs
+++ b/components/canvas/webgl_paint_task.rs
@@ -171,6 +171,9 @@ impl WebGLPaintTask {
             CanvasWebGLMsg::DrawingBufferHeight(sender) =>
                 self.send_drawing_buffer_height(sender),
         }
+
+        // FIXME: Convert to `debug_assert!` once tests are run with debug assertions
+        assert!(gl::get_error() == gl::NO_ERROR);
     }
 
     /// Creates a new `WebGLPaintTask` and returns the out-of-process sender and the in-process
@@ -259,7 +262,7 @@ impl WebGLPaintTask {
     }
 
     fn create_texture(&self, chan: IpcSender<Option<NonZero<u32>>>) {
-        let texture = gl::gen_framebuffers(1)[0];
+        let texture = gl::gen_textures(1)[0];
         let texture = if texture == 0 {
             None
         } else {
diff --git a/components/script/dom/webgltexture.rs b/components/script/dom/webgltexture.rs
index 2288c9be7f7..e7f645ce235 100644
--- a/components/script/dom/webgltexture.rs
+++ b/components/script/dom/webgltexture.rs
@@ -70,7 +70,7 @@ impl WebGLTexture {
             self.target.set(Some(target));
         }
 
-        self.renderer.send(CanvasMsg::WebGL(CanvasWebGLMsg::BindTexture(self.id, target))).unwrap();
+        self.renderer.send(CanvasMsg::WebGL(CanvasWebGLMsg::BindTexture(target, self.id))).unwrap();
 
         Ok(())
     }