| 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 29 matching lines...) Expand all  Loading... | 
| 40 #include "gpu/config/gpu_info_collector.h" | 40 #include "gpu/config/gpu_info_collector.h" | 
| 41 #include "gpu/config/gpu_switches.h" | 41 #include "gpu/config/gpu_switches.h" | 
| 42 #include "gpu/config/gpu_util.h" | 42 #include "gpu/config/gpu_util.h" | 
| 43 #include "ui/events/platform/platform_event_source.h" | 43 #include "ui/events/platform/platform_event_source.h" | 
| 44 #include "ui/gl/gl_context.h" | 44 #include "ui/gl/gl_context.h" | 
| 45 #include "ui/gl/gl_implementation.h" | 45 #include "ui/gl/gl_implementation.h" | 
| 46 #include "ui/gl/gl_surface.h" | 46 #include "ui/gl/gl_surface.h" | 
| 47 #include "ui/gl/gl_switches.h" | 47 #include "ui/gl/gl_switches.h" | 
| 48 #include "ui/gl/gpu_switching_manager.h" | 48 #include "ui/gl/gpu_switching_manager.h" | 
| 49 | 49 | 
|  | 50 #if defined(OS_ANDROID) | 
|  | 51 #include "base/trace_event/memory_dump_manager.h" | 
|  | 52 #include "components/tracing/graphics_memory_dump_provider_android.h" | 
|  | 53 #endif | 
|  | 54 | 
| 50 #if defined(OS_WIN) | 55 #if defined(OS_WIN) | 
| 51 #include "base/win/windows_version.h" | 56 #include "base/win/windows_version.h" | 
| 52 #include "base/win/scoped_com_initializer.h" | 57 #include "base/win/scoped_com_initializer.h" | 
| 53 #include "sandbox/win/src/sandbox.h" | 58 #include "sandbox/win/src/sandbox.h" | 
| 54 #endif | 59 #endif | 
| 55 | 60 | 
| 56 #if defined(USE_X11) | 61 #if defined(USE_X11) | 
| 57 #include "ui/base/x/x11_util.h" | 62 #include "ui/base/x/x11_util.h" | 
| 58 #endif | 63 #endif | 
| 59 | 64 | 
| (...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 375   while (!deferred_messages.Get().empty()) | 380   while (!deferred_messages.Get().empty()) | 
| 376     deferred_messages.Get().pop(); | 381     deferred_messages.Get().pop(); | 
| 377 | 382 | 
| 378   child_thread->Init(start_time); | 383   child_thread->Init(start_time); | 
| 379 | 384 | 
| 380   gpu_process.set_main_thread(child_thread); | 385   gpu_process.set_main_thread(child_thread); | 
| 381 | 386 | 
| 382   if (watchdog_thread.get()) | 387   if (watchdog_thread.get()) | 
| 383     watchdog_thread->AddPowerObserver(); | 388     watchdog_thread->AddPowerObserver(); | 
| 384 | 389 | 
|  | 390 #if defined(OS_ANDROID) | 
|  | 391   base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider( | 
|  | 392       tracing::GraphicsMemoryDumpProvider::GetInstance()); | 
|  | 393 #endif | 
|  | 394 | 
| 385   { | 395   { | 
| 386     TRACE_EVENT0("gpu", "Run Message Loop"); | 396     TRACE_EVENT0("gpu", "Run Message Loop"); | 
| 387     main_message_loop.Run(); | 397     main_message_loop.Run(); | 
| 388   } | 398   } | 
| 389 | 399 | 
| 390   child_thread->StopWatchdog(); | 400   child_thread->StopWatchdog(); | 
| 391 | 401 | 
| 392   return 0; | 402   return 0; | 
| 393 } | 403 } | 
| 394 | 404 | 
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 548     return true; | 558     return true; | 
| 549   } | 559   } | 
| 550 | 560 | 
| 551   return false; | 561   return false; | 
| 552 } | 562 } | 
| 553 #endif  // defined(OS_WIN) | 563 #endif  // defined(OS_WIN) | 
| 554 | 564 | 
| 555 }  // namespace. | 565 }  // namespace. | 
| 556 | 566 | 
| 557 }  // namespace content | 567 }  // namespace content | 
| OLD | NEW | 
|---|