OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 | 7 |
8 #include <deque> | 8 #include <deque> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 15 matching lines...) Expand all Loading... |
26 #include "ui/events/latency_info.h" | 26 #include "ui/events/latency_info.h" |
27 #include "ui/gfx/gpu_memory_buffer.h" | 27 #include "ui/gfx/gpu_memory_buffer.h" |
28 #include "ui/gfx/native_widget_types.h" | 28 #include "ui/gfx/native_widget_types.h" |
29 #include "ui/gfx/size.h" | 29 #include "ui/gfx/size.h" |
30 #include "ui/gl/gl_surface.h" | 30 #include "ui/gl/gl_surface.h" |
31 #include "ui/gl/gpu_preference.h" | 31 #include "ui/gl/gpu_preference.h" |
32 #include "url/gurl.h" | 32 #include "url/gurl.h" |
33 | 33 |
34 namespace gpu { | 34 namespace gpu { |
35 struct Mailbox; | 35 struct Mailbox; |
| 36 class ValueStateMap; |
36 namespace gles2 { | 37 namespace gles2 { |
37 class MailboxManager; | 38 class MailboxManager; |
38 } | 39 } |
39 } | 40 } |
40 | 41 |
41 namespace content { | 42 namespace content { |
42 | 43 |
43 class GpuChannel; | 44 class GpuChannel; |
44 class GpuVideoDecodeAccelerator; | 45 class GpuVideoDecodeAccelerator; |
45 class GpuVideoEncodeAccelerator; | 46 class GpuVideoEncodeAccelerator; |
(...skipping 16 matching lines...) Expand all Loading... |
62 }; | 63 }; |
63 | 64 |
64 typedef base::Callback<void(const std::vector<ui::LatencyInfo>&)> | 65 typedef base::Callback<void(const std::vector<ui::LatencyInfo>&)> |
65 LatencyInfoCallback; | 66 LatencyInfoCallback; |
66 | 67 |
67 GpuCommandBufferStub( | 68 GpuCommandBufferStub( |
68 GpuChannel* channel, | 69 GpuChannel* channel, |
69 GpuCommandBufferStub* share_group, | 70 GpuCommandBufferStub* share_group, |
70 const gfx::GLSurfaceHandle& handle, | 71 const gfx::GLSurfaceHandle& handle, |
71 gpu::gles2::MailboxManager* mailbox_manager, | 72 gpu::gles2::MailboxManager* mailbox_manager, |
| 73 gpu::ValueStateMap* pending_valuebuffer_state, |
72 const gfx::Size& size, | 74 const gfx::Size& size, |
73 const gpu::gles2::DisallowedFeatures& disallowed_features, | 75 const gpu::gles2::DisallowedFeatures& disallowed_features, |
74 const std::vector<int32>& attribs, | 76 const std::vector<int32>& attribs, |
75 gfx::GpuPreference gpu_preference, | 77 gfx::GpuPreference gpu_preference, |
76 bool use_virtualized_gl_context, | 78 bool use_virtualized_gl_context, |
77 int32 route_id, | 79 int32 route_id, |
78 int32 surface_id, | 80 int32 surface_id, |
79 GpuWatchdog* watchdog, | 81 GpuWatchdog* watchdog, |
80 bool software, | 82 bool software, |
81 const GURL& active_url); | 83 const GURL& active_url); |
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
277 size_t total_gpu_memory_; | 279 size_t total_gpu_memory_; |
278 scoped_ptr<WaitForCommandState> wait_for_token_; | 280 scoped_ptr<WaitForCommandState> wait_for_token_; |
279 scoped_ptr<WaitForCommandState> wait_for_get_offset_; | 281 scoped_ptr<WaitForCommandState> wait_for_get_offset_; |
280 | 282 |
281 DISALLOW_COPY_AND_ASSIGN(GpuCommandBufferStub); | 283 DISALLOW_COPY_AND_ASSIGN(GpuCommandBufferStub); |
282 }; | 284 }; |
283 | 285 |
284 } // namespace content | 286 } // namespace content |
285 | 287 |
286 #endif // CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_ | 288 #endif // CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_ |
OLD | NEW |