| Index: webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
|
| diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
|
| index a2a9d39b2cfc163936b29860c0df4d3839588d3e..d38c00765823ea624bc9ab658053be2178aa7d0e 100644
|
| --- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
|
| +++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
|
| @@ -20,6 +20,7 @@
|
| #include "base/lazy_instance.h"
|
| #include "base/logging.h"
|
| #include "base/memory/singleton.h"
|
| +#include "base/memory/weak_ptr.h"
|
| #include "base/message_loop.h"
|
| #include "base/metrics/histogram.h"
|
| #include "base/string_tokenizer.h"
|
| @@ -40,6 +41,13 @@
|
| #include "ui/gl/gl_surface.h"
|
| #include "webkit/glue/gl_bindings_skia_cmd_buffer.h"
|
|
|
| +
|
| +namespace gpu {
|
| +namespace gles2 {
|
| +class ProgramCache;
|
| +}
|
| +}
|
| +
|
| using gpu::Buffer;
|
| using gpu::CommandBuffer;
|
| using gpu::CommandBufferService;
|
| @@ -49,6 +57,7 @@ using gpu::GpuScheduler;
|
| using gpu::TransferBuffer;
|
| using gpu::TransferBufferManager;
|
| using gpu::TransferBufferManagerInterface;
|
| +using gpu::gles2::ProgramCache;
|
|
|
| namespace webkit {
|
| namespace gpu {
|
| @@ -413,7 +422,9 @@ bool GLInProcessContext::Initialize(const gfx::Size& size,
|
| bool bind_generates_resource = false;
|
| decoder_.reset(::gpu::gles2::GLES2Decoder::Create(context_group ?
|
| context_group->decoder_->GetContextGroup() :
|
| - new ::gpu::gles2::ContextGroup(NULL, bind_generates_resource)));
|
| + new ::gpu::gles2::ContextGroup(NULL,
|
| + bind_generates_resource,
|
| + base::WeakPtr<ProgramCache>())));
|
|
|
| gpu_scheduler_.reset(new GpuScheduler(command_buffer_.get(),
|
| decoder_.get(),
|
|
|