Revert 186627

content/common/gpu/texture_image_transport_surface.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/common/gpu/texture_image_transport_surface.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 196 matching lines @@
     return true;
 
   if (!backbuffer_.service_id) {
     LOG(ERROR) << "Swap without valid backing.";
     return true;
   }
 
   DCHECK(backbuffer_.size == current_size_);
   GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params params;
   params.size = backbuffer_.size;
-  params.mailbox_name = backbuffer_.mailbox_name;
+  const MailboxName& name = backbuffer_.mailbox_name;
+  params.mailbox_name.assign(
+      reinterpret_cast<const char*>(&name), sizeof(name));
 
   glFlush();
   ProduceTexture(&backbuffer_);
 
   // Do not allow destruction while we are still waiting for a swap ACK,
   // so we do not leak a texture in the mailbox.
   AddRef();
 
   helper_->SendAcceleratedSurfaceBuffersSwapped(params);
 
@@ skipping 19 matching lines @@
     return true;
   }
 
   DCHECK(current_size_ == backbuffer_.size);
   GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params params;
   params.surface_size = backbuffer_.size;
   params.x = x;
   params.y = y;
   params.width = width;
   params.height = height;
-  params.mailbox_name = backbuffer_.mailbox_name;
+  const MailboxName& name = backbuffer_.mailbox_name;
+  params.mailbox_name.assign(
+      reinterpret_cast<const char*>(&name), sizeof(name));
 
   glFlush();
   ProduceTexture(&backbuffer_);
 
   // Do not allow destruction while we are still waiting for a swap ACK,
   // so we do not leak a texture in the mailbox.
   AddRef();
 
   helper_->SendAcceleratedSurfacePostSubBuffer(params);
 
@@ skipping 37 matching lines @@
                    this,
                    params.mailbox_name));
   }
 
   // Careful, we might get deleted now if we were only waiting for
   // a final swap ACK.
   Release();
 }
 
 void TextureImageTransportSurface::BufferPresentedImpl(
-    const gpu::Mailbox& mailbox_name) {
+    const std::string& mailbox_name) {
   DCHECK(!backbuffer_.service_id);
-  if (!mailbox_name.IsZero()) {
-    backbuffer_.mailbox_name = mailbox_name;
+  if (!mailbox_name.empty()) {
+    DCHECK(mailbox_name.length() == GL_MAILBOX_SIZE_CHROMIUM);
+    mailbox_name.copy(reinterpret_cast<char *>(&backbuffer_.mailbox_name),
+                      sizeof(MailboxName));
     ConsumeTexture(&backbuffer_);
   }
 
   if (stub_destroyed_ && backbuffer_.service_id) {
     // TODO(sievers): Remove this after changes to the mailbox to take ownership
     // of the service ids.
     DCHECK(context_.get() && surface_.get());
     if (context_->MakeCurrent(surface_.get()))
       glDeleteTextures(1, &backbuffer_.service_id);
 
@@ skipping 28 matching lines @@
 void TextureImageTransportSurface::OnResizeViewACK() {
   NOTREACHED();
 }
 
 void TextureImageTransportSurface::ReleaseBackTexture() {
   if (!backbuffer_.service_id)
     return;
 
   glDeleteTextures(1, &backbuffer_.service_id);
   backbuffer_.service_id = 0;
-  backbuffer_.mailbox_name = gpu::Mailbox();
+  backbuffer_.mailbox_name = MailboxName();
   glFlush();
   CHECK_GL_ERROR();
 }
 
 void TextureImageTransportSurface::CreateBackTexture() {
   // If |is_swap_buffers_pending| we are waiting for our backbuffer
   // in the mailbox, so we shouldn't be reallocating it now.
   DCHECK(!is_swap_buffers_pending_);
 
   if (backbuffer_.service_id && backbuffer_.size == current_size_)
@@ skipping 10 matching lines @@
              ->decoder()
              ->GetContextGroup()
              ->feature_info()
              ->workarounds()
              .delete_instead_of_resize_fbo) {
     glDeleteTextures(1, &backbuffer_.service_id);
     backbuffer_ = Texture();
   }
 
   if (!backbuffer_.service_id) {
-    gpu::Mailbox& name = backbuffer_.mailbox_name;
+    MailboxName new_mailbox_name;
+    MailboxName& name = backbuffer_.mailbox_name;
     // This slot should be uninitialized.
-    DCHECK(name.IsZero());
-
-    MailboxName new_mailbox_name;
+    DCHECK(!memcmp(&name, &new_mailbox_name, sizeof(MailboxName)));
     mailbox_manager_->GenerateMailboxName(&new_mailbox_name);
-    name.SetName(new_mailbox_name.key);
+    name = new_mailbox_name;
     glGenTextures(1, &backbuffer_.service_id);
   }
 
   backbuffer_.size = current_size_;
 
   {
     ScopedTextureBinder texture_binder(backbuffer_.service_id);
     glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
     glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
@@ skipping 22 matching lines @@
   if (status != GL_FRAMEBUFFER_COMPLETE) {
     DLOG(FATAL) << "Framebuffer incomplete: " << status;
   }
 #endif
 }
 
 void TextureImageTransportSurface::ConsumeTexture(Texture* texture) {
   DCHECK(!texture->service_id);
 
   scoped_ptr<TextureDefinition> definition(mailbox_manager_->ConsumeTexture(
-      GL_TEXTURE_2D, MailboxName(texture->mailbox_name)));
+      GL_TEXTURE_2D, texture->mailbox_name));
   if (definition.get()) {
     texture->service_id = definition->ReleaseServiceId();
     texture->size = gfx::Size(definition->level_infos()[0][0].width,
                              definition->level_infos()[0][0].height);
   } else {
-    texture->mailbox_name = gpu::Mailbox();
+    texture->mailbox_name = MailboxName();
   }
 }
 
 void TextureImageTransportSurface::ProduceTexture(Texture* texture) {
   DCHECK(texture->service_id);
 
   TextureManager* texture_manager =
       helper_->stub()->decoder()->GetContextGroup()->texture_manager();
   DCHECK(texture->size.width() > 0 && texture->size.height() > 0);
   TextureDefinition::LevelInfo info(
@@ skipping 13 matching lines @@
       GL_CLAMP_TO_EDGE,
       GL_NONE,
       true,
       level_infos));
   // Pass NULL as |owner| here to avoid errors from glConsumeTextureCHROMIUM()
   // when the renderer context group goes away before the RWHV handles a pending
   // ACK. We avoid leaking a texture in the mailbox by waiting for the final ACK
   // at which point we consume the correct texture back.
   bool success = mailbox_manager_->ProduceTexture(
       GL_TEXTURE_2D,
-      MailboxName(texture->mailbox_name),
+      texture->mailbox_name,
       definition.release(),
       NULL);
   DCHECK(success);
   texture->service_id = 0;
-  texture->mailbox_name = gpu::Mailbox();
+  texture->mailbox_name = MailboxName();
 }
 
 }  // namespace content