| 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 <stdlib.h> | 5 #include <stdlib.h> |
| 6 | 6 |
| 7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
| 8 #include <dwmapi.h> | 8 #include <dwmapi.h> |
| 9 #include <windows.h> | 9 #include <windows.h> |
| 10 #endif | 10 #endif |
| (...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 354 gpu_info.video_encode_accelerator_supported_profiles = | 354 gpu_info.video_encode_accelerator_supported_profiles = |
| 355 content::GpuVideoEncodeAccelerator::GetSupportedProfiles(); | 355 content::GpuVideoEncodeAccelerator::GetSupportedProfiles(); |
| 356 gpu_info.jpeg_decode_accelerator_supported = | 356 gpu_info.jpeg_decode_accelerator_supported = |
| 357 content::GpuJpegDecodeAccelerator::IsSupported(); | 357 content::GpuJpegDecodeAccelerator::IsSupported(); |
| 358 } else { | 358 } else { |
| 359 dead_on_arrival = true; | 359 dead_on_arrival = true; |
| 360 } | 360 } |
| 361 | 361 |
| 362 logging::SetLogMessageHandler(NULL); | 362 logging::SetLogMessageHandler(NULL); |
| 363 | 363 |
| 364 scoped_ptr<GpuMemoryBufferFactory> gpu_memory_buffer_factory = | 364 scoped_ptr<GpuMemoryBufferFactory> gpu_memory_buffer_factory; |
| 365 GpuMemoryBufferFactory::Create( | 365 if (GpuMemoryBufferFactory::GetNativeType() != gfx::EMPTY_BUFFER) |
| 366 GpuChildThread::GetGpuMemoryBufferFactoryType()); | 366 gpu_memory_buffer_factory = GpuMemoryBufferFactory::CreateNativeType(); |
| 367 |
| 367 gpu::SyncPointManager sync_point_manager(false); | 368 gpu::SyncPointManager sync_point_manager(false); |
| 368 | 369 |
| 369 GpuProcess gpu_process; | 370 GpuProcess gpu_process; |
| 370 | 371 |
| 371 GpuChildThread* child_thread = new GpuChildThread( | 372 GpuChildThread* child_thread = new GpuChildThread( |
| 372 watchdog_thread.get(), dead_on_arrival, gpu_info, deferred_messages.Get(), | 373 watchdog_thread.get(), dead_on_arrival, gpu_info, deferred_messages.Get(), |
| 373 gpu_memory_buffer_factory.get(), | 374 gpu_memory_buffer_factory.get(), |
| 374 &sync_point_manager); | 375 &sync_point_manager); |
| 375 while (!deferred_messages.Get().empty()) | 376 while (!deferred_messages.Get().empty()) |
| 376 deferred_messages.Get().pop(); | 377 deferred_messages.Get().pop(); |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 548 return true; | 549 return true; |
| 549 } | 550 } |
| 550 | 551 |
| 551 return false; | 552 return false; |
| 552 } | 553 } |
| 553 #endif // defined(OS_WIN) | 554 #endif // defined(OS_WIN) |
| 554 | 555 |
| 555 } // namespace. | 556 } // namespace. |
| 556 | 557 |
| 557 } // namespace content | 558 } // namespace content |
| OLD | NEW |