diff options
author | bors-servo <metajack+bors@gmail.com> | 2015-08-27 09:38:48 -0600 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2015-08-27 09:38:48 -0600 |
commit | 909429702972d53bf02dfe9a4aa93ea0cb588cf4 (patch) | |
tree | 1a64c15ec378b98ae445257c1c7177af65afee6b /components/script/dom/webgltexture.rs | |
parent | 2d704312685249c20fa71d983094fc4e689bc5ff (diff) | |
parent | 2a028f66a2e7ab56094cf856ebdc20bc49ab7d4d (diff) | |
download | servo-909429702972d53bf02dfe9a4aa93ea0cb588cf4.tar.gz servo-909429702972d53bf02dfe9a4aa93ea0cb588cf4.zip |
Auto merge of #7401 - nox:rm-helpers, r=Manishearth
Remove helper traits
Now that `JSRef<T>` is gone, there is no need to have helper traits.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7401)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/webgltexture.rs')
-rw-r--r-- | components/script/dom/webgltexture.rs | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/components/script/dom/webgltexture.rs b/components/script/dom/webgltexture.rs index b14e8e85fe1..c549a6b7513 100644 --- a/components/script/dom/webgltexture.rs +++ b/components/script/dom/webgltexture.rs @@ -55,23 +55,14 @@ impl WebGLTexture { } } -pub trait WebGLTextureHelpers { - fn id(self) -> u32; - fn bind(self, target: u32) -> WebGLResult<()>; - fn delete(self); - fn tex_parameter(self, - target: u32, - name: u32, - value: TexParameterValue) -> WebGLResult<()>; -} -impl<'a> WebGLTextureHelpers for &'a WebGLTexture { - fn id(self) -> u32 { +impl WebGLTexture { + pub fn id(&self) -> u32 { self.id } // NB: Only valid texture targets come here - fn bind(self, target: u32) -> WebGLResult<()> { + pub fn bind(&self, target: u32) -> WebGLResult<()> { if let Some(previous_target) = self.target.get() { if target != previous_target { return Err(WebGLError::InvalidOperation); @@ -85,7 +76,7 @@ impl<'a> WebGLTextureHelpers for &'a WebGLTexture { Ok(()) } - fn delete(self) { + pub fn delete(&self) { if !self.is_deleted.get() { self.is_deleted.set(true); self.renderer.send(CanvasMsg::WebGL(CanvasWebGLMsg::DeleteTexture(self.id))).unwrap(); @@ -95,7 +86,7 @@ impl<'a> WebGLTextureHelpers for &'a WebGLTexture { /// We have to follow the conversion rules for GLES 2.0. See: /// https://www.khronos.org/webgl/public-mailing-list/archives/1008/msg00014.html /// - fn tex_parameter(self, + pub fn tex_parameter(&self, target: u32, name: u32, value: TexParameterValue) -> WebGLResult<()> { |