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

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

1 files changed, 0 insertions, 8 deletions

diff --git a/gfx/angle/src/compiler/translator/EmulatePrecision.h b/gfx/angle/src/compiler/translator/EmulatePrecision.h
index deb49cd2c..c2b9857bb 100755
--- a/gfx/angle/src/compiler/translator/EmulatePrecision.h
+++ b/gfx/angle/src/compiler/translator/EmulatePrecision.h
@@ -18,9 +18,6 @@
 // need to write a huge number of variations of the emulated compound assignment
 // to every translated shader with emulation enabled.
 
-namespace sh
-{
-
 class EmulatePrecision : public TLValueTrackingTraverser
 {
   public:
@@ -30,14 +27,11 @@ class EmulatePrecision : public TLValueTrackingTraverser
     bool visitBinary(Visit visit, TIntermBinary *node) override;
     bool visitUnary(Visit visit, TIntermUnary *node) override;
     bool visitAggregate(Visit visit, TIntermAggregate *node) override;
-    bool visitDeclaration(Visit visit, TIntermDeclaration *node) override;
 
     void writeEmulationHelpers(TInfoSinkBase &sink,
                                const int shaderVersion,
                                const ShShaderOutput outputLanguage);
 
-    static bool SupportedInLanguage(const ShShaderOutput outputLanguage);
-
   private:
     struct TypePair
     {
@@ -67,6 +61,4 @@ class EmulatePrecision : public TLValueTrackingTraverser
     bool mDeclaringVariables;
 };
 
-}  // namespace sh
-
 #endif  // COMPILER_TRANSLATOR_EMULATE_PRECISION_H_