Revert 186627

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 gpu::Mailbox& mailbox_name,
+  virtual void Consume(const std::string& mailbox_name,
                        const gfx::Size& new_size) OVERRIDE {
+    DCHECK(mailbox_name.size() == GL_MAILBOX_SIZE_CHROMIUM);
+    mailbox_name_ = mailbox_name;
+    if (mailbox_name.empty())
+      return;
+
     DCHECK(host_context_ && texture_id_);
-    mailbox_name_ = mailbox_name;
     host_context_->bindTexture(GL_TEXTURE_2D, texture_id_);
-    host_context_->consumeTextureCHROMIUM(GL_TEXTURE_2D, mailbox_name.name);
+    host_context_->consumeTextureCHROMIUM(
+        GL_TEXTURE_2D,
+        reinterpret_cast<const signed char*>(mailbox_name.c_str()));
     size_ = new_size;
     host_context_->shallowFlushCHROMIUM();
   }
 
-  virtual gpu::Mailbox Produce() OVERRIDE {
-    DCHECK(!mailbox_name_.IsZero());
-    DCHECK(host_context_ && texture_id_);
-    host_context_->bindTexture(GL_TEXTURE_2D, texture_id_);
-    host_context_->produceTextureCHROMIUM(GL_TEXTURE_2D, mailbox_name_.name);
-    gpu::Mailbox name;
-    std::swap(mailbox_name_, name);
+  virtual std::string Produce() OVERRIDE {
+    std::string name;
+    if (!mailbox_name_.empty()) {
+      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);
+    }
     return name;
   }
 
  protected:
   virtual ~ImageTransportClientTexture() {}
 
  private:
-  gpu::Mailbox mailbox_name_;
+  std::string 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