diff -r 000000000000 -r 6474c204b198 gfx/gl/SharedSurfaceEGL.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gfx/gl/SharedSurfaceEGL.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,111 @@
+/* -*- Mode: c++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40; -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef SHARED_SURFACE_EGL_H_
+#define SHARED_SURFACE_EGL_H_
+
+#include "SharedSurfaceGL.h"
+#include "SurfaceFactory.h"
+#include "GLLibraryEGL.h"
+#include "SurfaceTypes.h"
+#include "mozilla/Attributes.h"
+#include "mozilla/Mutex.h"
+
+namespace mozilla {
+namespace gl {
+
+class GLContext;
+class TextureGarbageBin;
+
+class SharedSurface_EGLImage
+    : public SharedSurface_GL
+{
+public:
+    static SharedSurface_EGLImage* Create(GLContext* prodGL,
+                                          const GLFormats& formats,
+                                          const gfx::IntSize& size,
+                                          bool hasAlpha,
+                                          EGLContext context);
+
+    static SharedSurface_EGLImage* Cast(SharedSurface* surf) {
+        MOZ_ASSERT(surf->Type() == SharedSurfaceType::EGLImageShare);
+
+        return (SharedSurface_EGLImage*)surf;
+    }
+
+    static bool HasExtensions(GLLibraryEGL* egl, GLContext* gl);
+
+protected:
+    mutable Mutex mMutex;
+    GLLibraryEGL* const mEGL;
+    const GLFormats mFormats;
+    GLuint mProdTex;
+    EGLImage mImage;
+    GLContext* mCurConsGL;
+    GLuint mConsTex;
+    nsRefPtr<TextureGarbageBin> mGarbageBin;
+    EGLSync mSync;
+
+    SharedSurface_EGLImage(GLContext* gl,
+                           GLLibraryEGL* egl,
+                           const gfx::IntSize& size,
+                           bool hasAlpha,
+                           const GLFormats& formats,
+                           GLuint prodTex,
+                           EGLImage image);
+
+    EGLDisplay Display() const;
+    void UpdateProdTexture(const MutexAutoLock& curAutoLock);
+
+public:
+    virtual ~SharedSurface_EGLImage();
+
+    virtual void LockProdImpl() MOZ_OVERRIDE {}
+    virtual void UnlockProdImpl() MOZ_OVERRIDE {}
+
+
+    virtual void Fence() MOZ_OVERRIDE;
+    virtual bool WaitSync() MOZ_OVERRIDE;
+
+    virtual GLuint ProdTexture() MOZ_OVERRIDE {
+      return mProdTex;
+    }
+
+    // Implementation-specific functions below:
+    // Returns texture and target
+    void AcquireConsumerTexture(GLContext* consGL, GLuint* out_texture, GLuint* out_target);
+};
+
+
+
+class SurfaceFactory_EGLImage
+    : public SurfaceFactory_GL
+{
+public:
+    // Fallible:
+    static SurfaceFactory_EGLImage* Create(GLContext* prodGL,
+                                           const SurfaceCaps& caps);
+
+protected:
+    const EGLContext mContext;
+
+    SurfaceFactory_EGLImage(GLContext* prodGL,
+                            EGLContext context,
+                            const SurfaceCaps& caps)
+        : SurfaceFactory_GL(prodGL, SharedSurfaceType::EGLImageShare, caps)
+        , mContext(context)
+    {}
+
+public:
+    virtual SharedSurface* CreateShared(const gfx::IntSize& size) MOZ_OVERRIDE {
+        bool hasAlpha = mReadCaps.alpha;
+        return SharedSurface_EGLImage::Create(mGL, mFormats, size, hasAlpha, mContext);
+    }
+};
+
+} /* namespace gfx */
+} /* namespace mozilla */
+
+#endif /* SHARED_SURFACE_EGL_H_ */