More compact representation of the GL Query cache

gpu/command_buffer/client/query_tracker_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Tests for the QueryTracker.
 
 #include "gpu/command_buffer/client/query_tracker.h"
 
 #include <GLES2/gl2ext.h>
 #include "base/memory/scoped_ptr.h"
@@ skipping 89 matching lines @@
   }
 
   QuerySync* GetSync(QueryTracker::Query* query) {
     return query->info_.sync;
   }
 
   QuerySyncManager::Bucket* GetBucket(QueryTracker::Query* query) {
     return query->info_.bucket;
   }
 
+  uint32 GetBucketUsedCount(QuerySyncManager::Bucket* bucket) {
+    return QuerySyncManager::kSyncsPerBucket - bucket->free_queries.size();
+  }
+
   uint32 GetFlushGeneration() { return helper_->flush_generation(); }
 
   scoped_ptr<CommandBuffer> command_buffer_;
   scoped_ptr<GLES2CmdHelper> helper_;
   scoped_ptr<MappedMemoryManager> mapped_memory_;
   scoped_ptr<QueryTracker> query_tracker_;
 };
 
 TEST_F(QueryTrackerTest, Basic) {
   const GLuint kId1 = 123;
@@ skipping 82 matching lines @@
   const GLuint kId1 = 123;
   const int32 kToken = 46;
   const uint32 kResult = 456;
 
   // Create a Query.
   QueryTracker::Query* query = query_tracker_->CreateQuery(
       kId1, GL_ANY_SAMPLES_PASSED_EXT);
   ASSERT_TRUE(query != NULL);
 
   QuerySyncManager::Bucket* bucket = GetBucket(query);
-  EXPECT_EQ(1u, bucket->used_query_count);
+  EXPECT_EQ(1u, GetBucketUsedCount(bucket));
 
   query->MarkAsActive();
   query->MarkAsPending(kToken);
 
   query_tracker_->RemoveQuery(kId1);
   // Check we get nothing for a non-existent query.
   EXPECT_TRUE(query_tracker_->GetQuery(kId1) == NULL);
 
   // Check that memory was not freed.
-  EXPECT_EQ(1u, bucket->used_query_count);
+  EXPECT_EQ(1u, GetBucketUsedCount(bucket));
 
   // Simulate GPU process marking it as available.
   QuerySync* sync = GetSync(query);
   sync->process_count = query->submit_count();
   sync->result = kResult;
 
   // Check FreeCompletedQueries.
   query_tracker_->FreeCompletedQueries();
-  EXPECT_EQ(0u, bucket->used_query_count);
+  EXPECT_EQ(0u, GetBucketUsedCount(bucket));
 }
 
 }  // namespace gles2
 }  // namespace gpu