commit 4ddf5afb75fb2866382f3ced34a73dd75db01fbe
author Geoff Lang <geofflang@chromium.org> Thu Dec 01 14:30:44 2016 -0500
committer Commit Bot <commit-bot@chromium.org> Mon Jan 30 19:26:41 2017 +0000
tree ca797b093ae0ab66be7813042663404403920a89
parent e794cd86d4e6d0a87f941c1f793ff038b7c3334c

Refactor ResourceManager into separate managers per resource type.

BUG=angleproject:1639

Change-Id: I943f553cfb0e0feb57953770784b48e22fccc875
Reviewed-on: https://chromium-review.googlesource.com/423172
Commit-Queue: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

src/libANGLE/validationES_unittest.cpp

diff --git a/src/libANGLE/validationES_unittest.cpp b/src/libANGLE/validationES_unittest.cpp
index 138aee5..a77a9c2 100644
--- a/src/libANGLE/validationES_unittest.cpp
+++ b/src/libANGLE/validationES_unittest.cpp
@@ -30,40 +30,30 @@
 class MockValidationContext : public ValidationContext
 {
   public:
-    MockValidationContext(const Version &version,
+    MockValidationContext(const ValidationContext *shareContext,
+                          const Version &version,
                           State *state,
                           const Caps &caps,
                           const TextureCapsMap &textureCaps,
                           const Extensions &extensions,
-                          const ResourceManager *resourceManager,
                           const Limitations &limitations,
                           const ResourceMap<Framebuffer> &framebufferMap,
-                          bool skipValidation);
+                          bool skipValidation)
+        : ValidationContext(shareContext,
+                            version,
+                            state,
+                            caps,
+                            textureCaps,
+                            extensions,
+                            limitations,
+                            framebufferMap,
+                            skipValidation)
+    {
+    }
 
     MOCK_METHOD1(handleError, void(const Error &));
 };
 
-MockValidationContext::MockValidationContext(const Version &version,
-                                             State *state,
-                                             const Caps &caps,
-                                             const TextureCapsMap &textureCaps,
-                                             const Extensions &extensions,
-                                             const ResourceManager *resourceManager,
-                                             const Limitations &limitations,
-                                             const ResourceMap<Framebuffer> &framebufferMap,
-                                             bool skipValidation)
-    : ValidationContext(version,
-                        state,
-                        caps,
-                        textureCaps,
-                        extensions,
-                        resourceManager,
-                        limitations,
-                        framebufferMap,
-                        skipValidation)
-{
-}
-
 // Test that ANGLE generates an INVALID_OPERATION when validating index data that uses a value
 // larger than MAX_ELEMENT_INDEX. Not specified in the GLES 3 spec, it's undefined behaviour,
 // but we want a test to ensure we maintain this behaviour.
@@ -110,9 +100,8 @@
     state.setDrawFramebufferBinding(framebuffer);
     state.setProgram(program);
 
-    NiceMock<MockValidationContext> testContext(Version(3, 0), &state, caps, textureCaps,
-                                                extensions, nullptr, limitations, framebufferMap,
-                                                false);
+    NiceMock<MockValidationContext> testContext(nullptr, Version(3, 0), &state, caps, textureCaps,
+                                                extensions, limitations, framebufferMap, false);
 
     // Set the expectation for the validation error here.
     Error expectedError(GL_INVALID_OPERATION, g_ExceedsMaxElementErrorMessage);