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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/gpu_process_host.cc

Issue 6551023: Merge r75130:... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/648/src/
Patch Set: Created 9 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/resources/gpu_blacklist.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/gpu_process_host.cc
===================================================================
--- chrome/browser/gpu_process_host.cc (revision 75643)
+++ chrome/browser/gpu_process_host.cc (working copy)
@@ -5,6 +5,7 @@
#include "chrome/browser/gpu_process_host.h"
#include "app/app_switches.h"
+#include "app/gfx/gl/gl_implementation.h"
#include "base/command_line.h"
#include "base/metrics/histogram.h"
#include "base/string_piece.h"
@@ -403,6 +404,8 @@
GpuBlacklist* blacklist = new GpuBlacklist();
const CommandLine& browser_command_line = *CommandLine::ForCurrentProcess();
if (browser_command_line.HasSwitch(switches::kIgnoreGpuBlacklist) ||
+ browser_command_line.GetSwitchValueASCII(
+ switches::kUseGL) == gfx::kGLImplementationOSMesaName ||
blacklist->LoadGpuBlacklist(gpu_blacklist_json.as_string(), true)) {
gpu_blacklist_.reset(blacklist);
return true;
« no previous file with comments | « no previous file | chrome/browser/resources/gpu_blacklist.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698