| 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/gpu_channel_manager.h" | 5 #include "content/common/gpu/gpu_channel_manager.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| 11 #include "base/location.h" | 11 #include "base/location.h" |
| 12 #include "base/single_thread_task_runner.h" | 12 #include "base/single_thread_task_runner.h" |
| 13 #include "base/thread_task_runner_handle.h" | 13 #include "base/thread_task_runner_handle.h" |
| 14 #include "build/build_config.h" | 14 #include "build/build_config.h" |
| 15 #include "content/common/gpu/gpu_channel.h" | 15 #include "content/common/gpu/gpu_channel.h" |
| 16 #include "content/common/gpu/gpu_channel_manager_delegate.h" | 16 #include "content/common/gpu/gpu_channel_manager_delegate.h" |
| 17 #include "content/common/gpu/gpu_memory_buffer_factory.h" | 17 #include "content/common/gpu/gpu_memory_buffer_factory.h" |
| 18 #include "content/common/gpu/gpu_memory_manager.h" | 18 #include "content/common/gpu/gpu_memory_manager.h" |
| 19 #include "content/common/gpu/gpu_messages.h" | |
| 20 #include "gpu/command_buffer/common/sync_token.h" | 19 #include "gpu/command_buffer/common/sync_token.h" |
| 21 #include "gpu/command_buffer/common/value_state.h" | 20 #include "gpu/command_buffer/common/value_state.h" |
| 22 #include "gpu/command_buffer/service/feature_info.h" | 21 #include "gpu/command_buffer/service/feature_info.h" |
| 23 #include "gpu/command_buffer/service/mailbox_manager.h" | 22 #include "gpu/command_buffer/service/mailbox_manager.h" |
| 24 #include "gpu/command_buffer/service/memory_program_cache.h" | 23 #include "gpu/command_buffer/service/memory_program_cache.h" |
| 25 #include "gpu/command_buffer/service/shader_translator_cache.h" | 24 #include "gpu/command_buffer/service/shader_translator_cache.h" |
| 26 #include "gpu/command_buffer/service/sync_point_manager.h" | 25 #include "gpu/command_buffer/service/sync_point_manager.h" |
| 26 #include "gpu/ipc/common/gpu_messages.h" |
| 27 #include "ui/gl/gl_bindings.h" | 27 #include "ui/gl/gl_bindings.h" |
| 28 #include "ui/gl/gl_share_group.h" | 28 #include "ui/gl/gl_share_group.h" |
| 29 | 29 |
| 30 #if defined(OS_MACOSX) | 30 #if defined(OS_MACOSX) |
| 31 #include "content/common/gpu/buffer_presented_params_mac.h" | 31 #include "content/common/gpu/buffer_presented_params_mac.h" |
| 32 #endif | 32 #endif |
| 33 | 33 |
| 34 namespace content { | 34 namespace content { |
| 35 | 35 |
| 36 namespace { | 36 namespace { |
| (...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 302 } | 302 } |
| 303 } | 303 } |
| 304 if (!stub || !stub->decoder()->MakeCurrent()) | 304 if (!stub || !stub->decoder()->MakeCurrent()) |
| 305 return; | 305 return; |
| 306 glFinish(); | 306 glFinish(); |
| 307 DidAccessGpu(); | 307 DidAccessGpu(); |
| 308 } | 308 } |
| 309 #endif | 309 #endif |
| 310 | 310 |
| 311 } // namespace content | 311 } // namespace content |
| OLD | NEW |