Workaround for Intel 6xxx clear to 0/1 bug

services/ui/gpu/gpu_service.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "services/ui/gpu/gpu_service.h"
 
 #include "base/bind.h"
 #include "base/debug/crash_logging.h"
 #include "base/lazy_instance.h"
 #include "base/memory/shared_memory.h"
@@ skipping 266 matching lines @@
 #if defined(OS_WIN)
   if (!in_host_process_) {
     // The unsandboxed GPU process fulfilled its duty. Rest in peace.
     base::MessageLoop::current()->QuitWhenIdle();
   }
 #endif
 }
 
 #if defined(OS_MACOSX)
 void GpuService::UpdateGpuInfoPlatform() {
-  DCHECK(main_runner_->BelongsToCurrentThread());
-  // gpu::CollectContextGraphicsInfo() is already called during gpu process
-  // initialization (see GpuInit::InitializeAndStartSandbox()) on non-mac
-  // platforms, and during in-browser gpu thread initialization on all platforms
-  // (See InProcessGpuThread::Init()).
-  if (in_host_process_)
-    return;
+  if (gpu_info_.gpu.vendor_id == 0x10de) {  // NVIDIA

[Zhenyao Mo, 2017/06/13 19:01:24]

See my comment in the workaround file.  Let's not make changes in this file.

[jiajia.qin, 2017/06/14 08:18:21]

Acknowledged.

+    DCHECK(main_runner_->BelongsToCurrentThread());
+    // gpu::CollectContextGraphicsInfo() is already called during gpu process
+    // initialization (see GpuInit::InitializeAndStartSandbox()) on
+    // non-nvidia-mac platforms, and during in-browser gpu thread initialization
+    // on all platforms (See InProcessGpuThread::Init()).
+    if (in_host_process_)
+      return;
 
-  DCHECK_EQ(gpu::kCollectInfoNone, gpu_info_.context_info_state);
-  gpu::CollectInfoResult result = gpu::CollectContextGraphicsInfo(&gpu_info_);
-  switch (result) {
-    case gpu::kCollectInfoFatalFailure:
-      LOG(ERROR) << "gpu::CollectGraphicsInfo failed (fatal).";
-      // TODO(piman): can we signal overall failure?
-      break;
-    case gpu::kCollectInfoNonFatalFailure:
-      DVLOG(1) << "gpu::CollectGraphicsInfo failed (non-fatal).";
-      break;
-    case gpu::kCollectInfoNone:
-      NOTREACHED();
-      break;
-    case gpu::kCollectInfoSuccess:
-      break;
+    DCHECK_EQ(gpu::kCollectInfoNone, gpu_info_.context_info_state);
+    gpu::CollectInfoResult result = gpu::CollectContextGraphicsInfo(&gpu_info_);
+    switch (result) {
+      case gpu::kCollectInfoFatalFailure:
+        LOG(ERROR) << "gpu::CollectGraphicsInfo failed (fatal).";
+        // TODO(piman): can we signal overall failure?
+        break;
+      case gpu::kCollectInfoNonFatalFailure:
+        DVLOG(1) << "gpu::CollectGraphicsInfo failed (non-fatal).";
+        break;
+      case gpu::kCollectInfoNone:
+        NOTREACHED();
+        break;
+      case gpu::kCollectInfoSuccess:
+        break;
+    }
+    gpu::SetKeysForCrashLogging(gpu_info_);
   }
-  gpu::SetKeysForCrashLogging(gpu_info_);
 }
 #elif defined(OS_WIN)
 void GpuService::UpdateGpuInfoPlatform() {
   DCHECK(main_runner_->BelongsToCurrentThread());
   // GPU full info collection should only happen on un-sandboxed GPU process
   // or single process/in-process gpu mode on Windows.
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   DCHECK(command_line->HasSwitch("disable-gpu-sandbox") || in_host_process_);
 
   // This is slow, but it's the only thing the unsandboxed GPU process does,
@@ skipping 183 matching lines @@
 
 void GpuService::Stop(const StopCallback& callback) {
   DCHECK(io_runner_->BelongsToCurrentThread());
   main_runner_->PostTaskAndReply(FROM_HERE, base::Bind([] {
                                    base::MessageLoop::current()->QuitWhenIdle();
                                  }),
                                  callback);
 }
 
 }  // namespace ui