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

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

Issue 2435803004: Initialize buffers before allowing access to them. (Closed)
Patch Set: win failure Created 4 years, 2 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
Index: gpu/command_buffer/service/buffer_manager_unittest.cc
diff --git a/gpu/command_buffer/service/buffer_manager_unittest.cc b/gpu/command_buffer/service/buffer_manager_unittest.cc
index 327e679dc6e3bcaa23cdeb96be9d0ab311a8b94a..9a893f14ae15ca5a61b1d6d0d03d67401d1598df 100644
--- a/gpu/command_buffer/service/buffer_manager_unittest.cc
+++ b/gpu/command_buffer/service/buffer_manager_unittest.cc
@@ -61,20 +61,16 @@ class BufferManagerTestBase : public GpuServiceTest {
bool DoBufferSubData(
Buffer* buffer, GLenum target, GLintptr offset, GLsizeiptr size,
const GLvoid* data) {
- bool success = true;
if (!buffer->CheckRange(offset, size)) {
- EXPECT_CALL(*error_state_, SetGLError(_, _, GL_INVALID_VALUE, _, _))
- .Times(1)
- .RetiresOnSaturation();
- success = false;
- } else if (!buffer->IsClientSideArray()) {
+ return false;
+ }
+ if (!buffer->IsClientSideArray()) {
EXPECT_CALL(*gl_, BufferSubData(target, offset, size, _))
.Times(1)
.RetiresOnSaturation();
}
- manager_->DoBufferSubData(
- error_state_.get(), buffer, target, offset, size, data);
- return success;
+ manager_->DoBufferSubData(buffer, target, offset, size, data);
+ return true;
}
void RunGetMaxValueForRangeUint8Test(bool enable_primitive_restart)
@@ -589,5 +585,3 @@ TEST_F(BufferManagerTest, DeleteBufferAfterContextLost) {
} // namespace gles2
} // namespace gpu
-
-

Powered by Google App Engine
This is Rietveld 408576698