gpu: Take surface handle into account when importing buffers.

gpu/ipc/service/gpu_memory_buffer_factory_surface_texture.h

 // 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.
 
 #ifndef GPU_IPC_SERVICE_GPU_MEMORY_BUFFER_FACTORY_SURFACE_TEXTURE_H_
 #define GPU_IPC_SERVICE_GPU_MEMORY_BUFFER_FACTORY_SURFACE_TEXTURE_H_
 
 #include <utility>
 
 #include "base/containers/hash_tables.h"
@@ skipping 30 matching lines @@
   void DestroyGpuMemoryBuffer(gfx::GpuMemoryBufferId id,
                               int client_id) override;
   ImageFactory* AsImageFactory() override;
 
   // Overridden from ImageFactory:
   scoped_refptr<gl::GLImage> CreateImageForGpuMemoryBuffer(
       const gfx::GpuMemoryBufferHandle& handle,
       const gfx::Size& size,
       gfx::BufferFormat format,
       unsigned internalformat,
-      int client_id) override;
+      int client_id,
+      SurfaceHandle surface_handle) override;
 
  private:
   typedef std::pair<int, int> SurfaceTextureMapKey;
   typedef base::hash_map<SurfaceTextureMapKey,
                          scoped_refptr<gl::SurfaceTexture>>
       SurfaceTextureMap;
   SurfaceTextureMap surface_textures_;
   base::Lock surface_textures_lock_;
 };
 
 }  // namespace gpu
 
 #endif  // GPU_IPC_SERVICE_GPU_MEMORY_BUFFER_FACTORY_SURFACE_TEXTURE_H_