Make context groups share a TextureBufferManager

TEST=unit tests, and ran WebGL Conformance tests
BUG=129803


Review URL: https://chromiumcodereview.appspot.com/10441140

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139981 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 10 insertions, 1 deletions

diff --git a/gpu/demos/framework/window.cc b/gpu/demos/framework/window.cc
index e5274790..d30e427 100644
--- a/gpu/demos/framework/window.cc
+++ b/gpu/demos/framework/window.cc
@@ -12,6 +12,7 @@
 #include "gpu/command_buffer/client/gles2_lib.h"
 #include "gpu/command_buffer/client/transfer_buffer.h"
 #include "gpu/command_buffer/service/context_group.h"
+#include "gpu/command_buffer/service/transfer_buffer_manager.h"
 #include "gpu/demos/framework/demo.h"
 #include "gpu/demos/framework/demo_factory.h"
 
@@ -65,7 +66,13 @@ void Window::OnPaint() {
 }
 
 bool Window::CreateRenderContext(gfx::AcceleratedWidget hwnd) {
-  command_buffer_.reset(new CommandBufferService);
+  {
+    TransferBufferManager* manager = new TransferBufferManager();
+    transfer_buffer_manager_.reset(manager);
+    EXPECT_TRUE(manager->Initialize());
+  }
+  command_buffer_.reset(
+      new CommandBufferService(transfer_buffer_manager_.get()));
   if (!command_buffer_->Initialize()) {
     return false;
   }
diff --git a/gpu/demos/framework/window.h b/gpu/demos/framework/window.h
index e9c9802..651498d 100644
--- a/gpu/demos/framework/window.h
+++ b/gpu/demos/framework/window.h
@@ -17,6 +17,7 @@
 namespace gpu {
 
 class TransferBuffer;
+class TransferBufferManagerInterface;
 
 namespace gles2 {
 
@@ -55,6 +56,7 @@ class Window {
   gfx::NativeWindow window_handle_;
   scoped_ptr<Demo> demo_;
 
+  scoped_ptr<TransferBufferManagerInterface> transfer_buffer_manager_;
   scoped_ptr<gpu::CommandBufferService> command_buffer_;
   scoped_ptr<gpu::GpuScheduler> gpu_scheduler_;
   scoped_ptr<gpu::gles2::GLES2Decoder> decoder_;