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

Unified Diff: ui/gl/gpu_timing_fake.cc

Issue 2747823004: Fix QueryCounter on a pending query (Closed)
Patch Set: Created 3 years, 9 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/query_manager_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gpu_timing_fake.cc
diff --git a/ui/gl/gpu_timing_fake.cc b/ui/gl/gpu_timing_fake.cc
index a35793e88453a61609888eb2f33f449311dba68d..4a3fc2ee571a2b6d2bb0fdc8e558fee85663a686 100644
--- a/ui/gl/gpu_timing_fake.cc
+++ b/ui/gl/gpu_timing_fake.cc
@@ -80,8 +80,8 @@ void GPUTimingFake::ExpectNoDisjointCalls(MockGLInterface& gl) {
void GPUTimingFake::ExpectGPUTimeStampQuery(MockGLInterface& gl,
bool elapsed_query) {
- EXPECT_CALL(gl, GenQueries(1, NotNull())).Times(Exactly(1))
- .WillRepeatedly(Invoke(this, &GPUTimingFake::FakeGLGenQueries));
+ EXPECT_CALL(gl, GenQueries(1, NotNull()))
+ .WillOnce(Invoke(this, &GPUTimingFake::FakeGLGenQueries));
EXPECT_CALL(gl, GetQueryiv(GL_TIMESTAMP, GL_QUERY_COUNTER_BITS, NotNull()))
.WillRepeatedly(DoAll(SetArgPointee<2>(64), Return()));
@@ -113,9 +113,9 @@ void GPUTimingFake::ExpectGPUTimeStampQuery(MockGLInterface& gl,
.WillRepeatedly(
Invoke(this, &GPUTimingFake::FakeGLGetQueryObjectui64v));
- EXPECT_CALL(gl, DeleteQueries(1, NotNull())).Times(AtLeast(1))
- .WillRepeatedly(
- Invoke(this, &GPUTimingFake::FakeGLDeleteQueries));
+ EXPECT_CALL(gl, DeleteQueries(1, NotNull()))
+ .WillOnce(Invoke(this, &GPUTimingFake::FakeGLDeleteQueries))
+ .RetiresOnSaturation();
}
void GPUTimingFake::ExpectGPUTimerQuery(
« no previous file with comments | « gpu/command_buffer/service/query_manager_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698