Allow binding multiple textures to one DC Layer overlay.

gpu/command_buffer/client/gles2_implementation.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.
 
 // A class to emulate GLES2 over command buffers.
 
 #include "gpu/command_buffer/client/gles2_implementation.h"
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
@@ skipping 4980 matching lines @@
                "out of memory");
     return;
   }
   GLfloat* mem = static_cast<GLfloat*>(buffer.address());
   memcpy(mem + 0, clip_rect, 4 * sizeof(GLfloat));
   memcpy(mem + 4, transform, 16 * sizeof(GLfloat));
   helper_->ScheduleDCLayerSharedStateCHROMIUM(opacity, is_clipped, z_order,
                                               buffer.shm_id(), buffer.offset());
 }
 
-void GLES2Implementation::ScheduleDCLayerCHROMIUM(GLuint contents_texture_id,
-                                                  const GLfloat* contents_rect,
+void GLES2Implementation::ScheduleDCLayerCHROMIUM(const GLfloat* contents_rect,
                                                   GLuint background_color,
                                                   GLuint edge_aa_mask,
                                                   const GLfloat* bounds_rect,
                                                   GLuint filter) {
   size_t shm_size = 8 * sizeof(GLfloat);
   ScopedTransferBufferPtr buffer(shm_size, helper_, transfer_buffer_);
   if (!buffer.valid() || buffer.size() < shm_size) {
     SetGLError(GL_OUT_OF_MEMORY, "GLES2::ScheduleDCLayerCHROMIUM",
                "out of memory");
     return;
   }
   GLfloat* mem = static_cast<GLfloat*>(buffer.address());
   memcpy(mem + 0, contents_rect, 4 * sizeof(GLfloat));
   memcpy(mem + 4, bounds_rect, 4 * sizeof(GLfloat));
-  helper_->ScheduleDCLayerCHROMIUM(contents_texture_id, background_color,
-                                   edge_aa_mask, filter, buffer.shm_id(),
-                                   buffer.offset());
+  helper_->ScheduleDCLayerCHROMIUM(background_color, edge_aa_mask, filter,
+                                   buffer.shm_id(), buffer.offset());
 }
 
 void GLES2Implementation::CommitOverlayPlanesCHROMIUM() {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] CommitOverlayPlanesCHROMIUM()");
   TRACE_EVENT0("gpu", "GLES2::CommitOverlayPlanesCHROMIUM");
 
   // Same flow control as GLES2Implementation::SwapBuffers (see comments there).
   swap_buffers_tokens_.push(helper_->InsertToken());
   helper_->CommitOverlayPlanesCHROMIUM();
@@ skipping 2042 matching lines @@
   CheckGLError();
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "gpu/command_buffer/client/gles2_implementation_impl_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu