BASELINE: Update Chromium to 61.0.3163.99

Change-Id: I8452f34574d88ca2b27af9bd56fc9ff3f16b1367
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

1 files changed, 28 insertions, 20 deletions

diff --git a/chromium/third_party/angle/src/libANGLE/renderer/gl/TextureGL.h b/chromium/third_party/angle/src/libANGLE/renderer/gl/TextureGL.h
index e302f935029..c3f3fdcc92c 100644
--- a/chromium/third_party/angle/src/libANGLE/renderer/gl/TextureGL.h
+++ b/chromium/third_party/angle/src/libANGLE/renderer/gl/TextureGL.h
@@ -59,7 +59,7 @@ class TextureGL : public TextureImpl
               BlitGL *blitter);
     ~TextureGL() override;
 
-    gl::Error setImage(ContextImpl *contextImpl,
+    gl::Error setImage(const gl::Context *context,
                        GLenum target,
                        size_t level,
                        GLenum internalFormat,
@@ -68,7 +68,7 @@ class TextureGL : public TextureImpl
                        GLenum type,
                        const gl::PixelUnpackState &unpack,
                        const uint8_t *pixels) override;
-    gl::Error setSubImage(ContextImpl *contextImpl,
+    gl::Error setSubImage(const gl::Context *context,
                           GLenum target,
                           size_t level,
                           const gl::Box &area,
@@ -77,7 +77,7 @@ class TextureGL : public TextureImpl
                           const gl::PixelUnpackState &unpack,
                           const uint8_t *pixels) override;
 
-    gl::Error setCompressedImage(ContextImpl *contextImpl,
+    gl::Error setCompressedImage(const gl::Context *context,
                                  GLenum target,
                                  size_t level,
                                  GLenum internalFormat,
@@ -85,7 +85,7 @@ class TextureGL : public TextureImpl
                                  const gl::PixelUnpackState &unpack,
                                  size_t imageSize,
                                  const uint8_t *pixels) override;
-    gl::Error setCompressedSubImage(ContextImpl *contextImpl,
+    gl::Error setCompressedSubImage(const gl::Context *context,
                                     GLenum target,
                                     size_t level,
                                     const gl::Box &area,
@@ -94,20 +94,20 @@ class TextureGL : public TextureImpl
                                     size_t imageSize,
                                     const uint8_t *pixels) override;
 
-    gl::Error copyImage(ContextImpl *contextImpl,
+    gl::Error copyImage(const gl::Context *context,
                         GLenum target,
                         size_t level,
                         const gl::Rectangle &sourceArea,
                         GLenum internalFormat,
                         const gl::Framebuffer *source) override;
-    gl::Error copySubImage(ContextImpl *contextImpl,
+    gl::Error copySubImage(const gl::Context *context,
                            GLenum target,
                            size_t level,
                            const gl::Offset &destOffset,
                            const gl::Rectangle &sourceArea,
                            const gl::Framebuffer *source) override;
 
-    gl::Error copyTexture(ContextImpl *contextImpl,
+    gl::Error copyTexture(const gl::Context *context,
                           GLenum target,
                           size_t level,
                           GLenum internalFormat,
@@ -117,7 +117,7 @@ class TextureGL : public TextureImpl
                           bool unpackPremultiplyAlpha,
                           bool unpackUnmultiplyAlpha,
                           const gl::Texture *source) override;
-    gl::Error copySubTexture(ContextImpl *contextImpl,
+    gl::Error copySubTexture(const gl::Context *context,
                              GLenum target,
                              size_t level,
                              const gl::Offset &destOffset,
@@ -127,7 +127,8 @@ class TextureGL : public TextureImpl
                              bool unpackPremultiplyAlpha,
                              bool unpackUnmultiplyAlpha,
                              const gl::Texture *source) override;
-    gl::Error copySubTextureHelper(GLenum target,
+    gl::Error copySubTextureHelper(const gl::Context *context,
+                                   GLenum target,
                                    size_t level,
                                    const gl::Offset &destOffset,
                                    size_t sourceLevel,
@@ -138,29 +139,32 @@ class TextureGL : public TextureImpl
                                    bool unpackUnmultiplyAlpha,
                                    const gl::Texture *source);
 
-    gl::Error setStorage(ContextImpl *contextImpl,
+    gl::Error setStorage(const gl::Context *context,
                          GLenum target,
                          size_t levels,
                          GLenum internalFormat,
                          const gl::Extents &size) override;
 
-    gl::Error setStorageMultisample(ContextImpl *contextImpl,
+    gl::Error setStorageMultisample(const gl::Context *context,
                                     GLenum target,
                                     GLsizei samples,
                                     GLint internalFormat,
                                     const gl::Extents &size,
                                     GLboolean fixedSampleLocations) override;
 
-    gl::Error setImageExternal(GLenum target,
+    gl::Error setImageExternal(const gl::Context *context,
+                               GLenum target,
                                egl::Stream *stream,
                                const egl::Stream::GLTextureDescription &desc) override;
 
-    gl::Error generateMipmap(ContextImpl *contextImpl) override;
+    gl::Error generateMipmap(const gl::Context *context) override;
 
-    void bindTexImage(egl::Surface *surface) override;
-    void releaseTexImage() override;
+    gl::Error bindTexImage(const gl::Context *context, egl::Surface *surface) override;
+    gl::Error releaseTexImage(const gl::Context *context) override;
 
-    gl::Error setEGLImageTarget(GLenum target, egl::Image *image) override;
+    gl::Error setEGLImageTarget(const gl::Context *context,
+                                GLenum target,
+                                egl::Image *image) override;
 
     GLuint getTextureID() const;
     GLenum getTarget() const;
@@ -168,7 +172,7 @@ class TextureGL : public TextureImpl
     void syncState(const gl::Texture::DirtyBits &dirtyBits) override;
     bool hasAnyDirtyBit() const;
 
-    void setBaseLevel(GLuint baseLevel) override;
+    gl::Error setBaseLevel(const gl::Context *context, GLuint baseLevel) override;
 
     void setMinFilter(GLenum filter);
     void setMagFilter(GLenum filter);
@@ -190,7 +194,8 @@ class TextureGL : public TextureImpl
                                    const gl::Extents &size,
                                    GLenum format,
                                    GLenum type);
-    gl::Error setSubImageRowByRowWorkaround(GLenum target,
+    gl::Error setSubImageRowByRowWorkaround(const gl::Context *context,
+                                            GLenum target,
                                             size_t level,
                                             const gl::Box &area,
                                             GLenum format,
@@ -198,7 +203,8 @@ class TextureGL : public TextureImpl
                                             const gl::PixelUnpackState &unpack,
                                             const uint8_t *pixels);
 
-    gl::Error setSubImagePaddingWorkaround(GLenum target,
+    gl::Error setSubImagePaddingWorkaround(const gl::Context *context,
+                                           GLenum target,
                                            size_t level,
                                            const gl::Box &area,
                                            GLenum format,
@@ -211,7 +217,9 @@ class TextureGL : public TextureImpl
                                  GLenum value,
                                  GLenum *outValue);
 
-    void setLevelInfo(size_t level, size_t levelCount, const LevelInfoGL &levelInfo);
+    void setLevelInfo(GLenum target, size_t level, size_t levelCount, const LevelInfoGL &levelInfo);
+    const LevelInfoGL &getLevelInfo(GLenum target, size_t level) const;
+    const LevelInfoGL &getBaseLevelInfo() const;
 
     const FunctionsGL *mFunctions;
     const WorkaroundsGL &mWorkarounds;