1 files changed, 21 insertions, 16 deletions

diff --git a/chromium/third_party/angle/src/libANGLE/renderer/FramebufferImpl.h b/chromium/third_party/angle/src/libANGLE/renderer/FramebufferImpl.h
index b4438f80532..016648908c8 100644
--- a/chromium/third_party/angle/src/libANGLE/renderer/FramebufferImpl.h
+++ b/chromium/third_party/angle/src/libANGLE/renderer/FramebufferImpl.h
@@ -31,43 +31,48 @@ class FramebufferImpl : angle::NonCopyable
   public:
     explicit FramebufferImpl(const gl::FramebufferState &state) : mState(state) {}
     virtual ~FramebufferImpl() {}
-    virtual void destroy(ContextImpl *contextImpl) {}
-    virtual void destroyDefault(DisplayImpl *displayImpl) {}
-
-    virtual gl::Error discard(size_t count, const GLenum *attachments)    = 0;
-    virtual gl::Error invalidate(size_t count, const GLenum *attachments) = 0;
-    virtual gl::Error invalidateSub(size_t count,
+    virtual void destroy(const gl::Context *context) {}
+    virtual void destroyDefault(const egl::Display *display) {}
+
+    virtual gl::Error discard(const gl::Context *context,
+                              size_t count,
+                              const GLenum *attachments) = 0;
+    virtual gl::Error invalidate(const gl::Context *context,
+                                 size_t count,
+                                 const GLenum *attachments) = 0;
+    virtual gl::Error invalidateSub(const gl::Context *context,
+                                    size_t count,
                                     const GLenum *attachments,
                                     const gl::Rectangle &area) = 0;
 
-    virtual gl::Error clear(ContextImpl *context, GLbitfield mask) = 0;
-    virtual gl::Error clearBufferfv(ContextImpl *context,
+    virtual gl::Error clear(const gl::Context *context, GLbitfield mask) = 0;
+    virtual gl::Error clearBufferfv(const gl::Context *context,
                                     GLenum buffer,
                                     GLint drawbuffer,
                                     const GLfloat *values) = 0;
-    virtual gl::Error clearBufferuiv(ContextImpl *context,
+    virtual gl::Error clearBufferuiv(const gl::Context *context,
                                      GLenum buffer,
                                      GLint drawbuffer,
                                      const GLuint *values) = 0;
-    virtual gl::Error clearBufferiv(ContextImpl *context,
+    virtual gl::Error clearBufferiv(const gl::Context *context,
                                     GLenum buffer,
                                     GLint drawbuffer,
                                     const GLint *values) = 0;
-    virtual gl::Error clearBufferfi(ContextImpl *context,
+    virtual gl::Error clearBufferfi(const gl::Context *context,
                                     GLenum buffer,
                                     GLint drawbuffer,
                                     GLfloat depth,
                                     GLint stencil) = 0;
 
-    virtual GLenum getImplementationColorReadFormat() const = 0;
-    virtual GLenum getImplementationColorReadType() const   = 0;
-    virtual gl::Error readPixels(ContextImpl *context,
+    virtual GLenum getImplementationColorReadFormat(const gl::Context *context) const = 0;
+    virtual GLenum getImplementationColorReadType(const gl::Context *context) const   = 0;
+    virtual gl::Error readPixels(const gl::Context *context,
                                  const gl::Rectangle &area,
                                  GLenum format,
                                  GLenum type,
                                  void *pixels) const = 0;
 
-    virtual gl::Error blit(ContextImpl *context,
+    virtual gl::Error blit(const gl::Context *context,
                            const gl::Rectangle &sourceArea,
                            const gl::Rectangle &destArea,
                            GLbitfield mask,
@@ -75,7 +80,7 @@ class FramebufferImpl : angle::NonCopyable
 
     virtual bool checkStatus() const = 0;
 
-    virtual void syncState(ContextImpl *contextImpl,
+    virtual void syncState(const gl::Context *context,
                            const gl::Framebuffer::DirtyBits &dirtyBits) = 0;
 
     virtual gl::Error getSamplePosition(size_t index, GLfloat *xy) const = 0;