| OLD | NEW |
| 1 // Copyright (c) 2011 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 CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_ | 5 #ifndef CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_ |
| 6 #define CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_ | 6 #define CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #if defined(ENABLE_GPU) | 9 #if defined(ENABLE_GPU) |
| 10 | 10 |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 | 133 |
| 134 // The following two fields are used on Mac OS X to identify the window | 134 // The following two fields are used on Mac OS X to identify the window |
| 135 // for the rendering results on the browser side. | 135 // for the rendering results on the browser side. |
| 136 int32 renderer_id_; | 136 int32 renderer_id_; |
| 137 int32 render_view_id_; | 137 int32 render_view_id_; |
| 138 | 138 |
| 139 scoped_ptr<gpu::CommandBufferService> command_buffer_; | 139 scoped_ptr<gpu::CommandBufferService> command_buffer_; |
| 140 scoped_ptr<gpu::GpuScheduler> scheduler_; | 140 scoped_ptr<gpu::GpuScheduler> scheduler_; |
| 141 std::queue<IPC::Message*> deferred_messages_; | 141 std::queue<IPC::Message*> deferred_messages_; |
| 142 | 142 |
| 143 // SetParent may be called before Initialize, in which case we need to keep |
| 144 // around the parent stub, so that Initialize can set the parent correctly. |
| 145 base::WeakPtr<GpuCommandBufferStub> parent_stub_for_initialization_; |
| 146 uint32 parent_texture_for_initialization_; |
| 147 |
| 143 GpuWatchdog* watchdog_; | 148 GpuWatchdog* watchdog_; |
| 144 ScopedRunnableMethodFactory<GpuCommandBufferStub> task_factory_; | 149 ScopedRunnableMethodFactory<GpuCommandBufferStub> task_factory_; |
| 145 | 150 |
| 146 DISALLOW_COPY_AND_ASSIGN(GpuCommandBufferStub); | 151 DISALLOW_COPY_AND_ASSIGN(GpuCommandBufferStub); |
| 147 }; | 152 }; |
| 148 | 153 |
| 149 #endif // defined(ENABLE_GPU) | 154 #endif // defined(ENABLE_GPU) |
| 150 | 155 |
| 151 #endif // CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_ | 156 #endif // CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_ |
| OLD | NEW |