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 #include "content/common/gpu/client/command_buffer_proxy_impl.h" | 5 #include "content/common/gpu/client/command_buffer_proxy_impl.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
11 #include "base/logging.h" | 11 #include "base/logging.h" |
12 #include "base/memory/shared_memory.h" | 12 #include "base/memory/shared_memory.h" |
13 #include "base/stl_util.h" | 13 #include "base/stl_util.h" |
14 #include "base/thread_task_runner_handle.h" | 14 #include "base/thread_task_runner_handle.h" |
15 #include "base/trace_event/trace_event.h" | 15 #include "base/trace_event/trace_event.h" |
16 #include "content/common/gpu/client/gpu_channel_host.h" | 16 #include "content/common/gpu/client/gpu_channel_host.h" |
17 #include "content/common/gpu/gpu_messages.h" | 17 #include "content/common/gpu/gpu_messages.h" |
| 18 #include "content/common/gpu/gpu_param_traits.h" |
18 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h" | 19 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h" |
19 #include "gpu/command_buffer/common/cmd_buffer_common.h" | 20 #include "gpu/command_buffer/common/cmd_buffer_common.h" |
20 #include "gpu/command_buffer/common/command_buffer_id.h" | 21 #include "gpu/command_buffer/common/command_buffer_id.h" |
21 #include "gpu/command_buffer/common/command_buffer_shared.h" | 22 #include "gpu/command_buffer/common/command_buffer_shared.h" |
22 #include "gpu/command_buffer/common/gpu_memory_allocation.h" | 23 #include "gpu/command_buffer/common/gpu_memory_allocation.h" |
23 #include "gpu/command_buffer/common/sync_token.h" | 24 #include "gpu/command_buffer/common/sync_token.h" |
24 #include "gpu/command_buffer/service/image_factory.h" | 25 #include "gpu/command_buffer/service/image_factory.h" |
25 #include "ui/gfx/geometry/size.h" | 26 #include "ui/gfx/geometry/size.h" |
26 #include "ui/gl/gl_bindings.h" | 27 #include "ui/gl/gl_bindings.h" |
27 | 28 |
(...skipping 709 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
737 } | 738 } |
738 | 739 |
739 void CommandBufferProxyImpl::InvalidGpuReplyOnClientThread() { | 740 void CommandBufferProxyImpl::InvalidGpuReplyOnClientThread() { |
740 scoped_ptr<base::AutoLock> lock; | 741 scoped_ptr<base::AutoLock> lock; |
741 if (lock_) | 742 if (lock_) |
742 lock.reset(new base::AutoLock(*lock_)); | 743 lock.reset(new base::AutoLock(*lock_)); |
743 OnDestroyed(gpu::error::kInvalidGpuMessage, gpu::error::kLostContext); | 744 OnDestroyed(gpu::error::kInvalidGpuMessage, gpu::error::kLostContext); |
744 } | 745 } |
745 | 746 |
746 } // namespace content | 747 } // namespace content |
OLD | NEW |