gpu: Take surface handle into account when importing buffers.

gpu/ipc/service/gpu_memory_buffer_factory_surface_texture.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_surface_texture.h"
 
 #include "gpu/ipc/common/android/surface_texture_manager.h"
 #include "ui/gl/android/surface_texture.h"
 #include "ui/gl/gl_image_surface_texture.h"
 
@@ skipping 58 matching lines @@
 ImageFactory* GpuMemoryBufferFactorySurfaceTexture::AsImageFactory() {
   return this;
 }
 
 scoped_refptr<gl::GLImage>
 GpuMemoryBufferFactorySurfaceTexture::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(surface_textures_lock_);
 
   DCHECK_EQ(handle.type, gfx::SURFACE_TEXTURE_BUFFER);
 
   SurfaceTextureMapKey key(handle.id.id, client_id);
   SurfaceTextureMap::iterator it = surface_textures_.find(key);
   if (it == surface_textures_.end())
     return scoped_refptr<gl::GLImage>();
 
   scoped_refptr<gl::GLImageSurfaceTexture> image(
       new gl::GLImageSurfaceTexture(size));
   if (!image->Initialize(it->second.get()))
     return scoped_refptr<gl::GLImage>();
 
   return image;
 }
 
 }  // namespace gpu