Use gpu::Mailbox instead of std:string in IPCs

content/browser/compositor/gpu_process_transport_factory.cc

 // Copyright 2014 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.
 
 #include "content/browser/compositor/gpu_process_transport_factory.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 11 matching lines @@
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/browser/gpu/gpu_surface_tracker.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "content/common/gpu/client/gl_helper.h"
 #include "content/common/gpu/client/gpu_channel_host.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 #include "content/common/gpu/gpu_process_launch_causes.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
+#include "gpu/command_buffer/common/mailbox.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/compositor_constants.h"
 #include "ui/compositor/compositor_switches.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
 
 #if defined(OS_WIN)
 #include "content/browser/compositor/software_output_device_win.h"
 #elif defined(USE_OZONE)
@@ skipping 64 matching lines @@
 class ImageTransportClientTexture : public OwnedTexture {
  public:
   ImageTransportClientTexture(const scoped_refptr<ContextProvider>& provider,
                               float device_scale_factor,
                               GLuint texture_id)
       : OwnedTexture(provider,
                      gfx::Size(0, 0),
                      device_scale_factor,
                      texture_id) {}
 
-  virtual void Consume(const std::string& mailbox_name,
+  virtual void Consume(const gpu::Mailbox& mailbox,
                        const gfx::Size& new_size) OVERRIDE {
-    DCHECK(mailbox_name.size() == GL_MAILBOX_SIZE_CHROMIUM);
-    mailbox_name_ = mailbox_name;
-    if (mailbox_name.empty())
+    mailbox_ = mailbox;
+    if (mailbox.IsZero())
       return;
 
     DCHECK(provider_ && texture_id_);
     GLES2Interface* gl = provider_->ContextGL();
     gl->BindTexture(GL_TEXTURE_2D, texture_id_);
-    gl->ConsumeTextureCHROMIUM(
-        GL_TEXTURE_2D, reinterpret_cast<const GLbyte*>(mailbox_name.c_str()));
+    gl->ConsumeTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name);
     size_ = new_size;
     gl->ShallowFlushCHROMIUM();
   }
 
-  virtual std::string Produce() OVERRIDE { return mailbox_name_; }
+  virtual gpu::Mailbox Produce() OVERRIDE { return mailbox_; }
 
  protected:
   virtual ~ImageTransportClientTexture() {}
 
  private:
-  std::string mailbox_name_;
+  gpu::Mailbox mailbox_;
   DISALLOW_COPY_AND_ASSIGN(ImageTransportClientTexture);
 };
 
 GpuProcessTransportFactory::GpuProcessTransportFactory()
     : callback_factory_(this) {
   output_surface_proxy_ = new BrowserCompositorOutputSurfaceProxy(
       &output_surface_map_);
 }
 
 GpuProcessTransportFactory::~GpuProcessTransportFactory() {
@@ skipping 323 matching lines @@
                     observer_list_,
                     OnLostResources());
 
   // Kill things that use the shared context before killing the shared context.
   lost_gl_helper.reset();
   lost_offscreen_compositor_contexts = NULL;
   lost_shared_main_thread_contexts  = NULL;
 }
 
 }  // namespace content