Merge branch 'master' into js-modules

1 files changed, 4 insertions, 14 deletions

diff --git a/gfx/angle/src/libANGLE/Surface.cpp b/gfx/angle/src/libANGLE/Surface.cpp
index 43e71df31..6028b7f67 100755
--- a/gfx/angle/src/libANGLE/Surface.cpp
+++ b/gfx/angle/src/libANGLE/Surface.cpp
@@ -138,11 +138,6 @@ Error Surface::swap()
     return mImplementation->swap();
 }
 
-Error Surface::swapWithDamage(EGLint *rects, EGLint n_rects)
-{
-    return mImplementation->swapWithDamage(rects, n_rects);
-}
-
 Error Surface::postSubBuffer(EGLint x, EGLint y, EGLint width, EGLint height)
 {
     return mImplementation->postSubBuffer(x, y, width, height);
@@ -211,23 +206,19 @@ EGLint Surface::getHeight() const
 Error Surface::bindTexImage(gl::Texture *texture, EGLint buffer)
 {
     ASSERT(!mTexture.get());
-    ANGLE_TRY(mImplementation->bindTexImage(texture, buffer));
 
     texture->bindTexImageFromSurface(this);
     mTexture.set(texture);
-
-    return Error(EGL_SUCCESS);
+    return mImplementation->bindTexImage(texture, buffer);
 }
 
 Error Surface::releaseTexImage(EGLint buffer)
 {
-    ANGLE_TRY(mImplementation->releaseTexImage(buffer));
-
     ASSERT(mTexture.get());
     mTexture->releaseTexImageFromSurface();
     mTexture.set(nullptr);
 
-    return Error(EGL_SUCCESS);
+    return mImplementation->releaseTexImage(buffer);
 }
 
 void Surface::releaseTexImageFromTexture()
@@ -307,13 +298,12 @@ PbufferSurface::PbufferSurface(rx::EGLImplFactory *implFactory,
 
 PbufferSurface::PbufferSurface(rx::EGLImplFactory *implFactory,
                                const Config *config,
-                               EGLenum buftype,
-                               EGLClientBuffer clientBuffer,
+                               EGLClientBuffer shareHandle,
                                const AttributeMap &attribs)
     : Surface(EGL_PBUFFER_BIT, config, attribs)
 {
     mImplementation =
-        implFactory->createPbufferFromClientBuffer(mState, config, buftype, clientBuffer, attribs);
+        implFactory->createPbufferFromClientBuffer(mState, config, shareHandle, attribs);
 }
 
 PbufferSurface::~PbufferSurface()