Merge branch 'master' into js-modules

1 files changed, 1 insertions, 21 deletions

diff --git a/gfx/angle/src/libANGLE/renderer/renderer_utils.h b/gfx/angle/src/libANGLE/renderer/renderer_utils.h
index 440548e9c..e08703000 100755
--- a/gfx/angle/src/libANGLE/renderer/renderer_utils.h
+++ b/gfx/angle/src/libANGLE/renderer/renderer_utils.h
@@ -44,27 +44,7 @@ typedef void (*ColorReadFunction)(const uint8_t *source, uint8_t *dest);
 typedef void (*ColorWriteFunction)(const uint8_t *source, uint8_t *dest);
 typedef void (*ColorCopyFunction)(const uint8_t *source, uint8_t *dest);
 
-class FastCopyFunctionMap
-{
-  public:
-    struct Entry
-    {
-        GLenum format;
-        GLenum type;
-        ColorCopyFunction func;
-    };
-
-    constexpr FastCopyFunctionMap() : FastCopyFunctionMap(nullptr, 0) {}
-
-    constexpr FastCopyFunctionMap(const Entry *data, size_t size) : mSize(size), mData(data) {}
-
-    bool has(const gl::FormatType &formatType) const;
-    ColorCopyFunction get(const gl::FormatType &formatType) const;
-
-  private:
-    size_t mSize;
-    const Entry *mData;
-};
+typedef std::map<gl::FormatType, ColorCopyFunction> FastCopyFunctionMap;
 
 struct PackPixelsParams
 {