| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #ifndef GPU_COMMAND_BUFFER_SERVICE_QUERY_MANAGER_H_ | 5 #ifndef GPU_COMMAND_BUFFER_SERVICE_QUERY_MANAGER_H_ | 
| 6 #define GPU_COMMAND_BUFFER_SERVICE_QUERY_MANAGER_H_ | 6 #define GPU_COMMAND_BUFFER_SERVICE_QUERY_MANAGER_H_ | 
| 7 | 7 | 
| 8 #include <deque> | 8 #include <deque> | 
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" | 
| 10 #include "base/hash_tables.h" | 10 #include "base/containers/hash_tables.h" | 
| 11 #include "base/logging.h" | 11 #include "base/logging.h" | 
| 12 #include "base/memory/ref_counted.h" | 12 #include "base/memory/ref_counted.h" | 
| 13 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" | 
| 14 #include "gpu/command_buffer/service/feature_info.h" | 14 #include "gpu/command_buffer/service/feature_info.h" | 
| 15 #include "gpu/command_buffer/service/gl_utils.h" | 15 #include "gpu/command_buffer/service/gl_utils.h" | 
| 16 #include "gpu/gpu_export.h" | 16 #include "gpu/gpu_export.h" | 
| 17 | 17 | 
| 18 namespace gpu { | 18 namespace gpu { | 
| 19 | 19 | 
| 20 class GLES2Decoder; | 20 class GLES2Decoder; | 
| (...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 227   // Async pixel transfer queries waiting for completion. | 227   // Async pixel transfer queries waiting for completion. | 
| 228   QueryQueue pending_transfer_queries_; | 228   QueryQueue pending_transfer_queries_; | 
| 229 | 229 | 
| 230   DISALLOW_COPY_AND_ASSIGN(QueryManager); | 230   DISALLOW_COPY_AND_ASSIGN(QueryManager); | 
| 231 }; | 231 }; | 
| 232 | 232 | 
| 233 }  // namespace gles2 | 233 }  // namespace gles2 | 
| 234 }  // namespace gpu | 234 }  // namespace gpu | 
| 235 | 235 | 
| 236 #endif  // GPU_COMMAND_BUFFER_SERVICE_QUERY_MANAGER_H_ | 236 #endif  // GPU_COMMAND_BUFFER_SERVICE_QUERY_MANAGER_H_ | 
| OLD | NEW | 
|---|