Updated OSX to blacklist multisampling when multiple monitors are connected

content/browser/gpu/gpu_data_manager_impl.cc

 // Copyright (c) 2012 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 "content/browser/gpu/gpu_data_manager_impl.h"
 
 #if defined(OS_MACOSX)
 #include <ApplicationServices/ApplicationServices.h>
 #endif  // OS_MACOSX
 
@@ skipping 60 matching lines @@
       rt += ",";
     rt += base::IntToString(*it);
   }
   return rt;
 }
 
 #if defined(OS_MACOSX)
 void DisplayReconfigCallback(CGDirectDisplayID display,
                              CGDisplayChangeSummaryFlags flags,
                              void* gpu_data_manager) {
-  if (flags & kCGDisplayAddFlag) {
-    GpuDataManagerImpl* manager =
-        reinterpret_cast<GpuDataManagerImpl*>(gpu_data_manager);
-    DCHECK(manager);
+  if(flags == kCGDisplayBeginConfigurationFlag)
+    return; // This call contains no information about the display change

[Ken Russell (switch to Gerrit), 2013/05/08 23:53:24]

End with ".".

+
+  GpuDataManagerImpl* manager =
+      reinterpret_cast<GpuDataManagerImpl*>(gpu_data_manager);
+  DCHECK(manager);
+
+  uint32_t displayCount;
+  CGGetActiveDisplayList(0, NULL, &displayCount);
+
+  bool fireGpuSwitch = flags & kCGDisplayAddFlag;
+
+  if (displayCount != manager->GetDisplayCount()) {
+    manager->SetDisplayCount(displayCount);
+    fireGpuSwitch = true;
+  }
+
+  if (fireGpuSwitch)
     manager->HandleGpuSwitch();
-  }
 }
 #endif  // OS_MACOSX
 
 // Block all domains' use of 3D APIs for this many milliseconds if
 // approaching a threshold where system stability might be compromised.
 const int64 kBlockAllDomainsMs = 10000;
 const int kNumResetsWithinDuration = 1;
 
 // Enums for UMA histograms.
 enum BlockStatusHistogram {
@@ skipping 50 matching lines @@
 void GpuDataManagerImpl::RemoveGpuSwitchCallback(
     const GpuSwitchCallback& callback) {
   for (size_t i = 0; i < gpu_switch_callbacks_.size(); i++) {
     if (gpu_switch_callbacks_[i].Equals(callback)) {
       gpu_switch_callbacks_.erase(gpu_switch_callbacks_.begin() + i);
       return;
     }
   }
 }
 
+void GpuDataManagerImpl::SetDisplayCount(unsigned int display_count) {
+  display_count_ = display_count;
+}
+
+unsigned int GpuDataManagerImpl::GetDisplayCount() const {
+  return display_count_;
+}
+
 GPUInfo GpuDataManagerImpl::GetGPUInfo() const {
   GPUInfo gpu_info;
   {
     base::AutoLock auto_lock(gpu_info_lock_);
     gpu_info = gpu_info_;
   }
   return gpu_info;
 }
 
 void GpuDataManagerImpl::GetGpuProcessHandles(
@@ skipping 404 matching lines @@
   if (IsFeatureBlacklisted(GPU_FEATURE_TYPE_FLASH3D))
     prefs->flash_3d_enabled = false;
   if (IsFeatureBlacklisted(GPU_FEATURE_TYPE_FLASH_STAGE3D)) {
     prefs->flash_stage3d_enabled = false;
     prefs->flash_stage3d_baseline_enabled = false;
   }
   if (IsFeatureBlacklisted(GPU_FEATURE_TYPE_FLASH_STAGE3D_BASELINE))
     prefs->flash_stage3d_baseline_enabled = false;
   if (IsFeatureBlacklisted(GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS))
     prefs->accelerated_2d_canvas_enabled = false;
-  if (IsFeatureBlacklisted(GPU_FEATURE_TYPE_MULTISAMPLING))
+  if (IsFeatureBlacklisted(GPU_FEATURE_TYPE_MULTISAMPLING)
+      || display_count_ > 1)
     prefs->gl_multisampling_enabled = false;
   if (IsFeatureBlacklisted(GPU_FEATURE_TYPE_3D_CSS)) {
     prefs->accelerated_compositing_for_3d_transforms_enabled = false;
     prefs->accelerated_compositing_for_animation_enabled = false;
   }
   if (IsFeatureBlacklisted(GPU_FEATURE_TYPE_ACCELERATED_VIDEO))
     prefs->accelerated_compositing_for_video_enabled = false;
 
   // Accelerated video and animation are slower than regular when using
   // SwiftShader. 3D CSS may also be too slow to be worthwhile.
@@ skipping 116 matching lines @@
 }
 
 GpuDataManagerImpl::GpuDataManagerImpl()
     : complete_gpu_info_already_requested_(false),
       gpu_switching_(GPU_SWITCHING_OPTION_AUTOMATIC),
       observer_list_(new GpuDataManagerObserverList),
       use_swiftshader_(false),
       card_blacklisted_(false),
       update_histograms_(true),
       window_count_(0),
-      domain_blocking_enabled_(true) {
+      domain_blocking_enabled_(true),
+      display_count_(0) {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kDisableAcceleratedCompositing)) {
     command_line->AppendSwitch(switches::kDisableAccelerated2dCanvas);
     command_line->AppendSwitch(switches::kDisableAcceleratedLayers);
   }
   if (command_line->HasSwitch(switches::kDisableGpu))
     DisableHardwareAcceleration();
   if (command_line->HasSwitch(switches::kGpuSwitching)) {
     std::string option_string = command_line->GetSwitchValueASCII(
         switches::kGpuSwitching);
     GpuSwitchingOption option = StringToGpuSwitchingOption(option_string);
     if (option != GPU_SWITCHING_OPTION_UNKNOWN)
       gpu_switching_ = option;
   }
 
 #if defined(OS_MACOSX)
+  CGGetActiveDisplayList (0, NULL, &display_count_);
   CGDisplayRegisterReconfigurationCallback(DisplayReconfigCallback, this);
 #endif  // OS_MACOSX
 }
 
 GpuDataManagerImpl::~GpuDataManagerImpl() {
 #if defined(OS_MACOSX)
   CGDisplayRemoveReconfigurationCallback(DisplayReconfigCallback, this);
 #endif
 }
 
@@ skipping 187 matching lines @@
 
 void GpuDataManagerImpl::Notify3DAPIBlocked(const GURL& url,
                                             int render_process_id,
                                             int render_view_id,
                                             ThreeDAPIType requester) {
   observer_list_->Notify(&GpuDataManagerObserver::DidBlock3DAPIs,
                          url, render_process_id, render_view_id, requester);
 }
 
 }  // namespace content