Bug 1048719 - [WebGL2] Remove WebGLQueryRefPtr typedef. r=jgilbert
authorDan Glastonbury <dglastonbury@mozilla.com>
Wed, 26 Nov 2014 13:46:49 +1000
changeset 218141 af5fc587f98b4cdca6280181fff03a2b8fc16c08
parent 218140 f5dc77e4a2a8a19566e7f43f8ca009ecb56ec08c
child 218152 707a34b55e44baf41a7e3480db80e7f0d799e219
child 218158 88befbeb732185b11be2c0004e1a46cf67d53880
push id27916
push usercbook@mozilla.com
push dateMon, 01 Dec 2014 10:55:11 +0000
treeherdermozilla-central@af5fc587f98b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgilbert
bugs1048719
milestone37.0a1
first release with
nightly linux32
af5fc587f98b / 37.0a1 / 20141201030207 / files
nightly linux64
af5fc587f98b / 37.0a1 / 20141201030207 / files
nightly mac
af5fc587f98b / 37.0a1 / 20141201030207 / files
nightly win32
af5fc587f98b / 37.0a1 / 20141201030207 / files
nightly win64
af5fc587f98b / 37.0a1 / 20141201030207 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1048719 - [WebGL2] Remove WebGLQueryRefPtr typedef. r=jgilbert
dom/canvas/WebGL2ContextQueries.cpp
dom/canvas/WebGLContext.h
--- a/dom/canvas/WebGL2ContextQueries.cpp
+++ b/dom/canvas/WebGL2ContextQueries.cpp
@@ -51,17 +51,17 @@ SimulateOcclusionQueryTarget(const gl::G
         return target;
     } else if (gl->IsSupported(gl::GLFeature::occlusion_query2)) {
         return LOCAL_GL_ANY_SAMPLES_PASSED;
     }
 
     return LOCAL_GL_SAMPLES_PASSED;
 }
 
-WebGLQueryRefPtr*
+WebGLRefPtr<WebGLQuery>*
 WebGLContext::GetQueryTargetSlot(GLenum target)
 {
     switch (target) {
         case LOCAL_GL_ANY_SAMPLES_PASSED:
         case LOCAL_GL_ANY_SAMPLES_PASSED_CONSERVATIVE:
             return &mActiveOcclusionQuery;
 
         case LOCAL_GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN:
--- a/dom/canvas/WebGLContext.h
+++ b/dom/canvas/WebGLContext.h
@@ -90,18 +90,16 @@ class ImageData;
 struct WebGLContextAttributes;
 template<typename> struct Nullable;
 }
 
 namespace gfx {
 class SourceSurface;
 }
 
-typedef WebGLRefPtr<WebGLQuery> WebGLQueryRefPtr;
-
 WebGLTexelFormat GetWebGLTexelFormat(TexInternalFormat format);
 
 void AssertUintParamCorrect(gl::GLContext* gl, GLenum pname, GLuint shadow);
 
 struct WebGLContextOptions
 {
     // these are defaults
     WebGLContextOptions();
@@ -896,20 +894,20 @@ private:
     WebGLRefPtr<WebGLBuffer>* GetBufferSlotByTargetIndexed(GLenum target,
                                                            GLuint index,
                                                            const char* info);
     bool ValidateBufferUsageEnum(GLenum target, const char* info);
 
 // -----------------------------------------------------------------------------
 // Queries (WebGL2ContextQueries.cpp)
 protected:
-    WebGLQueryRefPtr* GetQueryTargetSlot(GLenum target);
+    WebGLRefPtr<WebGLQuery>* GetQueryTargetSlot(GLenum target);
 
-    WebGLQueryRefPtr mActiveOcclusionQuery;
-    WebGLQueryRefPtr mActiveTransformFeedbackQuery;
+    WebGLRefPtr<WebGLQuery> mActiveOcclusionQuery;
+    WebGLRefPtr<WebGLQuery> mActiveTransformFeedbackQuery;
 
 // -----------------------------------------------------------------------------
 // State and State Requests (WebGLContextState.cpp)
 public:
     void Disable(GLenum cap);
     void Enable(GLenum cap);
     bool GetStencilBits(GLint* out_stencilBits);
     JS::Value GetParameter(JSContext* cx, GLenum pname, ErrorResult& rv);