| Index: gpu/command_buffer/tests/gl_readback_unittest.cc
|
| diff --git a/gpu/command_buffer/tests/gl_readback_unittest.cc b/gpu/command_buffer/tests/gl_readback_unittest.cc
|
| index 0d9e48260f98039da080dbe48f77703e26749fd6..6b7222ee2d68b653fd9c6f8d85a75176cb81f541 100644
|
| --- a/gpu/command_buffer/tests/gl_readback_unittest.cc
|
| +++ b/gpu/command_buffer/tests/gl_readback_unittest.cc
|
| @@ -30,14 +30,16 @@ class GLReadbackTest : public testing::Test {
|
|
|
| void TearDown() override { gl_.Destroy(); }
|
|
|
| - static void WaitForQueryCallback(int q, base::Closure cb) {
|
| + void WaitForQueryCallback(int q, base::Closure cb) {
|
| unsigned int done = 0;
|
| + gl_.PerformIdleWork();
|
| glGetQueryObjectuivEXT(q, GL_QUERY_RESULT_AVAILABLE_EXT, &done);
|
| if (done) {
|
| cb.Run();
|
| } else {
|
| base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
|
| - FROM_HERE, base::Bind(&WaitForQueryCallback, q, cb),
|
| + FROM_HERE, base::Bind(&GLReadbackTest::WaitForQueryCallback,
|
| + base::Unretained(this), q, cb),
|
| base::TimeDelta::FromMilliseconds(3));
|
| }
|
| }
|
| @@ -51,7 +53,6 @@ class GLReadbackTest : public testing::Test {
|
| GLManager gl_;
|
| };
|
|
|
| -
|
| TEST_F(GLReadbackTest, ReadPixelsWithPBOAndQuery) {
|
| const GLint kBytesPerPixel = 4;
|
| const GLint kWidth = 2;
|
|
|