Render Core Animation plugins through WebKit's compositor rather than

webkit/plugins/npapi/plugin_host.cc

 // Copyright (c) 2011 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/plugins/npapi/plugin_host.h"
 
+#include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "net/base/net_util.h"
 #include "third_party/npapi/bindings/npruntime.h"
@@ skipping 47 matching lines @@
   gfx::GLImplementation implementation = gfx::GetGLImplementation();
   if (implementation == gfx::kGLImplementationNone) {
     // Not initialized yet.
     if (!gfx::GLSurface::InitializeOneOff()) {
       return false;
     }
     implementation = gfx::GetGLImplementation();
   }
   return (implementation == gfx::kGLImplementationDesktopGL);
 }
+
+static bool UsingCompositedCoreAnimationPlugins() {
+  // We can't reference the kDisableCompositedCoreAnimationPlugins

[jam, 2011/11/29 18:56:21]

duplicating the switch seems unfortunate. perhaps this can go in
ui/gfx/compositor/compositor_switches.h?

[Ken Russell (switch to Gerrit), 2011/11/30 00:23:32]

Thanks for the suggestion. Ended up putting it in ui_base_switches.h/cc after
talking with ben.

+  // constant in content/ here.
+  return !CommandLine::ForCurrentProcess()->HasSwitch(
+      "disable-composited-core-animation-plugins");
+}
 #endif
 
 PluginHost::PluginHost() {
   InitializeHostFuncs();
 }
 
 PluginHost::~PluginHost() {
 }
 
 PluginHost *PluginHost::Singleton() {
@@ skipping 735 matching lines @@
       // We only support the Core Animation model on 10.6 and higher
       // TODO(stuartmorgan): Once existing CA plugins have implemented the
       // invalidating version, remove support for this one.
       NPBool* supports_model = reinterpret_cast<NPBool*>(value);
       *supports_model = webkit::npapi::SupportsSharingAcceleratedSurfaces() ?
           true : false;
       rv = NPERR_NO_ERROR;
       break;
     }
     case NPNVsupportsInvalidatingCoreAnimationBool: {
+      // The composited code path for this model only works on 10.6 and higher.
+      // The old direct-to-screen code path supports 10.5.
       NPBool* supports_model = reinterpret_cast<NPBool*>(value);
-      *supports_model = true;
+      bool composited = webkit::npapi::UsingCompositedCoreAnimationPlugins();
+      *supports_model = composited ?
+          webkit::npapi::SupportsSharingAcceleratedSurfaces() : true;
       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 53 matching lines @@
     case NPPVpluginKeepLibraryInMemory:
       // Tells browser that plugin library should live longer than usual.
       // TODO: implement me
       DVLOG(1) << "NPN_SetValue(NPPVpluginKeepLibraryInMemory) is not "
                   "implemented.";
       return NPERR_GENERIC_ERROR;
   #if defined(OS_MACOSX)
     case NPPVpluginDrawingModel: {
       int model = reinterpret_cast<int>(value);
       if (model == NPDrawingModelCoreGraphics ||
-          model == NPDrawingModelInvalidatingCoreAnimation ||
+          (model == NPDrawingModelInvalidatingCoreAnimation &&
+           (webkit::npapi::SupportsSharingAcceleratedSurfaces() ||
+            !webkit::npapi::UsingCompositedCoreAnimationPlugins())) ||
           (model == NPDrawingModelCoreAnimation &&
            webkit::npapi::SupportsSharingAcceleratedSurfaces())) {
         plugin->set_drawing_model(static_cast<NPDrawingModel>(model));
         return NPERR_NO_ERROR;
       }
       return NPERR_GENERIC_ERROR;
     }
     case NPPVpluginEventModel: {
       // we support Carbon and Cocoa event models
       int model = reinterpret_cast<int>(value);
@@ skipping 217 matching lines @@
 }
 
 void NPN_URLRedirectResponse(NPP instance, void* notify_data, NPBool allow) {
   scoped_refptr<PluginInstance> plugin(FindInstance(instance));
   if (plugin.get()) {
     plugin->URLRedirectResponse(!!allow, notify_data);
   }
 }
 
 }  // extern "C"