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
+
+  GpuDataManagerImpl* manager =
+      reinterpret_cast<GpuDataManagerImpl*>(gpu_data_manager);
+  DCHECK(manager);
+
+  uint32_t displayCount;
+  CGGetActiveDisplayList(0, NULL, &displayCount);
+
+  bool fireGpuSwitch = flags & kCGDisplayAddFlag;
+
+  if (displayCount != manager->display_count_) {
+    manager->display_count_ = 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 26 matching lines @@
 
 bool GpuDataManagerImpl::IsFeatureBlacklisted(int feature) const {
   if (use_swiftshader_) {
     // Skia's software rendering is probably more efficient than going through
     // software emulation of the GPU, so use that.
     if (feature == GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS)
       return true;
     return false;
   }
 
+#if defined(OS_MACOSX)
+  // Many Mac laptops have buggy behavior when rendering to fullscreen
+  // multisampled buffers on an external monitor.
+  if(display_count_ > 1 && feature == GPU_FEATURE_TYPE_MULTISAMPLING) {
+      return true;

[Ken Russell (switch to Gerrit), 2013/05/06 21:59:04]

I thought per our earlier discussion that this was going to be handled
differently -- that instead of blacklisting and unblacklisting the feature, that
GpuDataManagerImpl::UpdateRendererWebPrefs was going to be modified. That way
the change in src/gpu/command_buffer/service/feature_info.cc wouldn't be
necessary; that one is concerning.

+  }
+#endif
+
   return (blacklisted_features_.count(feature) == 1);
 }
 
 size_t GpuDataManagerImpl::GetBlacklistedFeatureCount() const {
   if (use_swiftshader_)
     return 1;
   return blacklisted_features_.size();
 }
 
 void GpuDataManagerImpl::AddGpuSwitchCallback(
@@ skipping 562 matching lines @@
     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