Chromium Code Reviews| Index: gpu/command_buffer/service/context_group.h |
| diff --git a/gpu/command_buffer/service/context_group.h b/gpu/command_buffer/service/context_group.h |
| index b6b64830803d1ea2808a9f599bf9e4888ce07a53..586d67c57e843f9bf91c652458bec5105ae88c21 100644 |
| --- a/gpu/command_buffer/service/context_group.h |
| +++ b/gpu/command_buffer/service/context_group.h |
| @@ -18,6 +18,11 @@ |
| #include "gpu/command_buffer/service/gles2_cmd_validation.h" |
| #include "gpu/command_buffer/service/shader_translator_cache.h" |
| #include "gpu/gpu_export.h" |
| +#include "ipc/ipc_sender.h" |
| + |
| +namespace content { |
| +class GpuChannel; |
| +} |
|
piman
2014/12/05 21:04:36
Are those 5 lines leftover from a previous version
orglofch
2014/12/06 21:49:04
Yep, Done.
|
| namespace gpu { |
| @@ -35,6 +40,7 @@ class RenderbufferManager; |
| class ProgramManager; |
| class ShaderManager; |
| class TextureManager; |
| +class SubscriptionRefSet; |
| class ValuebufferManager; |
| class MemoryTracker; |
| struct DisallowedFeatures; |
| @@ -48,6 +54,7 @@ class GPU_EXPORT ContextGroup : public base::RefCounted<ContextGroup> { |
| const scoped_refptr<MemoryTracker>& memory_tracker, |
| const scoped_refptr<ShaderTranslatorCache>& shader_translator_cache, |
| const scoped_refptr<FeatureInfo>& feature_info, |
| + const scoped_refptr<SubscriptionRefSet>& subscription_ref_set, |
| const scoped_refptr<ValueStateMap>& pending_valuebuffer_state, |
| bool bind_generates_resource); |
| @@ -188,7 +195,8 @@ class GPU_EXPORT ContextGroup : public base::RefCounted<ContextGroup> { |
| scoped_refptr<MemoryTracker> memory_tracker_; |
| scoped_refptr<ShaderTranslatorCache> shader_translator_cache_; |
| scoped_ptr<TransferBufferManagerInterface> transfer_buffer_manager_; |
| - scoped_refptr<gpu::ValueStateMap> pending_valuebuffer_state_; |
| + scoped_refptr<SubscriptionRefSet> subscription_ref_set_; |
| + scoped_refptr<ValueStateMap> pending_valuebuffer_state_; |
| bool enforce_gl_minimums_; |
| bool bind_generates_resource_; |