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" |
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
252 } | 252 } |
253 | 253 |
254 // No sync token or invalid sync token, destroy immediately. | 254 // No sync token or invalid sync token, destroy immediately. |
255 DestroyGpuMemoryBuffer(id, client_id); | 255 DestroyGpuMemoryBuffer(id, client_id); |
256 } | 256 } |
257 | 257 |
258 #if defined(OS_CHROMEOS) | 258 #if defined(OS_CHROMEOS) |
259 void GpuChannelManager::OnCreateArcVideoAcceleratorChannel() { | 259 void GpuChannelManager::OnCreateArcVideoAcceleratorChannel() { |
260 if (!gpu_arc_video_service_) { | 260 if (!gpu_arc_video_service_) { |
261 gpu_arc_video_service_.reset( | 261 gpu_arc_video_service_.reset( |
262 new GpuArcVideoService(shutdown_event_, io_task_runner_)); | 262 new arc::GpuArcVideoService(shutdown_event_, io_task_runner_)); |
263 } | 263 } |
264 | 264 |
265 gpu_arc_video_service_->CreateChannel( | 265 gpu_arc_video_service_->CreateChannel( |
266 base::Bind(&GpuChannelManager::ArcVideoAcceleratorChannelCreated, | 266 base::Bind(&GpuChannelManager::ArcVideoAcceleratorChannelCreated, |
267 weak_factory_.GetWeakPtr())); | 267 weak_factory_.GetWeakPtr())); |
268 } | 268 } |
269 | 269 |
270 void GpuChannelManager::ArcVideoAcceleratorChannelCreated( | 270 void GpuChannelManager::ArcVideoAcceleratorChannelCreated( |
271 const IPC::ChannelHandle& handle) { | 271 const IPC::ChannelHandle& handle) { |
272 Send(new GpuHostMsg_ArcVideoAcceleratorChannelCreated(handle)); | 272 Send(new GpuHostMsg_ArcVideoAcceleratorChannelCreated(handle)); |
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
371 } | 371 } |
372 } | 372 } |
373 if (!stub || !stub->decoder()->MakeCurrent()) | 373 if (!stub || !stub->decoder()->MakeCurrent()) |
374 return; | 374 return; |
375 glFinish(); | 375 glFinish(); |
376 DidAccessGpu(); | 376 DidAccessGpu(); |
377 } | 377 } |
378 #endif | 378 #endif |
379 | 379 |
380 } // namespace content | 380 } // namespace content |
OLD | NEW |