From ad414824b2941802a6ac9230e24e89cd0eaa1b5e Mon Sep 17 00:00:00 2001
From: ecoal95 <ecoal95@gmail.com>
Date: Mon, 4 May 2015 02:06:20 +0200
Subject: [PATCH] Fix WebGL objects inheritance

---
 components/script/dom/webglbuffer.rs          | 7 ++++---
 components/script/dom/webglobject.rs          | 2 +-
 components/script/dom/webglprogram.rs         | 7 ++++---
 components/script/dom/webglshader.rs          | 7 ++++---
 components/script/dom/webgluniformlocation.rs | 7 ++++---
 5 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/components/script/dom/webglbuffer.rs b/components/script/dom/webglbuffer.rs
index e5535fa36ab..ee19ff7d57c 100644
--- a/components/script/dom/webglbuffer.rs
+++ b/components/script/dom/webglbuffer.rs
@@ -6,18 +6,19 @@
 use dom::bindings::codegen::Bindings::WebGLBufferBinding;
 use dom::bindings::global::GlobalRef;
 use dom::bindings::js::{Temporary, JSRef};
-use dom::bindings::utils::{Reflector, reflect_dom_object};
+use dom::bindings::utils::reflect_dom_object;
+use dom::webglobject::WebGLObject;
 
 #[dom_struct]
 pub struct WebGLBuffer {
-    reflector_: Reflector,
+    webgl_object: WebGLObject,
     id: u32,
 }
 
 impl WebGLBuffer {
     fn new_inherited(id: u32) -> WebGLBuffer {
         WebGLBuffer {
-            reflector_: Reflector::new(),
+            webgl_object: WebGLObject::new_inherited(),
             id: id,
         }
     }
diff --git a/components/script/dom/webglobject.rs b/components/script/dom/webglobject.rs
index 7047c3fa6fd..0decbe1060d 100644
--- a/components/script/dom/webglobject.rs
+++ b/components/script/dom/webglobject.rs
@@ -14,7 +14,7 @@ pub struct WebGLObject {
 }
 
 impl WebGLObject {
-    fn new_inherited() -> WebGLObject {
+    pub fn new_inherited() -> WebGLObject {
         WebGLObject {
             reflector_: Reflector::new(),
         }
diff --git a/components/script/dom/webglprogram.rs b/components/script/dom/webglprogram.rs
index f8eeea9d7cb..7839b0ffb03 100644
--- a/components/script/dom/webglprogram.rs
+++ b/components/script/dom/webglprogram.rs
@@ -6,18 +6,19 @@
 use dom::bindings::codegen::Bindings::WebGLProgramBinding;
 use dom::bindings::global::GlobalRef;
 use dom::bindings::js::{Temporary, JSRef};
-use dom::bindings::utils::{Reflector, reflect_dom_object};
+use dom::bindings::utils::reflect_dom_object;
+use dom::webglobject::WebGLObject;
 
 #[dom_struct]
 pub struct WebGLProgram {
-    reflector_: Reflector,
+    webgl_object: WebGLObject,
     id: u32,
 }
 
 impl WebGLProgram {
     fn new_inherited(id: u32) -> WebGLProgram {
         WebGLProgram {
-            reflector_: Reflector::new(),
+            webgl_object: WebGLObject::new_inherited(),
             id: id,
         }
     }
diff --git a/components/script/dom/webglshader.rs b/components/script/dom/webglshader.rs
index 795dc8c865b..ade6f6e93c9 100644
--- a/components/script/dom/webglshader.rs
+++ b/components/script/dom/webglshader.rs
@@ -6,18 +6,19 @@
 use dom::bindings::codegen::Bindings::WebGLShaderBinding;
 use dom::bindings::global::GlobalRef;
 use dom::bindings::js::{Temporary, JSRef};
-use dom::bindings::utils::{Reflector, reflect_dom_object};
+use dom::bindings::utils::reflect_dom_object;
+use dom::webglobject::WebGLObject;
 
 #[dom_struct]
 pub struct WebGLShader {
-    reflector_: Reflector,
+    webgl_object: WebGLObject,
     id: u32,
 }
 
 impl WebGLShader {
     fn new_inherited(id: u32) -> WebGLShader {
         WebGLShader {
-            reflector_: Reflector::new(),
+            webgl_object: WebGLObject::new_inherited(),
             id: id,
         }
     }
diff --git a/components/script/dom/webgluniformlocation.rs b/components/script/dom/webgluniformlocation.rs
index 18e175f3bc2..8d7beab3894 100644
--- a/components/script/dom/webgluniformlocation.rs
+++ b/components/script/dom/webgluniformlocation.rs
@@ -6,18 +6,19 @@
 use dom::bindings::codegen::Bindings::WebGLUniformLocationBinding;
 use dom::bindings::global::GlobalRef;
 use dom::bindings::js::{Temporary, JSRef};
-use dom::bindings::utils::{Reflector, reflect_dom_object};
+use dom::bindings::utils::reflect_dom_object;
+use dom::webglobject::WebGLObject;
 
 #[dom_struct]
 pub struct WebGLUniformLocation {
-    reflector_: Reflector,
+    webgl_object: WebGLObject,
     id: u32,
 }
 
 impl WebGLUniformLocation {
     fn new_inherited(id: u32) -> WebGLUniformLocation {
         WebGLUniformLocation {
-            reflector_: Reflector::new(),
+            webgl_object: WebGLObject::new_inherited(),
             id: id,
         }
     }