Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 6 insertions, 13 deletions

diff --git a/gfx/gl/GLContextEAGL.h b/gfx/gl/GLContextEAGL.h
index 6e137e7b70..2b062d1a0f 100644
--- a/gfx/gl/GLContextEAGL.h
+++ b/gfx/gl/GLContextEAGL.h
@@ -10,7 +10,11 @@
 #include "GLContext.h"
 
 #include <CoreGraphics/CoreGraphics.h>
-#include <OpenGLES/EAGL.h>
+#ifdef __OBJC__
+#  include <OpenGLES/EAGL.h>
+#else
+typedef void EAGLContext;
+#endif
 
 namespace mozilla {
 namespace gl {
@@ -23,7 +27,7 @@ class GLContextEAGL : public GLContext {
  public:
   MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(GLContextEAGL, override)
   GLContextEAGL(const GLContextDesc&, EAGLContext* context,
-                GLContext* sharedContext, ContextProfile profile);
+                GLContext* sharedContext);
 
   ~GLContextEAGL();
 
@@ -36,8 +40,6 @@ class GLContextEAGL : public GLContext {
     return static_cast<GLContextEAGL*>(gl);
   }
 
-  bool AttachToWindow(nsIWidget* aWidget);
-
   EAGLContext* GetEAGLContext() const { return mContext; }
 
   virtual bool MakeCurrentImpl() const override;
@@ -54,18 +56,9 @@ class GLContextEAGL : public GLContext {
 
   virtual GLuint GetDefaultFramebuffer() override { return mBackbufferFB; }
 
-  virtual bool RenewSurface(widget::CompositorWidget*) override {
-    // FIXME: should use the passed widget instead of the existing one.
-    return RecreateRB();
-  }
-
  private:
   GLuint mBackbufferRB = 0;
   GLuint mBackbufferFB = 0;
-
-  void* mLayer = nullptr;
-
-  bool RecreateRB();
 };
 
 }  // namespace gl