Disable support for the Mac NPAPI Carbon event model

webkit/plugins/npapi/plugin_host.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 "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"
@@ skipping 785 matching lines @@
       scoped_refptr<PluginInstance> plugin(FindInstance(id));
       if (!plugin.get()) {
         NOTREACHED();
         return NPERR_INVALID_INSTANCE_ERROR;
       }
       *reinterpret_cast<int*>(value) = plugin->drawing_model();
       rv = NPERR_NO_ERROR;
       break;
     }
     case NPNVsupportsCoreGraphicsBool:
-#ifndef NP_NO_CARBON
-    case NPNVsupportsCarbonBool:
-#endif
     case NPNVsupportsCocoaBool: {
       // These drawing and event models are always supported.
       NPBool* supports_model = reinterpret_cast<NPBool*>(value);
       *supports_model = true;
       rv = NPERR_NO_ERROR;
       break;
     }
     case NPNVsupportsInvalidatingCoreAnimationBool:
     case NPNVsupportsCoreAnimationBool: {
       NPBool* supports_model = reinterpret_cast<NPBool*>(value);
       *supports_model = webkit::npapi::SupportsCoreAnimationPlugins();
       rv = NPERR_NO_ERROR;
       break;
     }
+#ifndef NP_NO_CARBON
+    case NPNVsupportsCarbonBool:
+#endif
 #ifndef NP_NO_QUICKDRAW
     case NPNVsupportsQuickDrawBool:
 #endif
     case NPNVsupportsOpenGLBool: {
-      // These drawing models are never supported. OpenGL was never widely
-      // supported, and QuickDraw has been deprecated for years.
+      // These models are never supported. OpenGL was never widely supported,
+      // and QuickDraw and Carbon have been deprecated for quite some time.
       NPBool* supports_model = reinterpret_cast<NPBool*>(value);
       *supports_model = false;
       rv = NPERR_NO_ERROR;
       break;
     }
     case NPNVsupportsCompositingCoreAnimationPluginsBool: {
       NPBool* supports_compositing = reinterpret_cast<NPBool*>(value);
       *supports_compositing =
           webkit::npapi::SupportsCoreAnimationPlugins() &&
           webkit::npapi::UsingCompositedCoreAnimationPlugins();
@@ skipping 64 matching lines @@
       if (model == NPDrawingModelCoreGraphics ||
           ((model == NPDrawingModelInvalidatingCoreAnimation ||
             model == NPDrawingModelCoreAnimation) &&
            webkit::npapi::SupportsCoreAnimationPlugins())) {
         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
+      // Only the Cocoa event model is supported.
       int model = reinterpret_cast<int>(value);
-      switch (model) {
-#ifndef NP_NO_CARBON
-        case NPEventModelCarbon:
-#endif
-        case NPEventModelCocoa:
-          plugin->set_event_model(static_cast<NPEventModel>(model));
-          return NPERR_NO_ERROR;
-          break;
+      if (model == NPEventModelCocoa) {
+        plugin->set_event_model(static_cast<NPEventModel>(model));
+        return NPERR_NO_ERROR;
       }
       return NPERR_GENERIC_ERROR;
     }
   #endif
     default:
       // TODO: implement me
       DVLOG(1) << "NPN_SetValue(" << variable << ") is not implemented.";
       break;
   }
 
@@ skipping 200 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"