Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(532)

Side by Side Diff: content/browser/gpu/gpu_process_host.cc

Issue 2365273004: Initial implementation for sharing field trial state (win) (Closed)
Patch Set: Remove windows macro causing compilation issue Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <list> 10 #include <list>
(...skipping 955 matching lines...) Expand 10 before | Expand all | Expand 10 after
966 #else 966 #else
967 int child_flags = ChildProcessHost::CHILD_NORMAL; 967 int child_flags = ChildProcessHost::CHILD_NORMAL;
968 #endif 968 #endif
969 969
970 base::FilePath exe_path = ChildProcessHost::GetChildPath(child_flags); 970 base::FilePath exe_path = ChildProcessHost::GetChildPath(child_flags);
971 if (exe_path.empty()) 971 if (exe_path.empty())
972 return false; 972 return false;
973 973
974 base::CommandLine* cmd_line = new base::CommandLine(exe_path); 974 base::CommandLine* cmd_line = new base::CommandLine(exe_path);
975 #endif 975 #endif
976
976 cmd_line->AppendSwitchASCII(switches::kProcessType, switches::kGpuProcess); 977 cmd_line->AppendSwitchASCII(switches::kProcessType, switches::kGpuProcess);
978
979 #if defined(OS_WIN)
980 field_trial_state_.reset(new base::SharedMemory());
981 BrowserChildProcessHostImpl::CopyFeatureAndFieldTrialFlags(
982 cmd_line, field_trial_state_.get());
983 #else
977 BrowserChildProcessHostImpl::CopyFeatureAndFieldTrialFlags(cmd_line); 984 BrowserChildProcessHostImpl::CopyFeatureAndFieldTrialFlags(cmd_line);
985 #endif
978 986
979 #if defined(OS_WIN) 987 #if defined(OS_WIN)
980 cmd_line->AppendArg(switches::kPrefetchArgumentGpu); 988 cmd_line->AppendArg(switches::kPrefetchArgumentGpu);
981 #endif // defined(OS_WIN) 989 #endif // defined(OS_WIN)
982 990
983 if (kind_ == GPU_PROCESS_KIND_UNSANDBOXED) 991 if (kind_ == GPU_PROCESS_KIND_UNSANDBOXED)
984 cmd_line->AppendSwitch(switches::kDisableGpuSandbox); 992 cmd_line->AppendSwitch(switches::kDisableGpuSandbox);
985 993
986 // TODO(penghuang): Replace all GPU related switches with GpuPreferences. 994 // TODO(penghuang): Replace all GPU related switches with GpuPreferences.
987 // https://crbug.com/590825 995 // https://crbug.com/590825
(...skipping 25 matching lines...) Expand all
1013 UMA_HISTOGRAM_BOOLEAN("GPU.GPUProcessSoftwareRendering", 1021 UMA_HISTOGRAM_BOOLEAN("GPU.GPUProcessSoftwareRendering",
1014 swiftshader_rendering_); 1022 swiftshader_rendering_);
1015 1023
1016 // If specified, prepend a launcher program to the command line. 1024 // If specified, prepend a launcher program to the command line.
1017 if (!gpu_launcher.empty()) 1025 if (!gpu_launcher.empty())
1018 cmd_line->PrependWrapper(gpu_launcher); 1026 cmd_line->PrependWrapper(gpu_launcher);
1019 1027
1020 process_->Launch( 1028 process_->Launch(
1021 new GpuSandboxedProcessLauncherDelegate(cmd_line, 1029 new GpuSandboxedProcessLauncherDelegate(cmd_line,
1022 process_->GetHost()), 1030 process_->GetHost()),
1031 field_trial_state_.get(),
1023 cmd_line, 1032 cmd_line,
1024 true); 1033 true);
1025 process_launched_ = true; 1034 process_launched_ = true;
1026 1035
1027 UMA_HISTOGRAM_ENUMERATION("GPU.GPUProcessLifetimeEvents", 1036 UMA_HISTOGRAM_ENUMERATION("GPU.GPUProcessLifetimeEvents",
1028 LAUNCHED, GPU_PROCESS_LIFETIME_EVENT_MAX); 1037 LAUNCHED, GPU_PROCESS_LIFETIME_EVENT_MAX);
1029 return true; 1038 return true;
1030 } 1039 }
1031 1040
1032 void GpuProcessHost::SendOutstandingReplies() { 1041 void GpuProcessHost::SendOutstandingReplies() {
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
1167 TRACE_EVENT0("gpu", "GpuProcessHost::OnCacheShader"); 1176 TRACE_EVENT0("gpu", "GpuProcessHost::OnCacheShader");
1168 ClientIdToShaderCacheMap::iterator iter = 1177 ClientIdToShaderCacheMap::iterator iter =
1169 client_id_to_shader_cache_.find(client_id); 1178 client_id_to_shader_cache_.find(client_id);
1170 // If the cache doesn't exist then this is an off the record profile. 1179 // If the cache doesn't exist then this is an off the record profile.
1171 if (iter == client_id_to_shader_cache_.end()) 1180 if (iter == client_id_to_shader_cache_.end())
1172 return; 1181 return;
1173 iter->second->Cache(GetShaderPrefixKey() + ":" + key, shader); 1182 iter->second->Cache(GetShaderPrefixKey() + ":" + key, shader);
1174 } 1183 }
1175 1184
1176 } // namespace content 1185 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698