| Index: gpu/command_buffer/service/context_group.cc
|
| diff --git a/gpu/command_buffer/service/context_group.cc b/gpu/command_buffer/service/context_group.cc
|
| index de793240f9b33f38a63ab05d96f2103cab443c77..d8f8c5680939cd1251e1d7611eb525d4c498ce74 100644
|
| --- a/gpu/command_buffer/service/context_group.cc
|
| +++ b/gpu/command_buffer/service/context_group.cc
|
| @@ -21,6 +21,7 @@
|
| #include "gpu/command_buffer/service/progress_reporter.h"
|
| #include "gpu/command_buffer/service/renderbuffer_manager.h"
|
| #include "gpu/command_buffer/service/sampler_manager.h"
|
| +#include "gpu/command_buffer/service/service_discardable_manager.h"
|
| #include "gpu/command_buffer/service/shader_manager.h"
|
| #include "gpu/command_buffer/service/texture_manager.h"
|
| #include "gpu/command_buffer/service/transfer_buffer_manager.h"
|
| @@ -69,7 +70,8 @@ ContextGroup::ContextGroup(
|
| bool bind_generates_resource,
|
| gpu::ImageFactory* image_factory,
|
| ProgressReporter* progress_reporter,
|
| - const GpuFeatureInfo& gpu_feature_info)
|
| + const GpuFeatureInfo& gpu_feature_info,
|
| + const scoped_refptr<ServiceDiscardableManager>& discardable_manager)
|
| : gpu_preferences_(gpu_preferences),
|
| mailbox_manager_(mailbox_manager),
|
| memory_tracker_(memory_tracker),
|
| @@ -109,8 +111,10 @@ ContextGroup::ContextGroup(
|
| image_factory_(image_factory),
|
| passthrough_resources_(new PassthroughResources),
|
| progress_reporter_(progress_reporter),
|
| - gpu_feature_info_(gpu_feature_info) {
|
| + gpu_feature_info_(gpu_feature_info),
|
| + discardable_manager_(discardable_manager) {
|
| {
|
| + CHECK(discardable_manager);
|
| DCHECK(feature_info_);
|
| if (!mailbox_manager_.get())
|
| mailbox_manager_ = new MailboxManagerImpl;
|
|
|