From cfdf39067e34e85f77f55852197133c7b1c28e35 Mon Sep 17 00:00:00 2001
From: Jeff Gilbert <jgilbert@mozilla.com>
Date: Thu, 26 Sep 2019 16:43:48 +0000
Subject: [PATCH] Bug 1584277 - Expose WebGL OES_fbo_render_mipmap. r=lsalzman

Differential Revision: https://phabricator.services.mozilla.com/D47302

--HG--
extra : moz-landing-system : lando
---
 dom/canvas/WebGLExtensions.cpp                                | 3 ---
 .../ensure-exts/test_OES_fbo_render_mipmap.html               | 4 +---
 dom/canvas/test/webgl-mochitest/ensure-exts/test_common.html  | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/dom/canvas/WebGLExtensions.cpp b/dom/canvas/WebGLExtensions.cpp
index 1b354b56ea6a..7a12634eb1c8 100644
--- a/dom/canvas/WebGLExtensions.cpp
+++ b/dom/canvas/WebGLExtensions.cpp
@@ -83,9 +83,6 @@ WebGLExtensionFBORenderMipmap::~WebGLExtensionFBORenderMipmap() = default;
 bool WebGLExtensionFBORenderMipmap::IsSupported(
     const WebGLContext* const webgl) {
   if (webgl->IsWebGL2()) return false;
-  if (!StaticPrefs::webgl_enable_draft_extensions()) {
-    return false;
-  }
 
   const auto& gl = webgl->gl;
   if (!gl->IsGLES()) return true;
diff --git a/dom/canvas/test/webgl-mochitest/ensure-exts/test_OES_fbo_render_mipmap.html b/dom/canvas/test/webgl-mochitest/ensure-exts/test_OES_fbo_render_mipmap.html
index bab511d97786..e0439d3fa88f 100644
--- a/dom/canvas/test/webgl-mochitest/ensure-exts/test_OES_fbo_render_mipmap.html
+++ b/dom/canvas/test/webgl-mochitest/ensure-exts/test_OES_fbo_render_mipmap.html
@@ -11,9 +11,7 @@
 
 'use strict';
 
-Lastly_WithDraftExtsEnabled(function() {
-  EnsureExtFor('webgl', 'OES_fbo_render_mipmap');
-});
+EnsureExtFor('webgl', 'OES_fbo_render_mipmap');
 
     </script>
   </body>
diff --git a/dom/canvas/test/webgl-mochitest/ensure-exts/test_common.html b/dom/canvas/test/webgl-mochitest/ensure-exts/test_common.html
index 8727d5f43fa1..d21d30aa4db1 100644
--- a/dom/canvas/test/webgl-mochitest/ensure-exts/test_common.html
+++ b/dom/canvas/test/webgl-mochitest/ensure-exts/test_common.html
@@ -23,6 +23,7 @@ var defaultExts = [
     ['EXT_shader_texture_lod'        , [MACHINE_SPECIFIC, FORBID          ]],
     ['EXT_texture_filter_anisotropic', [MACHINE_SPECIFIC, MACHINE_SPECIFIC]],
     ['OES_element_index_uint'        , [ENSURE          , FORBID          ]],
+    ['OES_fbo_render_mipmap'         , [MACHINE_SPECIFIC, FORBID          ]],
     ['OES_standard_derivatives'      , [MACHINE_SPECIFIC, FORBID          ]],
     ['OES_texture_float'             , [ENSURE          , FORBID          ]],
     ['OES_texture_float_linear'      , [ENSURE          , ENSURE          ]],
@@ -55,7 +56,6 @@ var defaultExts = [
 ];
 
 var draftExts = [
-    ['OES_fbo_render_mipmap' , [MACHINE_SPECIFIC, FORBID          ]],
     ['WEBGL_explicit_present', [ENSURE          , ENSURE          ]],
 ];