commit c564c070ff68a2f369ebb048d3c49847a2d342cf
author Jamie Madill <jmadill@chromium.org> Thu Jun 01 12:45:42 2017 -0400
committer Commit Bot <commit-bot@chromium.org> Thu Jun 01 20:35:14 2017 +0000
tree 5bd8eef0dabc0d1f6e226efb59fe5d88d98d9ed0
parent fc32e8b7ff45549b61d3c2df1d6a42a78a437594

Pass gl::Context to impl methods instead of ContextImpl.

In some cases we might have to call back into the GL layer, passing
the Context, and if we just have a ContextImpl pointer this isn't
possible. It also removes the need for SafeGetImpl.

BUG=angleproject:2044

Change-Id: I6363e84b25648c992c25779d4c43f795aa2866d6
Reviewed-on: https://chromium-review.googlesource.com/516835
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/tests/perf_tests/IndexDataManagerTest.cpp

diff --git a/src/tests/perf_tests/IndexDataManagerTest.cpp b/src/tests/perf_tests/IndexDataManagerTest.cpp
index 8a37ece..a42fcba 100644
--- a/src/tests/perf_tests/IndexDataManagerTest.cpp
+++ b/src/tests/perf_tests/IndexDataManagerTest.cpp
@@ -78,7 +78,7 @@
     MockBufferD3D(rx::BufferFactoryD3D *factory) : BufferD3D(mockState, factory), mData() {}
 
     // BufferImpl
-    gl::Error setData(rx::ContextImpl *context,
+    gl::Error setData(const gl::Context *context,
                       GLenum target,
                       const void *data,
                       size_t size,
@@ -92,13 +92,12 @@
         return gl::NoError();
     }
 
-    MOCK_METHOD5(setSubData, gl::Error(rx::ContextImpl *, GLenum, const void *, size_t, size_t));
+    MOCK_METHOD5(setSubData, gl::Error(const gl::Context *, GLenum, const void *, size_t, size_t));
     MOCK_METHOD5(copySubData,
-                 gl::Error(rx::ContextImpl *context, BufferImpl *, GLintptr, GLintptr, GLsizeiptr));
-    MOCK_METHOD3(map, gl::Error(rx::ContextImpl *context, GLenum, void **));
-    MOCK_METHOD5(mapRange,
-                 gl::Error(rx::ContextImpl *context, size_t, size_t, GLbitfield, void **));
-    MOCK_METHOD2(unmap, gl::Error(rx::ContextImpl *context, GLboolean *));
+                 gl::Error(const gl::Context *, BufferImpl *, GLintptr, GLintptr, GLsizeiptr));
+    MOCK_METHOD3(map, gl::Error(const gl::Context *context, GLenum, void **));
+    MOCK_METHOD5(mapRange, gl::Error(const gl::Context *, size_t, size_t, GLbitfield, void **));
+    MOCK_METHOD2(unmap, gl::Error(const gl::Context *context, GLboolean *));
 
     // BufferD3D
     MOCK_METHOD0(markTransformFeedbackUsage, gl::Error());