Merge branch 'ANGLE-rollback'

This resolves #624

Note: Cherry-picked some fixes on top of the ANGLE version that we want to keep.

1 files changed, 2 insertions, 14 deletions

diff --git a/gfx/angle/src/libANGLE/HandleAllocator_unittest.cpp b/gfx/angle/src/libANGLE/HandleAllocator_unittest.cpp
index bfcbd8f01..726b64bab 100755
--- a/gfx/angle/src/libANGLE/HandleAllocator_unittest.cpp
+++ b/gfx/angle/src/libANGLE/HandleAllocator_unittest.cpp
@@ -90,7 +90,8 @@ TEST(HandleAllocatorTest, Reallocation)
     EXPECT_EQ(finalResult, 1);
 }
 
-// The following test covers reserving a handle with max uint value. See http://anglebug.com/1052
+// The following test covers reserving a handle with max uint value.
+// See http://anglebug.com/1052
 TEST(HandleAllocatorTest, ReserveMaxUintHandle)
 {
     gl::HandleAllocator allocator;
@@ -102,19 +103,6 @@ TEST(HandleAllocatorTest, ReserveMaxUintHandle)
     EXPECT_EQ(1u, normalHandle);
 }
 
-// The following test covers reserving a handle with max uint value minus one then max uint value.
-TEST(HandleAllocatorTest, ReserveMaxUintHandle2)
-{
-    gl::HandleAllocator allocator;
-
-    GLuint maxUintHandle = std::numeric_limits<GLuint>::max();
-    allocator.reserve(maxUintHandle - 1);
-    allocator.reserve(maxUintHandle);
-
-    GLuint normalHandle = allocator.allocate();
-    EXPECT_EQ(1u, normalHandle);
-}
-
 // To test if the allocator keep the handle in a sorted order.
 TEST(HandleAllocatorTest, SortedOrderHandle)
 {