--- a/dom/canvas/WebGLExtensionDisjointTimerQuery.cpp
+++ b/dom/canvas/WebGLExtensionDisjointTimerQuery.cpp
@@ -18,20 +18,16 @@ namespace mozilla {
 
 WebGLExtensionDisjointTimerQuery::WebGLExtensionDisjointTimerQuery(WebGLContext* webgl)
   : WebGLExtensionBase(webgl)
   , mActiveQuery(nullptr)
 {
   MOZ_ASSERT(IsSupported(webgl), "Don't construct extension if unsupported.");
 }
 
-WebGLExtensionDisjointTimerQuery::~WebGLExtensionDisjointTimerQuery()
-{
-}
-
 already_AddRefed<WebGLTimerQuery>
 WebGLExtensionDisjointTimerQuery::CreateQueryEXT()
 {
   if (!mContext)
     return nullptr;
 
   RefPtr<WebGLTimerQuery> query = WebGLTimerQuery::Create(mContext);
   return query.forget();

--- a/dom/canvas/WebGLExtensionEXTColorBufferFloat.cpp
+++ b/dom/canvas/WebGLExtensionEXTColorBufferFloat.cpp
@@ -40,14 +40,14 @@ WebGLExtensionEXTColorBufferFloat::WebGL
 }
 
 /*static*/ bool
 WebGLExtensionEXTColorBufferFloat::IsSupported(const WebGLContext* webgl)
 {
     if (!webgl->IsWebGL2())
         return false;
 
-    return webgl->gl->IsSupported(gl::GLFeature::EXT_color_buffer_float);
+    return webgl->GL()->IsSupported(gl::GLFeature::EXT_color_buffer_float);
 }
 
 IMPL_WEBGL_EXTENSION_GOOP(WebGLExtensionEXTColorBufferFloat, EXT_color_buffer_float)
 
 } // namespace mozilla

--- a/dom/canvas/WebGLExtensions.h
+++ b/dom/canvas/WebGLExtensions.h
@@ -186,17 +186,17 @@ private:
                                               \
         DECL_WEBGL_EXTENSION_GOOP             \
     };
 
 #define BASIC_EXT_DEFINE(T) \
     class T final : public WebGLExtensionBase \
     {                                         \
     public:                                   \
-        explicit T(WebGLContext* webgl);      \
+        explicit T(WebGLContext* webgl)       \
             : WebGLExtensionBase(webgl)       \
         {                                     \
             IsSupported(webgl);               \
         }                                     \
                                               \
         DECL_WEBGL_EXTENSION_GOOP             \
     };
 
@@ -212,20 +212,19 @@ BASIC_EXT_DEFINE(WebGLExtensionDebugRend
 BASIC_EXT_DECL(WebGLExtensionDepthTexture)
 BASIC_EXT_DEFINE(WebGLExtensionElementIndexUint)
 BASIC_EXT_DECL(WebGLExtensionEXTColorBufferFloat)
 BASIC_EXT_DEFINE(WebGLExtensionFragDepth)
 BASIC_EXT_DEFINE(WebGLExtensionShaderTextureLod)
 BASIC_EXT_DECL(WebGLExtensionSRGB)
 BASIC_EXT_DEFINE(WebGLExtensionStandardDerivatives)
 BASIC_EXT_DEFINE(WebGLExtensionTextureFilterAnisotropic)
-BASIC_EXT_DEFINE(WebGLExtensionTextureFloatLinear)
-BASIC_EXT_DEFINE(WebGLExtensionTextureHalfFloatLinear)
+BASIC_EXT_DECL(WebGLExtensionTextureFloatLinear)
+BASIC_EXT_DECL(WebGLExtensionTextureHalfFloatLinear)
 
-#define BASIC_EXT_DECL aaaaaaa
 #undef BASIC_EXT_DECL
 #undef BASIC_EXT_DEFINE
 #undef DECL_WEBGL_EXTENSION_GOOP
 
 ////
 
 #define IMPL_WEBGL_EXTENSION_GOOP(WebGLExtensionType, WebGLBindingType) \
     JSObject*                                                           \