commit 4230d4847fdc921ed2de02a8e673d30932d5d157
author Jamie Madill <jmadill@chromium.org> Fri Sep 14 10:14:45 2018 -0400
committer Jamie Madill <jmadill@chromium.org> Fri Sep 14 19:01:41 2018 +0000
tree d4802fc70109fa378d1d8cda07550645b3465bae
parent 3f3b358f0cf72c60e93a268fdbed0c32f9b75f28

Finish fixing EGL enums.

This removes the temporary defines now that Chromium is up-to-date.

Bug: angleproject:2806
Change-Id: I8e3308d6b80e49c2b2a7a698ee5d8ad40f442475
Reviewed-on: https://chromium-review.googlesource.com/1227031
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/libANGLE/Context.cpp

diff --git a/src/libANGLE/Context.cpp b/src/libANGLE/Context.cpp
index a307400..0cb16bc 100644
--- a/src/libANGLE/Context.cpp
+++ b/src/libANGLE/Context.cpp
@@ -198,9 +198,7 @@
 
 bool GetWebGLContext(const egl::AttributeMap &attribs)
 {
-    // TODO(jmadill): Remove this. http://anglebug.com/2806
-    return (attribs.get(EGL_CONTEXT_WEBGL_COMPATIBILITY_ANGLE, EGL_FALSE) == EGL_TRUE) ||
-           (attribs.get(EGL_CONTEXT_WEBGL_COMPATIBILITY_ANGLE_OLD, EGL_FALSE) == EGL_TRUE);
+    return (attribs.get(EGL_CONTEXT_WEBGL_COMPATIBILITY_ANGLE, EGL_FALSE) == EGL_TRUE);
 }
 
 bool GetExtensionsEnabled(const egl::AttributeMap &attribs, bool webGLContext)
@@ -212,16 +210,7 @@
 
 bool GetBindGeneratesResource(const egl::AttributeMap &attribs)
 {
-    // TODO(jmadill): Remove this. http://anglebug.com/2806
-    if (attribs.contains(EGL_CONTEXT_BIND_GENERATES_RESOURCE_CHROMIUM))
-    {
-        return (attribs.get(EGL_CONTEXT_BIND_GENERATES_RESOURCE_CHROMIUM, EGL_TRUE) == EGL_TRUE);
-    }
-    else
-    {
-        return (attribs.get(EGL_CONTEXT_BIND_GENERATES_RESOURCE_CHROMIUM_OLD, EGL_TRUE) ==
-                EGL_TRUE);
-    }
+    return (attribs.get(EGL_CONTEXT_BIND_GENERATES_RESOURCE_CHROMIUM, EGL_TRUE) == EGL_TRUE);
 }
 
 bool GetClientArraysEnabled(const egl::AttributeMap &attribs)