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

Side by Side Diff: gpu/command_buffer/service/test_helper.cc

Issue 7979031: Code cleanup: rename DisallowedExtensions to DisallowedFeature. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « gpu/command_buffer/service/test_helper.h ('k') | gpu/demos/framework/window.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "gpu/command_buffer/service/test_helper.h" 5 #include "gpu/command_buffer/service/test_helper.h"
6 6
7 #include "base/string_tokenizer.h" 7 #include "base/string_tokenizer.h"
8 #include "gpu/command_buffer/common/gl_mock.h" 8 #include "gpu/command_buffer/common/gl_mock.h"
9 #include "gpu/command_buffer/common/types.h" 9 #include "gpu/command_buffer/common/types.h"
10 #include "gpu/command_buffer/service/gl_utils.h" 10 #include "gpu/command_buffer/service/gl_utils.h"
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 external_texture_ids + arraysize(external_texture_ids))) 116 external_texture_ids + arraysize(external_texture_ids)))
117 .RetiresOnSaturation(); 117 .RetiresOnSaturation();
118 EXPECT_CALL(*gl, BindTexture(GL_TEXTURE_EXTERNAL_OES, 0)) 118 EXPECT_CALL(*gl, BindTexture(GL_TEXTURE_EXTERNAL_OES, 0))
119 .Times(1) 119 .Times(1)
120 .RetiresOnSaturation(); 120 .RetiresOnSaturation();
121 } 121 }
122 } 122 }
123 123
124 void TestHelper::SetupContextGroupInitExpectations( 124 void TestHelper::SetupContextGroupInitExpectations(
125 ::gfx::MockGLInterface* gl, 125 ::gfx::MockGLInterface* gl,
126 const DisallowedExtensions& disallowed_extensions, 126 const DisallowedFeatures& disallowed_features,
127 const char* extensions) { 127 const char* extensions) {
128 InSequence sequence; 128 InSequence sequence;
129 129
130 SetupFeatureInfoInitExpectations(gl, extensions); 130 SetupFeatureInfoInitExpectations(gl, extensions);
131 131
132 EXPECT_CALL(*gl, GetIntegerv(GL_MAX_RENDERBUFFER_SIZE, _)) 132 EXPECT_CALL(*gl, GetIntegerv(GL_MAX_RENDERBUFFER_SIZE, _))
133 .WillOnce(SetArgumentPointee<1>(kMaxRenderbufferSize)) 133 .WillOnce(SetArgumentPointee<1>(kMaxRenderbufferSize))
134 .RetiresOnSaturation(); 134 .RetiresOnSaturation();
135 EXPECT_CALL(*gl, GetIntegerv(GL_MAX_VERTEX_ATTRIBS, _)) 135 EXPECT_CALL(*gl, GetIntegerv(GL_MAX_VERTEX_ATTRIBS, _))
136 .WillOnce(SetArgumentPointee<1>(kNumVertexAttribs)) 136 .WillOnce(SetArgumentPointee<1>(kNumVertexAttribs))
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 InSequence sequence; 169 InSequence sequence;
170 170
171 EXPECT_CALL(*gl, GetString(GL_EXTENSIONS)) 171 EXPECT_CALL(*gl, GetString(GL_EXTENSIONS))
172 .WillOnce(Return(reinterpret_cast<const uint8*>(extensions))) 172 .WillOnce(Return(reinterpret_cast<const uint8*>(extensions)))
173 .RetiresOnSaturation(); 173 .RetiresOnSaturation();
174 } 174 }
175 175
176 } // namespace gles2 176 } // namespace gles2
177 } // namespace gpu 177 } // namespace gpu
178 178
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/test_helper.h ('k') | gpu/demos/framework/window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698