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

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

1 files changed, 5 insertions, 11 deletions

diff --git a/gfx/angle/src/libANGLE/Sampler.cpp b/gfx/angle/src/libANGLE/Sampler.cpp
index 369c3cbaa..dc1d7c94a 100755
--- a/gfx/angle/src/libANGLE/Sampler.cpp
+++ b/gfx/angle/src/libANGLE/Sampler.cpp
@@ -135,24 +135,18 @@ GLenum Sampler::getCompareFunc() const
     return mSamplerState.compareFunc;
 }
 
-void Sampler::setSRGBDecode(GLenum sRGBDecode)
-{
-    mSamplerState.sRGBDecode = sRGBDecode;
-}
-
-GLenum Sampler::getSRGBDecode() const
-{
-    return mSamplerState.sRGBDecode;
-}
-
 const SamplerState &Sampler::getSamplerState() const
 {
     return mSamplerState;
 }
 
-rx::SamplerImpl *Sampler::getImplementation() const
+const rx::SamplerImpl *Sampler::getImplementation() const
 {
     return mImpl;
 }
 
+rx::SamplerImpl *Sampler::getImplementation()
+{
+    return mImpl;
+}
 }