Issue #1053 - Remove Android WebGL/EGL extensions.

4 files changed, 0 insertions, 34 deletions

diff --git a/gfx/gl/GLDefs.h b/gfx/gl/GLDefs.h
index f580c06703..bffd1a7270 100644
--- a/gfx/gl/GLDefs.h
+++ b/gfx/gl/GLDefs.h
@@ -44,12 +44,6 @@
 #define LOCAL_GL_ATC_RGBA_EXPLICIT_ALPHA                0x8C93
 #define LOCAL_GL_ATC_RGBA_INTERPOLATED_ALPHA            0x87EE
 
-// EGL_ANDROID_image_crop
-#define LOCAL_EGL_IMAGE_CROP_LEFT_ANDROID               0x3148
-#define LOCAL_EGL_IMAGE_CROP_TOP_ANDROID                0x3149
-#define LOCAL_EGL_IMAGE_CROP_RIGHT_ANDROID              0x314A
-#define LOCAL_EGL_IMAGE_CROP_BOTTOM_ANDROID             0x314B
-
 // EGL_ANGLE_platform_angle
 #define LOCAL_EGL_PLATFORM_ANGLE_ANGLE                      0x3202
 #define LOCAL_EGL_PLATFORM_ANGLE_TYPE_ANGLE                 0x3203
diff --git a/gfx/gl/GLLibraryEGL.cpp b/gfx/gl/GLLibraryEGL.cpp
index 5b95d83b2b..c0ab95c838 100644
--- a/gfx/gl/GLLibraryEGL.cpp
+++ b/gfx/gl/GLLibraryEGL.cpp
@@ -48,8 +48,6 @@ static const char* sEGLExtensionNames[] = {
     "EGL_EXT_create_context_robustness",
     "EGL_KHR_image",
     "EGL_KHR_fence_sync",
-    "EGL_ANDROID_native_fence_sync",
-    "EGL_ANDROID_image_crop",
     "EGL_ANGLE_platform_angle",
     "EGL_ANGLE_platform_angle_d3d"
 };
@@ -368,18 +366,6 @@ GLLibraryEGL::EnsureInitialized(bool forceAccel, nsACString* const out_failureId
         return false;
     }
 
-    GLLibraryLoader::SymLoadStruct optionalSymbols[] = {
-        // On Android 4.3 and up, certain features like ANDROID_native_fence_sync
-        // can only be queried by using a special eglQueryString.
-        { (PRFuncPtr*) &mSymbols.fQueryStringImplementationANDROID,
-          { "_Z35eglQueryStringImplementationANDROIDPvi", nullptr } },
-        { nullptr, { nullptr } }
-    };
-
-    // Do not warn about the failure to load this - see bug 1092191
-    Unused << GLLibraryLoader::LoadSymbols(mEGLLibrary, &optionalSymbols[0],
-                                           nullptr, nullptr, false);
-
     InitClientExtensions();
 
     const auto lookupFunction =
diff --git a/gfx/gl/GLLibraryEGL.h b/gfx/gl/GLLibraryEGL.h
index e48f2e21be..88f57d4c97 100644
--- a/gfx/gl/GLLibraryEGL.h
+++ b/gfx/gl/GLLibraryEGL.h
@@ -157,8 +157,6 @@ public:
         EXT_create_context_robustness,
         KHR_image,
         KHR_fence_sync,
-        ANDROID_native_fence_sync,
-        EGL_ANDROID_image_crop,
         ANGLE_platform_angle,
         ANGLE_platform_angle_d3d,
         Extensions_Max
diff --git a/gfx/layers/opengl/EGLImageHelpers.cpp b/gfx/layers/opengl/EGLImageHelpers.cpp
index a2748e1290..57e09c266f 100644
--- a/gfx/layers/opengl/EGLImageHelpers.cpp
+++ b/gfx/layers/opengl/EGLImageHelpers.cpp
@@ -21,20 +21,8 @@ EGLImageCreateFromNativeBuffer(GLContext* aGL, void* aBuffer, const gfx::IntSize
         LOCAL_EGL_NONE, LOCAL_EGL_NONE,
     };
 
-    EGLint cropAttrs[] = {
-        LOCAL_EGL_IMAGE_PRESERVED, LOCAL_EGL_TRUE,
-        LOCAL_EGL_IMAGE_CROP_LEFT_ANDROID, 0,
-        LOCAL_EGL_IMAGE_CROP_TOP_ANDROID, 0,
-        LOCAL_EGL_IMAGE_CROP_RIGHT_ANDROID, aCropSize.width,
-        LOCAL_EGL_IMAGE_CROP_BOTTOM_ANDROID, aCropSize.height,
-        LOCAL_EGL_NONE, LOCAL_EGL_NONE,
-    };
-
     bool hasCropRect = (aCropSize.width != 0 && aCropSize.height != 0);
     EGLint* usedAttrs = attrs;
-    if (hasCropRect && sEGLLibrary.IsExtensionSupported(GLLibraryEGL::EGL_ANDROID_image_crop)) {
-        usedAttrs = cropAttrs;
-    }
 
     return sEGLLibrary.fCreateImage(sEGLLibrary.Display(),
                                      EGL_NO_CONTEXT,