Merged in recent changes to command buffer code.

gpu/command_buffer/client/gles2_demo.cc

 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file is here so other GLES2 related files can have a common set of
 // includes where appropriate.
 
 #include <windows.h>
 #include <windowsx.h>
 #include <shellapi.h>
@@ skipping 55 matching lines @@
 
   GLES2CmdHelper* helper = new GLES2CmdHelper(command_buffer.get());
   if (!helper->Initialize()) {
     // TODO(gman): cleanup.
     return false;
   }
 
   size_t transfer_buffer_size = 512 * 1024;
   int32 transfer_buffer_id =
       command_buffer->CreateTransferBuffer(transfer_buffer_size);
-  void* transfer_buffer =
+  ::base::SharedMemory* shared_memory =
       command_buffer->GetTransferBuffer(transfer_buffer_id);
+  if (!shared_memory->Map(transfer_buffer_size)) {
+    return false;
+  }
+  void* transfer_buffer = shared_memory->memory();
+  if (!transfer_buffer) {
+    return false;
+  }
 
   gles2::g_gl_impl = new GLES2Implementation(helper,
+                                             transfer_buffer_size,
                                              transfer_buffer,
                                              transfer_buffer_id);
 
   return command_buffer.release() != NULL;
 }
 
 #if defined(OS_WIN)
 LRESULT CALLBACK WindowProc(
     HWND hwnd, UINT msg, WPARAM w_param, LPARAM l_param) {
   switch (msg) {
@@ skipping 104 matching lines @@
   }
 
   demo->Setup(NULL, hwnd, kCommandBufferSize);
 
   ProcessMessages(hwnd);
 
   return EXIT_SUCCESS;
 }