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

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

1 files changed, 9 insertions, 9 deletions

diff --git a/gfx/angle/src/tests/compiler_tests/ShCompile_test.cpp b/gfx/angle/src/tests/compiler_tests/ShCompile_test.cpp
index 21e4a3cbe..2a514a9e4 100755
--- a/gfx/angle/src/tests/compiler_tests/ShCompile_test.cpp
+++ b/gfx/angle/src/tests/compiler_tests/ShCompile_test.cpp
@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 //
 // ShCompile_test.cpp
-//   Test the sh::Compile interface with different parameters.
+//   Test the ShCompile interface with different parameters.
 //
 
 #include "angle_gl.h"
@@ -19,9 +19,9 @@ class ShCompileTest : public testing::Test
   protected:
     void SetUp() override
     {
-        sh::InitBuiltInResources(&mResources);
-        mCompiler = sh::ConstructCompiler(GL_FRAGMENT_SHADER, SH_WEBGL_SPEC,
-                                          SH_GLSL_COMPATIBILITY_OUTPUT, &mResources);
+        ShInitBuiltInResources(&mResources);
+        mCompiler = ShConstructCompiler(GL_FRAGMENT_SHADER, SH_WEBGL_SPEC,
+                                        SH_GLSL_COMPATIBILITY_OUTPUT, &mResources);
         ASSERT_TRUE(mCompiler != nullptr) << "Compiler could not be constructed.";
     }
 
@@ -29,15 +29,15 @@ class ShCompileTest : public testing::Test
     {
         if (mCompiler)
         {
-            sh::Destruct(mCompiler);
+            ShDestruct(mCompiler);
             mCompiler = nullptr;
         }
     }
 
     void testCompile(const char **shaderStrings, int stringCount, bool expectation)
     {
-        bool success                  = sh::Compile(mCompiler, shaderStrings, stringCount, 0);
-        const std::string &compileLog = sh::GetInfoLog(mCompiler);
+        bool success                  = ShCompile(mCompiler, shaderStrings, stringCount, 0);
+        const std::string &compileLog = ShGetInfoLog(mCompiler);
         EXPECT_EQ(expectation, success) << compileLog;
     }
 
@@ -46,7 +46,7 @@ class ShCompileTest : public testing::Test
     ShHandle mCompiler;
 };
 
-// Test calling sh::Compile with more than one shader source string.
+// Test calling ShCompile with more than one shader source string.
 TEST_F(ShCompileTest, MultipleShaderStrings)
 {
     const std::string &shaderString1 =
@@ -61,7 +61,7 @@ TEST_F(ShCompileTest, MultipleShaderStrings)
     testCompile(shaderStrings, 2, true);
 }
 
-// Test calling sh::Compile with a tokens split into different shader source strings.
+// Test calling ShCompile with a tokens split into different shader source strings.
 TEST_F(ShCompileTest, TokensSplitInShaderStrings)
 {
     const std::string &shaderString1 =