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/browser/gpu/gpu_process_host.h" | 5 #include "content/browser/gpu/gpu_process_host.h" |
6 | 6 |
7 #include "base/base_switches.h" | 7 #include "base/base_switches.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/bind_helpers.h" | 9 #include "base/bind_helpers.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 959 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
970 if (kind_ == GPU_PROCESS_KIND_UNSANDBOXED) | 970 if (kind_ == GPU_PROCESS_KIND_UNSANDBOXED) |
971 cmd_line->AppendSwitch(switches::kDisableGpuSandbox); | 971 cmd_line->AppendSwitch(switches::kDisableGpuSandbox); |
972 | 972 |
973 // Propagate relevant command line switches. | 973 // Propagate relevant command line switches. |
974 static const char* const kSwitchNames[] = { | 974 static const char* const kSwitchNames[] = { |
975 switches::kCrashOnGpuHang, | 975 switches::kCrashOnGpuHang, |
976 switches::kDisableAcceleratedVideoDecode, | 976 switches::kDisableAcceleratedVideoDecode, |
977 switches::kDisableBreakpad, | 977 switches::kDisableBreakpad, |
978 switches::kDisableGLMultisampling, | 978 switches::kDisableGLMultisampling, |
979 switches::kDisableGpuSandbox, | 979 switches::kDisableGpuSandbox, |
980 switches::kDisableGpuVsync, | |
981 switches::kDisableGpuWatchdog, | 980 switches::kDisableGpuWatchdog, |
982 switches::kDisableImageTransportSurface, | 981 switches::kDisableImageTransportSurface, |
983 switches::kDisableLogging, | 982 switches::kDisableLogging, |
984 switches::kDisableSeccompFilterSandbox, | 983 switches::kDisableSeccompFilterSandbox, |
985 switches::kEnableGpuSandbox, | 984 switches::kEnableGpuSandbox, |
986 switches::kEnableGPUServiceLogging, | |
987 switches::kEnableLogging, | 985 switches::kEnableLogging, |
988 switches::kEnableVirtualGLContexts, | 986 switches::kEnableVirtualGLContexts, |
989 switches::kGpuNoContextLost, | |
990 switches::kGpuStartupDialog, | 987 switches::kGpuStartupDialog, |
991 switches::kGpuSwitching, | |
992 switches::kLoggingLevel, | 988 switches::kLoggingLevel, |
993 switches::kNoSandbox, | 989 switches::kNoSandbox, |
994 switches::kReduceGpuSandbox, | 990 switches::kReduceGpuSandbox, |
995 switches::kTestGLLib, | 991 switches::kTestGLLib, |
996 switches::kTraceStartup, | 992 switches::kTraceStartup, |
997 switches::kV, | 993 switches::kV, |
998 switches::kVModule, | 994 switches::kVModule, |
999 #if defined(OS_MACOSX) | 995 #if defined(OS_MACOSX) |
1000 switches::kEnableSandboxLogging, | 996 switches::kEnableSandboxLogging, |
1001 #endif | 997 #endif |
1002 #if defined(USE_AURA) | 998 #if defined(USE_AURA) |
1003 switches::kUIPrioritizeInGpuProcess, | 999 switches::kUIPrioritizeInGpuProcess, |
1004 #endif | 1000 #endif |
1005 switches::kUseExynosVda, | 1001 switches::kUseExynosVda, |
1006 }; | 1002 }; |
1007 cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames, | 1003 cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames, |
1008 arraysize(kSwitchNames)); | 1004 arraysize(kSwitchNames)); |
1009 cmd_line->CopySwitchesFrom( | 1005 cmd_line->CopySwitchesFrom( |
1010 browser_command_line, switches::kGpuSwitches, switches::kNumGpuSwitches); | 1006 browser_command_line, switches::kGpuSwitches, switches::kNumGpuSwitches); |
| 1007 cmd_line->CopySwitchesFrom( |
| 1008 browser_command_line, switches::kGLSwitchesCopiedFromGpuProcessHost, |
| 1009 switches::kGLSwitchesCopiedFromGpuProcessHostNumSwitches); |
1011 | 1010 |
1012 GetContentClient()->browser()->AppendExtraCommandLineSwitches( | 1011 GetContentClient()->browser()->AppendExtraCommandLineSwitches( |
1013 cmd_line, process_->GetData().id); | 1012 cmd_line, process_->GetData().id); |
1014 | 1013 |
1015 GpuDataManagerImpl::GetInstance()->AppendGpuCommandLine(cmd_line); | 1014 GpuDataManagerImpl::GetInstance()->AppendGpuCommandLine(cmd_line); |
1016 | 1015 |
1017 if (cmd_line->HasSwitch(switches::kUseGL)) { | 1016 if (cmd_line->HasSwitch(switches::kUseGL)) { |
1018 software_rendering_ = | 1017 software_rendering_ = |
1019 (cmd_line->GetSwitchValueASCII(switches::kUseGL) == "swiftshader"); | 1018 (cmd_line->GetSwitchValueASCII(switches::kUseGL) == "swiftshader"); |
1020 } | 1019 } |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1059 void GpuProcessHost::BlockLiveOffscreenContexts() { | 1058 void GpuProcessHost::BlockLiveOffscreenContexts() { |
1060 for (std::multiset<GURL>::iterator iter = | 1059 for (std::multiset<GURL>::iterator iter = |
1061 urls_with_live_offscreen_contexts_.begin(); | 1060 urls_with_live_offscreen_contexts_.begin(); |
1062 iter != urls_with_live_offscreen_contexts_.end(); ++iter) { | 1061 iter != urls_with_live_offscreen_contexts_.end(); ++iter) { |
1063 GpuDataManagerImpl::GetInstance()->BlockDomainFrom3DAPIs( | 1062 GpuDataManagerImpl::GetInstance()->BlockDomainFrom3DAPIs( |
1064 *iter, GpuDataManagerImpl::DOMAIN_GUILT_UNKNOWN); | 1063 *iter, GpuDataManagerImpl::DOMAIN_GUILT_UNKNOWN); |
1065 } | 1064 } |
1066 } | 1065 } |
1067 | 1066 |
1068 } // namespace content | 1067 } // namespace content |
OLD | NEW |