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

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

1 files changed, 4 insertions, 11 deletions

diff --git a/gfx/angle/src/compiler/translator/OutputGLSL.h b/gfx/angle/src/compiler/translator/OutputGLSL.h
index d910c0004..9b1aca4ea 100755
--- a/gfx/angle/src/compiler/translator/OutputGLSL.h
+++ b/gfx/angle/src/compiler/translator/OutputGLSL.h
@@ -9,21 +9,16 @@
 
 #include "compiler/translator/OutputGLSLBase.h"
 
-namespace sh
-{
-
 class TOutputGLSL : public TOutputGLSLBase
 {
   public:
-    TOutputGLSL(TInfoSinkBase &objSink,
+    TOutputGLSL(TInfoSinkBase& objSink,
                 ShArrayIndexClampingStrategy clampingStrategy,
                 ShHashFunction64 hashFunction,
-                NameMap &nameMap,
-                TSymbolTable &symbolTable,
-                sh::GLenum shaderType,
+                NameMap& nameMap,
+                TSymbolTable& symbolTable,
                 int shaderVersion,
-                ShShaderOutput output,
-                ShCompileOptions compileOptions);
+                ShShaderOutput output);
 
   protected:
     bool writeVariablePrecision(TPrecision) override;
@@ -31,6 +26,4 @@ class TOutputGLSL : public TOutputGLSLBase
     TString translateTextureFunction(TString &name) override;
 };
 
-}  // namespace sh
-
 #endif  // COMPILER_TRANSLATOR_OUTPUTGLSL_H_