| 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 0cf991a7f45e809dde72f52790986820c5b99bbd..ee782d052a1acc0b517a3088f6bf77fb0a829694 100644
|
| --- a/gpu/command_buffer/service/context_group.cc
|
| +++ b/gpu/command_buffer/service/context_group.cc
|
| @@ -32,12 +32,10 @@ ContextGroup::ContextGroup(
|
| MailboxManager* mailbox_manager,
|
| ImageManager* image_manager,
|
| MemoryTracker* memory_tracker,
|
| - StreamTextureManager* stream_texture_manager,
|
| bool bind_generates_resource)
|
| : mailbox_manager_(mailbox_manager ? mailbox_manager : new MailboxManager),
|
| image_manager_(image_manager ? image_manager : new ImageManager),
|
| memory_tracker_(memory_tracker),
|
| - stream_texture_manager_(stream_texture_manager),
|
| enforce_gl_minimums_(CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kEnforceGLMinimums)),
|
| bind_generates_resource_(bind_generates_resource),
|
| @@ -179,7 +177,6 @@ bool ContextGroup::Initialize(
|
| max_texture_size,
|
| max_cube_map_texture_size));
|
| texture_manager_->set_framebuffer_manager(framebuffer_manager_.get());
|
| - texture_manager_->set_stream_texture_manager(stream_texture_manager_);
|
|
|
| const GLint kMinTextureImageUnits = 8;
|
| const GLint kMinVertexTextureImageUnits = 0;
|
| @@ -315,7 +312,6 @@ void ContextGroup::Destroy(GLES2Decoder* decoder, bool have_context) {
|
| }
|
|
|
| memory_tracker_ = NULL;
|
| - stream_texture_manager_ = NULL;
|
| }
|
|
|
| IdAllocatorInterface* ContextGroup::GetIdAllocator(unsigned namespace_id) {
|
|
|