| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 GPU_COMMAND_BUFFER_SERVICE_GPU_PROCESSOR_H_ | 5 #ifndef GPU_COMMAND_BUFFER_SERVICE_GPU_PROCESSOR_H_ |
| 6 #define GPU_COMMAND_BUFFER_SERVICE_GPU_PROCESSOR_H_ | 6 #define GPU_COMMAND_BUFFER_SERVICE_GPU_PROCESSOR_H_ |
| 7 | 7 |
| 8 #include <queue> | 8 #include <queue> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "app/surface/transport_dib.h" | |
| 12 #include "base/callback.h" | 11 #include "base/callback.h" |
| 13 #include "base/ref_counted.h" | 12 #include "base/ref_counted.h" |
| 14 #include "base/scoped_ptr.h" | 13 #include "base/scoped_ptr.h" |
| 15 #include "base/shared_memory.h" | 14 #include "base/shared_memory.h" |
| 16 #include "base/task.h" | 15 #include "base/task.h" |
| 17 #include "gpu/command_buffer/common/command_buffer.h" | 16 #include "gpu/command_buffer/common/command_buffer.h" |
| 18 #include "gpu/command_buffer/service/cmd_buffer_engine.h" | 17 #include "gpu/command_buffer/service/cmd_buffer_engine.h" |
| 19 #include "gpu/command_buffer/service/cmd_parser.h" | 18 #include "gpu/command_buffer/service/cmd_parser.h" |
| 20 #include "gpu/command_buffer/service/gles2_cmd_decoder.h" | 19 #include "gpu/command_buffer/service/gles2_cmd_decoder.h" |
| 21 #include "ui/gfx/native_widget_types.h" | 20 #include "ui/gfx/native_widget_types.h" |
| 22 #include "ui/gfx/size.h" | 21 #include "ui/gfx/size.h" |
| 22 #include "ui/gfx/surface/transport_dib.h" |
| 23 | 23 |
| 24 #if defined(OS_MACOSX) | 24 #if defined(OS_MACOSX) |
| 25 #include "app/surface/accelerated_surface_mac.h" | 25 #include "ui/gfx/surface/accelerated_surface_mac.h" |
| 26 #endif | 26 #endif |
| 27 | 27 |
| 28 namespace gfx { | 28 namespace gfx { |
| 29 class GLContext; | 29 class GLContext; |
| 30 } | 30 } |
| 31 | 31 |
| 32 namespace gpu { | 32 namespace gpu { |
| 33 namespace gles2 { | 33 namespace gles2 { |
| 34 class ContextGroup; | 34 class ContextGroup; |
| 35 } | 35 } |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 151 uint64 acknowledged_swap_buffers_count_; | 151 uint64 acknowledged_swap_buffers_count_; |
| 152 #endif | 152 #endif |
| 153 | 153 |
| 154 ScopedRunnableMethodFactory<GPUProcessor> method_factory_; | 154 ScopedRunnableMethodFactory<GPUProcessor> method_factory_; |
| 155 scoped_ptr<Callback0::Type> wrapped_swap_buffers_callback_; | 155 scoped_ptr<Callback0::Type> wrapped_swap_buffers_callback_; |
| 156 }; | 156 }; |
| 157 | 157 |
| 158 } // namespace gpu | 158 } // namespace gpu |
| 159 | 159 |
| 160 #endif // GPU_COMMAND_BUFFER_SERVICE_GPU_PROCESSOR_H_ | 160 #endif // GPU_COMMAND_BUFFER_SERVICE_GPU_PROCESSOR_H_ |
| OLD | NEW |