gpu: Take surface handle into account when importing buffers.

gpu/ipc/service/gpu_memory_buffer_factory_io_surface.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 "gpu/ipc/service/gpu_memory_buffer_factory_io_surface.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "gpu/GLES2/gl2extchromium.h"
@@ skipping 53 matching lines @@
 ImageFactory* GpuMemoryBufferFactoryIOSurface::AsImageFactory() {
   return this;
 }
 
 scoped_refptr<gl::GLImage>
 GpuMemoryBufferFactoryIOSurface::CreateImageForGpuMemoryBuffer(
     const gfx::GpuMemoryBufferHandle& handle,
     const gfx::Size& size,
     gfx::BufferFormat format,
     unsigned internalformat,
-    int client_id) {
+    int client_id,
+    SurfaceHandle surface_handle) {
   base::AutoLock lock(io_surfaces_lock_);
 
   DCHECK_EQ(handle.type, gfx::IO_SURFACE_BUFFER);
   IOSurfaceMapKey key(handle.id, client_id);
   IOSurfaceMap::iterator it = io_surfaces_.find(key);
   if (it == io_surfaces_.end())
     return scoped_refptr<gl::GLImage>();
 
   scoped_refptr<gl::GLImageIOSurface> image(
       new gl::GLImageIOSurface(size, internalformat));
@@ skipping 27 matching lines @@
 
 unsigned GpuMemoryBufferFactoryIOSurface::RequiredTextureType() {
   return GL_TEXTURE_RECTANGLE_ARB;
 }
 
 bool GpuMemoryBufferFactoryIOSurface::SupportsFormatRGB() {
   return false;
 }
 
 }  // namespace gpu