From ba521880fb08297ff728c417b77d757bc25c54a7 Mon Sep 17 00:00:00 2001 From: JerryShih Date: Thu, 28 Jul 2016 17:37:00 +0200 Subject: [PATCH] Bug 1290032 - return null for InvalidEnum. r=jgilbert --HG-- extra : rebase_source : ae3d4fda39bee8441105b593a2d2c6b2c4003e29 --- dom/canvas/WebGL2ContextSamplers.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dom/canvas/WebGL2ContextSamplers.cpp b/dom/canvas/WebGL2ContextSamplers.cpp index e44eab256abe..b5186f258849 100644 --- a/dom/canvas/WebGL2ContextSamplers.cpp +++ b/dom/canvas/WebGL2ContextSamplers.cpp @@ -203,6 +203,8 @@ WebGL2Context::SamplerParameterfv(WebGLSampler* sampler, GLenum pname, const dom void WebGL2Context::GetSamplerParameter(JSContext*, WebGLSampler* sampler, GLenum pname, JS::MutableHandleValue retval) { + retval.setNull(); + if (IsContextLost()) return; @@ -212,8 +214,6 @@ WebGL2Context::GetSamplerParameter(JSContext*, WebGLSampler* sampler, GLenum pna if (!ValidateSamplerParameterName(pname, "getSamplerParameter")) return; - retval.set(JS::NullValue()); - switch (pname) { case LOCAL_GL_TEXTURE_MIN_FILTER: case LOCAL_GL_TEXTURE_MAG_FILTER: