| OLD | NEW | 
|   1 // Copyright 2014 The Chromium Authors. All rights reserved. |   1 // Copyright 2014 The Chromium Authors. All rights reserved. | 
|   2 // Use of this source code is governed by a BSD-style license that can be |   2 // Use of this source code is governed by a BSD-style license that can be | 
|   3 // found in the LICENSE file. |   3 // found in the LICENSE file. | 
|   4  |   4  | 
|   5 #ifndef UI_GL_GL_IMAGE_SHARED_MEMORY_H_ |   5 #ifndef UI_GL_GL_IMAGE_SHARED_MEMORY_H_ | 
|   6 #define UI_GL_GL_IMAGE_SHARED_MEMORY_H_ |   6 #define UI_GL_GL_IMAGE_SHARED_MEMORY_H_ | 
|   7  |   7  | 
|   8 #include "base/memory/scoped_ptr.h" |   8 #include "base/memory/scoped_ptr.h" | 
|   9 #include "base/memory/shared_memory_handle.h" |   9 #include "ui/gfx/gpu_memory_buffer.h" | 
|  10 #include "ui/gl/gl_image_memory.h" |  10 #include "ui/gl/gl_image_memory.h" | 
|  11  |  11  | 
|  12 namespace gfx { |  12 namespace gfx { | 
|  13  |  13  | 
|  14 class GL_EXPORT GLImageSharedMemory : public GLImageMemory { |  14 class GL_EXPORT GLImageSharedMemory : public GLImageMemory { | 
|  15  public: |  15  public: | 
|  16   GLImageSharedMemory(const gfx::Size& size, unsigned internalformat); |  16   GLImageSharedMemory(const gfx::Size& size, unsigned internalformat); | 
|  17  |  17  | 
|  18   bool Initialize(const base::SharedMemoryHandle& handle, |  18   bool Initialize(const gfx::GpuMemoryBufferHandle& handle, | 
|  19                   gfx::GenericSharedMemoryId shared_memory_id, |  19                   gfx::BufferFormat format); | 
|  20                   BufferFormat format); |  | 
|  21  |  20  | 
|  22   // Overridden from GLImage: |  21   // Overridden from GLImage: | 
|  23   void Destroy(bool have_context) override; |  22   void Destroy(bool have_context) override; | 
|  24   void OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd, |  23   void OnMemoryDump(base::trace_event::ProcessMemoryDump* pmd, | 
|  25                     uint64_t process_tracing_id, |  24                     uint64_t process_tracing_id, | 
|  26                     const std::string& dump_name) override; |  25                     const std::string& dump_name) override; | 
|  27  |  26  | 
|  28  protected: |  27  protected: | 
|  29   ~GLImageSharedMemory() override; |  28   ~GLImageSharedMemory() override; | 
|  30  |  29  | 
|  31  private: |  30  private: | 
|  32   scoped_ptr<base::SharedMemory> shared_memory_; |  31   scoped_ptr<base::SharedMemory> shared_memory_; | 
|  33   GenericSharedMemoryId shared_memory_id_; |  32   gfx::GenericSharedMemoryId shared_memory_id_; | 
|  34  |  33  | 
|  35   DISALLOW_COPY_AND_ASSIGN(GLImageSharedMemory); |  34   DISALLOW_COPY_AND_ASSIGN(GLImageSharedMemory); | 
|  36 }; |  35 }; | 
|  37  |  36  | 
|  38 }  // namespace gfx |  37 }  // namespace gfx | 
|  39  |  38  | 
|  40 #endif  // UI_GL_GL_IMAGE_SHARED_MEMORY_H_ |  39 #endif  // UI_GL_GL_IMAGE_SHARED_MEMORY_H_ | 
| OLD | NEW |