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

content/browser/renderer_host/image_transport_factory.cc

 // Copyright (c) 2012 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/renderer_host/image_transport_factory.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/bind.h"
@@ skipping 144 matching lines @@
  public:
   ImageTransportClientTexture(
       WebKit::WebGraphicsContext3D* host_context,
       float device_scale_factor)
       : OwnedTexture(host_context,
                      gfx::Size(0, 0),
                      device_scale_factor,
                      host_context->createTexture()) {
   }
 
-  virtual void Consume(const std::string& mailbox_name,
+  virtual void Consume(const gpu::Mailbox& mailbox_name,
                        const gfx::Size& new_size) OVERRIDE {
-    DCHECK(mailbox_name.size() == GL_MAILBOX_SIZE_CHROMIUM);
     mailbox_name_ = mailbox_name;
-    if (mailbox_name.empty())
+    if (mailbox_name.IsZero())

[no sievers, 2013/03/06 23:19:23]

I guess you could remove that now, since it's already checked by the caller. I
had originally added it out of paranoia since with the string it was riskier to
access the buffer if the size wasn't right (now I guess you'd just get a GL
error)...

[piman, 2013/03/07 01:48:02]

Done.

       return;
 
     DCHECK(host_context_ && texture_id_);
     host_context_->bindTexture(GL_TEXTURE_2D, texture_id_);
-    host_context_->consumeTextureCHROMIUM(
-        GL_TEXTURE_2D,
-        reinterpret_cast<const signed char*>(mailbox_name.c_str()));
+    host_context_->consumeTextureCHROMIUM(GL_TEXTURE_2D, mailbox_name.name);
     size_ = new_size;
     host_context_->shallowFlushCHROMIUM();
   }
 
-  virtual std::string Produce() OVERRIDE {
-    std::string name;
-    if (!mailbox_name_.empty()) {
+  virtual gpu::Mailbox Produce() OVERRIDE {
+    gpu::Mailbox name;
+    if (!mailbox_name_.IsZero()) {

[no sievers, 2013/03/06 23:19:23]

...and I think this could be a DCHECK() now since we should never try to return
a texture that didn't have a valid mailbox name when we received it (we would
skip the frame).

[piman, 2013/03/07 01:48:02]

Done.

       DCHECK(host_context_ && texture_id_);
       host_context_->bindTexture(GL_TEXTURE_2D, texture_id_);
-      host_context_->produceTextureCHROMIUM(
-          GL_TEXTURE_2D,
-          reinterpret_cast<const signed char*>(mailbox_name_.c_str()));
-      mailbox_name_.swap(name);
+      host_context_->produceTextureCHROMIUM(GL_TEXTURE_2D, mailbox_name_.name);
+      std::swap(mailbox_name_, name);
     }
     return name;
   }
 
  protected:
   virtual ~ImageTransportClientTexture() {}
 
  private:
-  std::string mailbox_name_;
+  gpu::Mailbox mailbox_name_;
   DISALLOW_COPY_AND_ASSIGN(ImageTransportClientTexture);
 };
 
 class GpuProcessTransportFactory;
 
 class CompositorSwapClient
     : public base::SupportsWeakPtr<CompositorSwapClient>,
       public WebGraphicsContext3DSwapBuffersClient {
  public:
   CompositorSwapClient(ui::Compositor* compositor,
@@ skipping 481 matching lines @@
   delete g_factory;
   g_factory = NULL;
 }
 
 // static
 ImageTransportFactory* ImageTransportFactory::GetInstance() {
   return g_factory;
 }
 
 }  // namespace content