Enable the Core Animation NPAPI drawing mode on 10.6 (except for QuickTime)

webkit/glue/plugins/plugin_host.cc

 // Copyright (c) 2009 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 "webkit/glue/plugins/plugin_host.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/string_piece.h"
@@ skipping 27 matching lines @@
   }
   return reinterpret_cast<NPAPI::PluginInstance*>(id->ndata);
 }
 
 #if defined(OS_MACOSX)
 // Returns true if the OS supports shared accelerated surfaces via IOSurface.
 // This is true on Snow Leopard and higher.
 static bool SupportsSharingAcceleratedSurfaces() {
   int32 major, minor, bugfix;
   base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &bugfix);
-#if PINK_USE_COREANIMATION
-  // TODO(pinkerton): enable this, http://crbug.com/32012
   return major > 10 || (major == 10 && minor > 5);
-#else
-  return false;
-#endif
 }
 #endif
 
 namespace NPAPI {
 
 scoped_refptr<PluginHost> PluginHost::singleton_;
 
 PluginHost::PluginHost() {
   InitializeHostFuncs();
 }
@@ skipping 728 matching lines @@
     case NPNVsupportsCocoaBool: {
       // we do support these drawing and event models.
       NPBool* supports_model = reinterpret_cast<NPBool*>(value);
       *supports_model = TRUE;
       rv = NPERR_NO_ERROR;
       break;
     }
     case NPNVsupportsCoreAnimationBool: {
       // We only support the Core Animation model on 10.6 and higher
       NPBool* supports_model = reinterpret_cast<NPBool*>(value);
-      *supports_model = SupportsSharingAcceleratedSurfaces() ? TRUE : FALSE;
+      // Our Core Animation support currently doesn't handle QuickTime correctly
+      // (see <http://crbug.com/38336>), so for now we don't allow QuickTime to
+      // negotiate that model.
+      scoped_refptr<NPAPI::PluginInstance> plugin = FindInstance(id);
+      if (plugin &&
+          plugin->plugin_lib()->plugin_info().name.find(L"QuickTime") !=
+          std::wstring::npos)
+        *supports_model = FALSE;
+      else
+        *supports_model = SupportsSharingAcceleratedSurfaces() ? TRUE : FALSE;
       rv = NPERR_NO_ERROR;
       break;
     }
     case NPNVsupportsOpenGLBool: {
       // This drawing model was never widely supported, and we don't plan to
       // support it.
       NPBool* supports_model = reinterpret_cast<NPBool*>(value);
       *supports_model = FALSE;
       rv = NPERR_NO_ERROR;
       break;
@@ skipping 262 matching lines @@
   scoped_refptr<NPAPI::PluginInstance> plugin = FindInstance(id);
   if (plugin.get()) {
     return plugin->ConvertPoint(sourceX, sourceY, sourceSpace,
                                 destX, destY, destSpace);
   }
   NOTREACHED();
   return FALSE;
 }
 
 }  // extern "C"