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

Side by Side Diff: content/gpu/gpu_main.cc

Issue 1984323005: Pass switches::kX11VisualID and use it from gl_surface_egl.cc::GetPlatformANGLEDisplay (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Just rebase Created 4 years, 7 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
« no previous file with comments | « content/browser/gpu/gpu_process_host.cc ('k') | ui/gfx/x/x11_switches.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <stddef.h> 5 #include <stddef.h>
6 #include <stdlib.h> 6 #include <stdlib.h>
7 7
8 #include <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 SetErrorMode( 147 SetErrorMode(
148 SEM_FAILCRITICALERRORS | 148 SEM_FAILCRITICALERRORS |
149 SEM_NOGPFAULTERRORBOX | 149 SEM_NOGPFAULTERRORBOX |
150 SEM_NOOPENFILEERRORBOX); 150 SEM_NOOPENFILEERRORBOX);
151 #elif defined(USE_X11) 151 #elif defined(USE_X11)
152 ui::SetDefaultX11ErrorHandlers(); 152 ui::SetDefaultX11ErrorHandlers();
153 153
154 #if !defined(OS_CHROMEOS) 154 #if !defined(OS_CHROMEOS)
155 DCHECK(base::CommandLine::ForCurrentProcess()->HasSwitch( 155 DCHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
156 switches::kWindowDepth)); 156 switches::kWindowDepth));
157 DCHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
158 switches::kX11VisualID));
157 #endif 159 #endif
158 160
159 #endif 161 #endif
160 162
161 logging::SetLogMessageHandler(GpuProcessLogMessageHandler); 163 logging::SetLogMessageHandler(GpuProcessLogMessageHandler);
162 164
163 if (command_line.HasSwitch(switches::kSupportsDualGpus)) { 165 if (command_line.HasSwitch(switches::kSupportsDualGpus)) {
164 std::string types = command_line.GetSwitchValueASCII( 166 std::string types = command_line.GetSwitchValueASCII(
165 switches::kGpuDriverBugWorkarounds); 167 switches::kGpuDriverBugWorkarounds);
166 std::set<int> workarounds; 168 std::set<int> workarounds;
(...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after
611 return true; 613 return true;
612 } 614 }
613 615
614 return false; 616 return false;
615 } 617 }
616 #endif // defined(OS_WIN) 618 #endif // defined(OS_WIN)
617 619
618 } // namespace. 620 } // namespace.
619 621
620 } // namespace content 622 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/gpu/gpu_process_host.cc ('k') | ui/gfx/x/x11_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698