Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(351)

Unified Diff: gpu/command_buffer/service/framebuffer_manager_unittest.cc

Issue 1325433003: command_buffer: Add support for creating non-WebGL ES 3 contexts (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: missing hunk Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/command_buffer/service/framebuffer_manager.cc ('k') | gpu/command_buffer/service/gles2_cmd_decoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/framebuffer_manager_unittest.cc
diff --git a/gpu/command_buffer/service/framebuffer_manager_unittest.cc b/gpu/command_buffer/service/framebuffer_manager_unittest.cc
index c423764f45812eeb017a6603e9d97c326a3f9535..3a8511d8ac2c14d320e8ab04e6f65fe517b9e87c 100644
--- a/gpu/command_buffer/service/framebuffer_manager_unittest.cc
+++ b/gpu/command_buffer/service/framebuffer_manager_unittest.cc
@@ -34,7 +34,7 @@ const bool kUseDefaultTextures = false;
class FramebufferManagerTest : public GpuServiceTest {
public:
FramebufferManagerTest()
- : manager_(1, 1, ContextGroup::CONTEXT_TYPE_UNDEFINED, NULL),
+ : manager_(1, 1, CONTEXT_TYPE_OPENGLES2, NULL),
feature_info_(new FeatureInfo()) {
texture_manager_.reset(new TextureManager(NULL,
feature_info_.get(),
@@ -110,7 +110,7 @@ class FramebufferInfoTestBase : public GpuServiceTest {
static const GLuint kClient1Id = 1;
static const GLuint kService1Id = 11;
- explicit FramebufferInfoTestBase(ContextGroup::ContextType context_type)
+ explicit FramebufferInfoTestBase(ContextType context_type)
: manager_(kMaxDrawBuffers,
kMaxColorAttachments,
context_type,
@@ -160,9 +160,7 @@ class FramebufferInfoTestBase : public GpuServiceTest {
class FramebufferInfoTest : public FramebufferInfoTestBase {
public:
- FramebufferInfoTest()
- : FramebufferInfoTestBase(ContextGroup::CONTEXT_TYPE_UNDEFINED) {
- }
+ FramebufferInfoTest() : FramebufferInfoTestBase(CONTEXT_TYPE_OPENGLES2) {}
};
// GCC requires these declarations, but MSVC requires they not be present
@@ -905,9 +903,7 @@ TEST_F(FramebufferInfoTest, GetStatus) {
class FramebufferInfoES3Test : public FramebufferInfoTestBase {
public:
- FramebufferInfoES3Test()
- : FramebufferInfoTestBase(ContextGroup::CONTEXT_TYPE_WEBGL2) {
- }
+ FramebufferInfoES3Test() : FramebufferInfoTestBase(CONTEXT_TYPE_WEBGL2) {}
};
TEST_F(FramebufferInfoES3Test, DifferentDimensions) {
« no previous file with comments | « gpu/command_buffer/service/framebuffer_manager.cc ('k') | gpu/command_buffer/service/gles2_cmd_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698