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

Unified Diff: chrome/browser/component_updater/swiftshader_component_installer.cc

Issue 2337243003: Fix ENABLE_SWIFTSHADER flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: disable by default Created 4 years, 3 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 | « chrome/browser/about_flags.cc ('k') | ui/gl/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/component_updater/swiftshader_component_installer.cc
diff --git a/chrome/browser/component_updater/swiftshader_component_installer.cc b/chrome/browser/component_updater/swiftshader_component_installer.cc
index e96c19f6aea3f4c8b1fef8352613ed4222f89a73..411c8db491b82796258a4058a6e751c31c00690d 100644
--- a/chrome/browser/component_updater/swiftshader_component_installer.cc
+++ b/chrome/browser/component_updater/swiftshader_component_installer.cc
@@ -25,6 +25,7 @@
#include "content/public/browser/gpu_data_manager.h"
#include "content/public/browser/gpu_data_manager_observer.h"
#include "gpu/config/gpu_feature_type.h"
+#include "ui/gl/gl_features.h"
using content::BrowserThread;
using content::GpuDataManager;
@@ -218,7 +219,7 @@ void UpdateChecker::OnGpuInfoUpdate() {
}
}
-#if defined(ENABLE_SWIFTSHADER)
+#if BUILDFLAG(ENABLE_SWIFTSHADER)
// Check if there already is a version of swiftshader installed,
// and if so register it.
@@ -258,7 +259,7 @@ void RegisterSwiftShaderPath(ComponentUpdateService* cus) {
} // namespace
void RegisterSwiftShaderComponent(ComponentUpdateService* cus) {
-#if defined(ENABLE_SWIFTSHADER) && defined(ARCH_CPU_X86)
+#if BUILDFLAG(ENABLE_SWIFTSHADER) && defined(ARCH_CPU_X86)
BrowserThread::PostTask(BrowserThread::FILE,
FROM_HERE,
base::Bind(&RegisterSwiftShaderPath, cus));
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | ui/gl/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698