summaryrefslogtreecommitdiffstats
path: root/content/gpu/gpu_info_collector_android.cc
diff options
context:
space:
mode:
authorepenner@chromium.org <epenner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-19 20:57:09 +0000
committerepenner@chromium.org <epenner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-19 20:57:09 +0000
commit3480a07b35ce4b407a8924aad62dead625ffb725 (patch)
treea1d7e62b752fa07cf0db624ccb9c323b0e49040f /content/gpu/gpu_info_collector_android.cc
parent3da7ac8f632fba6459fa3d19da0767788125942e (diff)
downloadchromium_src-3480a07b35ce4b407a8924aad62dead625ffb725.zip
chromium_src-3480a07b35ce4b407a8924aad62dead625ffb725.tar.gz
chromium_src-3480a07b35ce4b407a8924aad62dead625ffb725.tar.bz2
Revert "gpu: Fix Vivante's "hisilicon" GPUs"
Revert "gpu: Fix uninitialized variable." Reverting these two CLs so they can be landed behind #ifdef's (for merge safety). BUG=179250 NOTRY=true No try since this is just a revert. Review URL: https://chromiumcodereview.appspot.com/14241009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195275 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/gpu/gpu_info_collector_android.cc')
-rw-r--r--content/gpu/gpu_info_collector_android.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/content/gpu/gpu_info_collector_android.cc b/content/gpu/gpu_info_collector_android.cc
index 902bc8c..3197414 100644
--- a/content/gpu/gpu_info_collector_android.cc
+++ b/content/gpu/gpu_info_collector_android.cc
@@ -74,7 +74,6 @@ bool CollectBasicGraphicsInfo(content::GPUInfo* gpu_info) {
bool is_arm = vendor.find("arm") != std::string::npos;
bool is_qualcomm = vendor.find("qualcomm") != std::string::npos;
bool is_mali_t604 = is_arm && renderer.find("mali-t604") != std::string::npos;
- bool is_hisilicon = vendor.find("hisilicon") != std::string::npos;
base::android::BuildInfo* build_info =
base::android::BuildInfo::GetInstance();
@@ -92,8 +91,7 @@ bool CollectBasicGraphicsInfo(content::GPUInfo* gpu_info) {
// IMG: avoid context switching perf problems, crashes with share groups
// Mali-T604: http://crbug.com/154715
// QualComm, NVIDIA: Crashes with share groups
- if (is_hisilicon || is_img || is_mali_t604 || is_nexus7
- || (is_qualcomm && sdk_int != 16)) {
+ if (is_img || is_mali_t604 || is_nexus7 || (is_qualcomm && sdk_int != 16)) {
CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kEnableVirtualGLContexts);
}