Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18

# Conflicts:
#	browser/app/profile/firefox.js
#	browser/components/preferences/jar.mn

1 files changed, 2 insertions, 11 deletions

diff --git a/gfx/angle/src/libANGLE/renderer/BufferImpl.h b/gfx/angle/src/libANGLE/renderer/BufferImpl.h
index 10d371541..cdb3cfe88 100755
--- a/gfx/angle/src/libANGLE/renderer/BufferImpl.h
+++ b/gfx/angle/src/libANGLE/renderer/BufferImpl.h
@@ -15,22 +15,16 @@
 
 #include <stdint.h>
 
-namespace gl
-{
-class BufferState;
-}
-
 namespace rx
 {
 
 class BufferImpl : angle::NonCopyable
 {
   public:
-    BufferImpl(const gl::BufferState &state) : mState(state) {}
     virtual ~BufferImpl() { }
 
-    virtual gl::Error setData(GLenum target, const void *data, size_t size, GLenum usage)     = 0;
-    virtual gl::Error setSubData(GLenum target, const void *data, size_t size, size_t offset) = 0;
+    virtual gl::Error setData(const void *data, size_t size, GLenum usage) = 0;
+    virtual gl::Error setSubData(const void *data, size_t size, size_t offset) = 0;
     virtual gl::Error copySubData(BufferImpl *source,
                                   GLintptr sourceOffset,
                                   GLintptr destOffset,
@@ -44,9 +38,6 @@ class BufferImpl : angle::NonCopyable
                                     size_t count,
                                     bool primitiveRestartEnabled,
                                     gl::IndexRange *outRange) = 0;
-
-  protected:
-    const gl::BufferState &mState;
 };
 
 }