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

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

1 files changed, 0 insertions, 44 deletions

diff --git a/gfx/angle/src/libANGLE/renderer/null/ShaderNULL.cpp b/gfx/angle/src/libANGLE/renderer/null/ShaderNULL.cpp
deleted file mode 100644
index 168f4bdca..000000000
--- a/gfx/angle/src/libANGLE/renderer/null/ShaderNULL.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// Copyright 2016 The ANGLE Project Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-//
-// ShaderNULL.cpp:
-//    Implements the class methods for ShaderNULL.
-//
-
-#include "libANGLE/renderer/null/ShaderNULL.h"
-
-#include "common/debug.h"
-
-namespace rx
-{
-
-ShaderNULL::ShaderNULL(const gl::ShaderState &data) : ShaderImpl(data)
-{
-}
-
-ShaderNULL::~ShaderNULL()
-{
-}
-
-ShCompileOptions ShaderNULL::prepareSourceAndReturnOptions(std::stringstream *sourceStream,
-                                                           std::string *sourcePath)
-{
-    UNIMPLEMENTED();
-    return ShCompileOptions();
-}
-
-bool ShaderNULL::postTranslateCompile(gl::Compiler *compiler, std::string *infoLog)
-{
-    UNIMPLEMENTED();
-    return bool();
-}
-
-std::string ShaderNULL::getDebugInfo() const
-{
-    UNIMPLEMENTED();
-    return std::string();
-}
-
-}  // namespace rx